Sync with portage [Thu May 27 09:38:11 MSK 2021].

3 years ago · 707e9ca985
parent 320754ef3e
commit 707e9ca985
2382 changed files with 19874 additions and 27914 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29259 BLAKE2B 178e748dabbea7036aab86fa51ffa2bfe9e04ca276ade1f2ba79b9b76a4c08da42f67d71314b54c77c06a33d9a31e2dbdd06a2357c7b800671a35047aee5f53f SHA512 c13ed8099bd42461f53c3454f4a8bdedfa8ebbaf68f25d2ffd3e9b5ca22dd3c49dc2da41cdde55b31398814bda332a444ff7a93bdc31659809c0ebd1b7333573
-TIMESTAMP 2021-05-25T14:09:09Z
+MANIFEST Manifest.files.gz 29278 BLAKE2B 8df47889552f8d4cd85f80ef30251ea172c9b177a6bd48dabe303dfd705847ce4632bab703a4f43b90e876d3014641fe02953e733bca8377075993b4cb01bebe SHA512 7c6b4747405e47d133eae76457d647beb5a7c32d85b85676964870148b73f644b49918b4bbdc627f9230aed607df21fa949e50ffc60af250b2758fc991417539
+TIMESTAMP 2021-05-27T06:09:10Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmCtBQVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmCvN4ZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDA0BAAlBLbragCNUnyl4L28BxMu4EVKjY+N6zxopctsUTvUq0OyzoclmxeYq9Z
-V6ApI46Of5C7MVjsuJv53RPWWiZV7YoihmtrHEEftU14bTw9hq9uGMXQRZiJoYc4
-r+ETE8reNudw+WvLtlWQVfiRivsbNbYpYFJaGhtuFTqhT/XtIF6DdlOR50vbSOT4
-e/aEgTszW2cr6TFPfypa9q0Rx3zOx1wVdoPzm3dEQi/lkZtc6wnfP2s8iPHddluy
-AGlgR8V9/ql39hjhRQUK+m0UcLPMH370EhFDgc+i1HrWFINwFU3ryIP8DdV9KOQh
-SHYWhokbusIhbgu91a1v2saSXyRnI3xvcIXtFN+HfSaLUrVmI032TyXjBFDFccpa
-cxx1FIoRcYl+4VfNWfUzH6w3ff2qPxSx3/GQNORH+mQFhTS5vHhES2j7I+jaGDh5
-HTMKzJ9fIdoMmcPluFd+zZn9wGgxNgevyqf0ZLW5OyNWqUes35Q4h7JafhHN2xg7
-c1NpbJARcBw0JsY8sbp7cOs6gkJzZEj/sVpHCDxze0eJ/ZoGXzcERSh3XlqFfhtL
-WseXF0zkn6qkMV91/css2Utw+15v55bwIJ2gDfqmJzf6bdK3Y8/tXmlN7/Kx1n9q
-MKQ2oQjTUjTGS+ynThBxxE1CcSRNzt6IX0/NHdacoyJ8a5mbwDQ=
-=JirR
+klCEsg//XkCdPdepThV81aQL9ztslEE+kvMhlWrAdH5pCGOeGV7gCoIbd3pEMlj3
+LxUROk53w4tJRqGVFqOoKHa40SYqINbAz3pEULw9ZjeU+nroupZhD+IuUtvlN9aq
+B1RvvW6/c+M4RCE6FsJYlNxC0I2fjjoQ/W5FK+6kDtnc5n3D7qnEbUrcCOGeujtp
+Plxb9OJ2m5IiKTrt6vzM3bbTvDFWVIEmME0ye9J+kZUWTywkvlSLzdeex/0ZUVAP
+lFv2m9NPRndGNKlCPe80h2Y7YNObdQSRAl2as+pukB7pBc/zbCW+1W2YEGrm0owb
+IrkLFPusbb/tJJAaOhQitoWQt7zpKybvAdGGb/NTny3LfLX4XB04WgVgyZ/qqpFq
+BL5hqZwhYaGwUTZDIM5Sh5VuM8Q1dySNS9Ewhy0ZP8x4Msn5c1fVDCOGmcolJDv8
+iPlJflfmUjGPU/qJE65KA7yGCQTFQa1eu+VjFy1ghymq2YnqQLyV5uJcdQEvtNFZ
+By1mjB6xG1e1tWlEJoFe8pS9lonjnrT0mtfdAjJlNjbr47uVMnYjZIFYUxQqK7vZ
+qhu1eRM5TjoaXGizHw2q9QY5CGtsw7+QjvreSZju51i4Cd43mE6eHO32UuZwD8ca
+ClkvD+Nfo6ITD2J9Qbl603UOrq+3Frs+bfWn8+alffW4OrZ3TZE=
+=p53m
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@ -1,6 +1,8 @@
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
 DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
 DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af
+DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 5006535dc15b703b4388d90d57559bd882f16210c2f38f4d773312ed8322803629deee18709ca4446000c20c94ff8b0037acbe4dddab9cdbe45417079f708039 SHA512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724
 EBUILD apache-tools-2.4.46.ebuild 2488 BLAKE2B 8da99d7419766be20d61d727fbc6f95b4ba9b5f3b0c24e322c18e07667644c1f46dfd6c8f649d822dfe1bbb991eaafadaf2810b6483c243db57fc10e6ed3553a SHA512 db9ce51d714565461119bac52422ecb3b3a2e863eddf96de3d3e91ca2445e4e55cc1234c6517a0616a24d25a807011c8ea7bf052f0d7cfa88279d02eb9642ab1
 EBUILD apache-tools-2.4.47.ebuild 2497 BLAKE2B 0a4976317b10820f2395856ffb7a0f7c0e5f6bfa7fc7a11b719802043cbb32e14769c6bdfa7e94b6ca82c35e2b5354f21ac26aa54a98a2b52144535a6fdff2fb SHA512 70728fdc698534aa1629df0353980fca8ff37a1c11567a1adc803e3423a3ca2fb2e55a5f74818e0abb9fa9a75daa63deaea74e390db2e21695f5207e3b90b8c1
+EBUILD apache-tools-2.4.48.ebuild 2497 BLAKE2B 0a4976317b10820f2395856ffb7a0f7c0e5f6bfa7fc7a11b719802043cbb32e14769c6bdfa7e94b6ca82c35e2b5354f21ac26aa54a98a2b52144535a6fdff2fb SHA512 70728fdc698534aa1629df0353980fca8ff37a1c11567a1adc803e3423a3ca2fb2e55a5f74818e0abb9fa9a75daa63deaea74e390db2e21695f5207e3b90b8c1
 MISC metadata.xml 468 BLAKE2B 850e5a23a188280992a745276f7466b0287d4e1ca9dee8c61046612273bf7484c24e60d95ccc6637c65c88d851719bed812e2c1f3e951fdca1c7058c68aaa0db SHA512 d9b6eabeaba642f760ceca4b4b39b5db7bae5369c6766ce230c5cf0949e3152affa6ec5116ffa4ead983d987387c767600b8f36ebe1b8cf1323ed5c2cb14fab2
--- a/app-admin/apache-tools/apache-tools-2.4.48.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.48.ebuild
@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? ( dev-libs/openssl:0= )"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config || die
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-perl="${EPREFIX}"/usr/bin/perl
+		--with-expat="${EPREFIX}"/usr
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
+		--with-pcre="${T}"/pcre-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
+	econf "${myeconfargs[@]}"
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl ; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@ -1,16 +1,4 @@
-AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d88cf326e0e8109dc5996c22c812c64f2dfaaa6b0456b368d2b59aa30271b4de402bd83c2754c0224b4fd6598c604 SHA512 531340bb0770c07743caa6c760584c0f4cda5a5db7dd46bd2eee8ae1cccabecffee084571fb68a3510735b04430f2bb454068d9983da2856a0459ccb258eb89d
-AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
-DIST sysstat-12.2.1.tar.gz 1227707 BLAKE2B 566382d83a0230517d22e2630a9cb1aa631d761c914188a4e7fb15eddaedbd25b8a3dffa9893b1b2bbcc31d87a37cbe11b2b50ab0ec94a28f84018685d1b35c8 SHA512 a19d0978eb11071c228462cda496a59721541e57a1d15cb2d0964f287ac2d50b5587fa5bc2b8fe6be2a1f00cbf2e7c3bc59db6494e3e8c1906aa81437b30d073
-DIST sysstat-12.2.2.tar.gz 1227793 BLAKE2B 7dcfe904aa60e9c61af516e718668a3f8fb9e4274c51a2c9d44b5e56dc6cf27ffb18d44641970f75abe1c1f8a2c5df8b7a7874da8745757f937ccc2ffbfa03d4 SHA512 82f4fb1e78a26275bdc6f6939dd2c75d7822e930992e74c1eaeda65c0e873d88e777a7f315c7b073aaacb6956281b2119448af2ca22ae6e7f1d20c370b01e3e4
-DIST sysstat-12.2.3.tar.gz 1227666 BLAKE2B e78cba586eb8e5f5a971f608ee0df39a20e3af9f02db1778c52bbb09eb4565e29ffb79d68ed00af0142ccbf1120b97825c638b323b53e0b210c96bf808db4aa1 SHA512 d837193b59840b1b1a87f927a4416ba4c688f3b470be00e9ab013b62b2f11e7b963ef4cf521bc42a0a041ea8923e176922ee5b6df56c0612b6646054b048f067
-DIST sysstat-12.4.0.tar.gz 1375207 BLAKE2B 66a9c15bb4e3b349158c9f7ab37d00c77844f0fd654df1b613141d906d3c89477e581d7143c77ba6952dd2cc7296f0611bc99aeec8e55e8090a488d5a286ee8b SHA512 156cb38bc4cedb68278d9054ce5b477cbdc84d2480ca302988c0fb5427b9f1f823f0939f2bc1c91fa7657b00b29d02d1f58aeafd342eef83b07d79c3f4141be4
-DIST sysstat-12.4.1.tar.gz 1377429 BLAKE2B 878d20575f5397adf10f64ad935b1c08709f6149f875975377c0a9f9b741f9bf352d0dd92ae31c0e7544c2e59e2058fab9ec5be95bfe9d070048661a7ba3bbfa SHA512 203e77095bddeb3797a65ed9e51cab90beaae7f579624c3f55d6903d45b9395d2134ea8e773a572710fd837fd26fb5437dccad63a913536b916f659207256d98
 DIST sysstat-12.5.3.tar.gz 1504415 BLAKE2B a3dc267182939190441b6cfebff938881fe4a06a8c7d1c406c014ddc28c0ecb33af5f480b77cce56bfcd4c7af81c4fec09eccb989561dd979f03a94ea6521f5b SHA512 3f09ff2e7ca38497eb07dcd8770c0b7fe5cfa1140537b215a1648446f65d933852b97dd5a1a9596afa57b04f20da64385e3b2e384be8d7b5902f228dc01230a5
-EBUILD sysstat-12.2.1.ebuild 1698 BLAKE2B 9667c40464d2264dd335680a913481badc11ecd6f0a93168926943660f9fdfbc4f8c8176629101350f5d56de569d0c3bd976d39a06a15cf88b3f778086b416c4 SHA512 a93d6721297612a69407c155c172c6fe75aa6ee891848516285b977011acde8f7f73530744563de12edf6eb44b9d27f9789102144d301d96570528061ea8045f
-EBUILD sysstat-12.2.2.ebuild 1704 BLAKE2B 3d5e89a9fedf962c45e9b89648cc43241271aba8aa4998c8f21e82fe9f9d156aefe68abfc216b8de9cd427f792d8571ff352eadc8febadd4a46b5f2fd190ae91 SHA512 1d69d5199688fe2b764a160c994bfe208cbd5129c187a89b8526c6ffd10f64d499465ff0341d6d8c903dfe8f1e71f22b83948d5cbd7a04859a3db6ad049b92e6
-EBUILD sysstat-12.2.3.ebuild 1704 BLAKE2B 3d5e89a9fedf962c45e9b89648cc43241271aba8aa4998c8f21e82fe9f9d156aefe68abfc216b8de9cd427f792d8571ff352eadc8febadd4a46b5f2fd190ae91 SHA512 1d69d5199688fe2b764a160c994bfe208cbd5129c187a89b8526c6ffd10f64d499465ff0341d6d8c903dfe8f1e71f22b83948d5cbd7a04859a3db6ad049b92e6
-EBUILD sysstat-12.4.0.ebuild 1793 BLAKE2B 0f4ba0a7003a1d84d742d9c274cd45fd057eb0652ca318ab528924b395469ce24f44aa7d480861a1d2c05d98305fee5a184f6e34d9e061c1e307832fde5f6f4a SHA512 551c7a81c035a788aec9ea9fdf70f475e88d21cd95be2b062ed26a70911d048027066e7caa0945689ff6ee106f96aa6ff48bd5b346f75fc26fd21f4979b2e7f2
-EBUILD sysstat-12.4.1.ebuild 1892 BLAKE2B bf8a743873f7ca68be1f4a3fc0b00bc6cd2835cfbe7aaabcb0bb8a5b803c125919ce4a38d9b1eb07bc641daef2943d9574c7af9225dc7974a9f319471cf6322b SHA512 638db560f95991be44c4b19d6c2b63b5faf738db344a1927c89da2bb9cbe400cedd122408a0ffc3554fda9d18c020cfea8dc7719b44128d3ff68f05d6d102bc1
-EBUILD sysstat-12.5.3.ebuild 1882 BLAKE2B 1ff72abb92b39cd5f165739948031a7dac611e2d53064840924ca84b67e23e4455bac01f549bd0acca3f68761a10f096dfc9565f6122f97e9fd7d8df13e3d07e SHA512 7b2b81f51153d623845a5d61c6d3b7f1b60d23fa135d09e899ae962f7fd7055daaf8d77f1f219be823410f79683a3191a98f1a124a651ec6f018cdb965404b1f
+EBUILD sysstat-12.5.3.ebuild 1881 BLAKE2B 1f285b96455f80ebfd841afec6ef75d483e26e1e91ef3987bd39bccf01cb26d4b28492c7aa368a7666dca3b80e7584f94c0749115a91b89e423a661c9568a1bb SHA512 5350bb48dd51622d5e6acb9b72b50531f34e046380af4547e4f232087a41a72aaeafdafad0a63a12c818363931293d2161db0fd085a672d66db760f6d9816367
 MISC metadata.xml 362 BLAKE2B feda4d7de32dd65f3f8d0c2b263e88f88d4601db855e600299b15cf3fa735deca9d5fceef6bd444341e9779c88e83142bd1f4126c9e69efc57c0865a74246824 SHA512 7fd37cdf3ba90f14371aa39016cb5a84fe0fba0e5798ef98757db29dd2915554d30369c2d171f8013dca8183aac9a8fcfd4df67dd336aa1393aa5f984a14ae30
--- a/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
+++ b/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
@ -1,38 +0,0 @@
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -368,25 +368,19 @@
- 	$(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR)
- ifdef SYSTEMD_UNIT_DIR
- 	mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR)
-else
-	if [ -d /etc/cron.d ]; then \
-		mkdir -p $(DESTDIR)/etc/cron.d; \
-	elif [ -d /etc/cron.hourly -a -d /etc/cron.daily ]; then \
-		mkdir -p $(DESTDIR)/etc/cron.hourly $(DESTDIR)/etc/cron.daily; \
-	fi
-	if [ -d $(INIT_DIR) ]; then \
-		mkdir -p $(DESTDIR)$(INIT_DIR); \
-	elif [ -d $(RC_DIR) ]; then \
-+endif
-+ifeq ($(INSTALL_CRON),y)
-+	mkdir -p $(DESTDIR)/etc/cron.d; \
-+	mkdir -p $(DESTDIR)$(INIT_DIR); \
-+	if [ -d $(RC_DIR) ]; then \
- 		mkdir -p $(DESTDIR)$(RC_DIR); \
- 	fi
- endif
-	if [ -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" ]; then \
-		if [ -d $(DESTDIR)/etc/cron.d ]; then \
-			$(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
-		elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
-			$(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
-			$(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
-		fi \
-+	if [ -d $(DESTDIR)/etc/cron.d ]; then \
-+		$(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
-+	elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
-+		$(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
-+		$(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
- 	fi
- ifeq ($(COPY_ONLY),n)
- 	if [ \( -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" \) -a ! -d $(DESTDIR)/etc/cron.d ]; then \
--- a/app-admin/sysstat/files/sysstat-11.7.3-flags.patch
+++ b/app-admin/sysstat/files/sysstat-11.7.3-flags.patch
@ -1,11 +0,0 @@
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -71,7 +71,7 @@
- # Compiler flags
- CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2
- DFLAGS = @DFLAGS@
-LFLAGS = @STRIP@
-+LFLAGS = $(LDFLAGS)
- DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
- DFLAGS += $(DFSENSORS)
- 
--- a/app-admin/sysstat/sysstat-12.2.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.2.1.ebuild
@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="debug nls lm-sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-	"${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/lib/sa \
-		conf_dir=/etc \
-		econf \
-			$(use_enable lm-sensors sensors) \
-			$(use_enable nls) \
-			$(usex debug --enable-debuginfo '') \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
--- a/app-admin/sysstat/sysstat-12.2.2.ebuild
+++ b/app-admin/sysstat/sysstat-12.2.2.ebuild
@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug nls lm-sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-	"${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/lib/sa \
-		conf_dir=/etc \
-		econf \
-			$(use_enable lm-sensors sensors) \
-			$(use_enable nls) \
-			$(usex debug --enable-debuginfo '') \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
--- a/app-admin/sysstat/sysstat-12.2.3.ebuild
+++ b/app-admin/sysstat/sysstat-12.2.3.ebuild
@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug nls lm-sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-	"${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/lib/sa \
-		conf_dir=/etc \
-		econf \
-			$(use_enable lm-sensors sensors) \
-			$(use_enable nls) \
-			$(usex debug --enable-debuginfo '') \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
--- a/app-admin/sysstat/sysstat-12.4.0.ebuild
+++ b/app-admin/sysstat/sysstat-12.4.0.ebuild
@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug nls lm-sensors selinux static systemd"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	# --enable-compress-manpg <= Yes, that is inverted.
-	sa_lib_dir=/usr/lib/sa \
-		conf_dir=/etc \
-		econf \
-			$(use_enable !systemd use-crond) \
-			$(use_enable lm-sensors sensors) \
-			$(use_enable nls) \
-			$(usex debug --enable-debuginfo '') \
-			--enable-compress-manpg \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
--- a/app-admin/sysstat/sysstat-12.4.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.4.1.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="dcron debug nls lm-sensors selinux static systemd"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	!dcron? ( !sys-process/dcron )
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-REQUIRED_USE="dcron? ( !systemd )"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	use dcron && { sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die ; }
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/lib/sa \
-		conf_dir=/etc \
-		econf \
-			$(use_enable !systemd use-crond) \
-			$(use_enable lm-sensors sensors) \
-			$(use_enable nls) \
-			$(usex debug --enable-debuginfo '') \
-			--disable-compress-manpg \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
--- a/app-admin/sysstat/sysstat-12.5.3.ebuild
+++ b/app-admin/sysstat/sysstat-12.5.3.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="dcron debug nls lm-sensors selinux static systemd"

 CDEPEND="
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@ -15,10 +15,12 @@ AUX newscripts/bacula-dir.initd 315 BLAKE2B e2bbd011773307a24044a761f17ec7079e5c
 AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876d20919bf3f5a779595507e50185457464371878b3e18293302a0c1016bce3aca7e432837397bde64a0e6188be8a SHA512 8230bde8cbfdf2fc4892fb90891a85e36b2be42e4f2ea2140248f08f22bcfe3f1d8c3b419347a9b40143c3f2b4c75d7834cbadb3ed8b8372462580ffcf268bf7
 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4
 DIST bacula-11.0.2.tar.gz 5982176 BLAKE2B 2da10e48b44ada189fb5d9ed48bac41232106721859df823309e7be63d16786ebaf95052d929ef67895fb993d019153d736125ec4fe5949591dd7dced0ee9835 SHA512 7e90352036a544b6a508547ae38660ca5d59b0bfd17126f346652e5c9977367ad9fe972e3f2823c10e7f8ffdcd1623ef24e8a82de030041762f0c0e09783e65c
+DIST bacula-11.0.3.tar.gz 5982505 BLAKE2B a09a4829cb4eeb6cfe3b082efcc45f7704ad7da0f882b746a2f4aeeb3233775ccc89d7924442970e9609c449fee96466b33286e7c6f700cbab7f2013f0267f53 SHA512 753ef3f53079fe36e69791a3ff0c4230d611d86257c5ecbc28c2ec593e950b76dc9fedf3525c196b0742cc029d0a8023d31505c83d8d42ff3f48c3273b77c540
 DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
 DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a
 DIST bacula-9.6.7.tar.gz 4168102 BLAKE2B 8f5d5cbe8c3ce62105624138e9dfbb9f19eb0721bb2e377c07ef2cd3d4a8442641b4758b00b3050d2352dde31205658963782d2bec3e87242dac7b4b6a4d659c SHA512 27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d
 EBUILD bacula-11.0.2.ebuild 11886 BLAKE2B 9b75fcb4f5a5251e9428e5406b64c4d16691f250df5e8a73464a6fad0d1e8dd92114f9f304e9761c2dc01a71abccb7ca4cec33a6544d63fcbb72c53fae87b332 SHA512 198760cb7179adc14c740d4e26274acf543041fa7fc4992f8560ae4222a71e37f2ff20134ebf9d4009598e894a213c935af878b728c2eb7436664f29bde61614
+EBUILD bacula-11.0.3.ebuild 11791 BLAKE2B 52f1c30b3ed65336004dfcb3defcc1f40ab13fcff9448e2309835177ec953849f38b7b8ed417d2796c03075d7bdcd07c955f756cbb262d08528edbf716eff73f SHA512 deb47dc53d3bd187122aac3ae8c6eb0d206ae85776b838881d7cd27ca2c1d6eba029d435085e40188d7e033497d6bf027ad398ba495ffb3e875167a72581521c
 EBUILD bacula-9.6.5.ebuild 12033 BLAKE2B 2abae986e8bdb9e358be317b619a3be15b18fdb2ad93d00d160c9acfeec3b7ee7e5b55e54be8f85ea2edf5ee8cfbd2df7ce5aa5d599fd543c8e7df0d69c7447b SHA512 5135d97f296e93343a2661d32bb76e6a21da25c2da3f858516a9affffd8831516c7f12adbe607afa68d675bef8dbbed2dff23b594437d0ac3d77fb999af308f2
 EBUILD bacula-9.6.6.ebuild 12036 BLAKE2B bb471939370d44d6124aecdf194b07635650dd38c1aa22cb90cbba48da310ce4c04bb5b6f9d0e8c7814f1f0efb46b37a25a81460a3fca3195f534aad0af75b28 SHA512 a436a73aa97e3491a95c27c7e2ad7f9f20f12a0b408ecb64f51c82f78d8221b2d6adfccc61054104ce6afb5432b25cef80a2735ea55adf61c0611738a8ae7838
 EBUILD bacula-9.6.7.ebuild 12036 BLAKE2B bb471939370d44d6124aecdf194b07635650dd38c1aa22cb90cbba48da310ce4c04bb5b6f9d0e8c7814f1f0efb46b37a25a81460a3fca3195f534aad0af75b28 SHA512 a436a73aa97e3491a95c27c7e2ad7f9f20f12a0b408ecb64f51c82f78d8221b2d6adfccc61054104ce6afb5432b25cef80a2735ea55adf61c0611738a8ae7838
--- a/app-backup/bacula/bacula-11.0.3.ebuild
+++ b/app-backup/bacula/bacula-11.0.3.ebuild
@ -0,0 +1,413 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop libtool qmake-utils systemd
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			dev-libs/openssl:0=[static-libs]
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# Don't let program install man pages directly
+	sed -i -e 's/ manpages//' Makefile.in || die
+
+	# correct installation for plugins to mode 0755 (bug #725946)
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[18]
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "A group 'bacula' has been created. Any users you add to this"
+	einfo "group have access to files created by the daemons."
+	einfo
+	einfo "A user 'bacula' has been created.  Please see the bacula manual"
+	einfo "for information about running bacula as a non-root user."
+	einfo
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+}
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@ -1,7 +1,5 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
-DIST borgmatic-1.5.12.tar.gz 72964 BLAKE2B d71537eed019b10c3257d4b068c31aff63919e0cdb068b49c2ed92d2e97d37b8735f30b1225fb453e79372aeab49817e9200770aac4cc0f80c0bac14e84678d1 SHA512 67c7c7683e9fb7dd0321b3db6887212b040596f1d7e767cceeae6fa4cc02bb0a46344befbbc7a33b454a4692b04ae88d9031f71867788a94f771999d885112d5
 DIST borgmatic-1.5.13.tar.gz 72469 BLAKE2B 3a71be201143a96968bb1ea6008b62e11f6ab199f44f38d0d66f31f24827a8f32cc7b8f50cc5d33a8bbd7046e6697afe509525be90dd9519f4c686b8737f64c5 SHA512 60bcbcc825db3f93a423ab8e44e0b0809ff4937d8e41bc56ec6226e4865c3a66fae8b6749d33cdb0692ea9dd07cfff56750ff2feee68c96791b83c9dd5f35433
-EBUILD borgmatic-1.5.12.ebuild 2131 BLAKE2B 3e655f16122c80e4caf19c03927f804136dc76b8ad7fdcbf2b2dc6e5c1587007989a9708093d9ae5b8cb1150b739d0d938b9af9c901ef335100fc214eb4ee617 SHA512 d72b6f41c03625a9238791a6d1991c327fd26ac031b394631237e84914e09491c5e10e239a24e631fde9d1c318aeead1c8b091018996f63f2fdb99893f9f10bb
-EBUILD borgmatic-1.5.13.ebuild 2137 BLAKE2B efdd1242292e60bf5c1bf85913b4958db1a995caddeff0059cb0995049e3c1938117be1c3e3e9f4bbe16bf2ff8f5b62b37b325ae1085b4dc519ab832274106d1 SHA512 60673b7f47c3451e0a97b2e739fc80e5065c212e5260cae281fc66cc42245a1c4f9ca587a8a413b9691ca932645f569521be195d8b9d16c8ab77e2e1d260320a
+EBUILD borgmatic-1.5.13.ebuild 2136 BLAKE2B d47ab1d52be44bcfdbd48f4ecc71d3e52745ac4aae355d01ea523c0365c0f2c99ad186cd1de8573e5ef55eacbf9807510926d32495ca6fde4ef4394168ff2463 SHA512 e8b6c7fe7f5eef392df91887539d908aa1fec90a05a0c1ff09950dcf225c180414e2f7760cc854f6d33bfd25d3c8cd1a6f69d904001902c04f55ed22bc62e5c9
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
--- a/app-backup/borgmatic/borgmatic-1.5.12.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.12.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-
-# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
-RESTRICT="test"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		dev-python/colorama[${PYTHON_USEDEP}]
-		>=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		<dev-python/ruamel-yaml-0.17.0[${PYTHON_USEDEP}]
-	')"
-#BDEPEND="
-#	test? (
-#		$(python_gen_cond_dep '
-#			dev-python/flexmock[${PYTHON_USEDEP}]
-#		')
-#	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# Unlike the other two test files in integration/commands, which use the
-	# relevant modules' respective APIs, test_borgmatic.py tries to call the
-	# 'borgmatic' executable - which by the time we execute src_test will
-	# not have been created yet. distutils_install_for_testing would likely
-	# take care of this - but between the aforementioned behaviour inconsistency
-	# and the fact the only test run from this file as of version 1.5.11 is the
-	# parsing of contents of 'borgmatic --version', just skip it for now.
-	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
-}
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    generate-borgmatic-config"
-	fi
-	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
--- a/app-backup/borgmatic/borgmatic-1.5.13.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.13.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"

 # Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
 RESTRICT="test"
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@ -1,13 +1,7 @@
-AUX duplicity-0.8.15-fix-docs-cmd.patch 888 BLAKE2B 17627c86ed5b895ff08c6394b407b69f8653913d7e1bbbcd994c574a817e7f018a8b6f26819a147387414f9997b32e95fc76e2f4583158ee453d03a489b8b4b7 SHA512 a901c5870fcc6745873b5850b2d2544948cb766d72d7ca8f8869d03bc9512f4527ec62df3f29a1151675a91e6c6b3816069008d1b5d56e45b787e2bddaed4aa5
 AUX duplicity-0.8.17-fix-docs-cmd.patch 868 BLAKE2B 15d7843d53fe56142c582fbf4531406795f8c30abd1ae1afbf8e4ab702f6a34689f120519e6c0eb49fdbe0824b96b249f94a151185fb69d879959e428a760a8c SHA512 1eed49dd38d1af1001356fc8c3114c3d0fff4c96eb1f697b588efc94641b51c4a45e5265bf8a03007f44622536eb4505ee9cd227cdb7292964fc629102df9eb9
-AUX duplicity-0.8.18-fix-docs-cmd.patch 868 BLAKE2B 15d7843d53fe56142c582fbf4531406795f8c30abd1ae1afbf8e4ab702f6a34689f120519e6c0eb49fdbe0824b96b249f94a151185fb69d879959e428a760a8c SHA512 1eed49dd38d1af1001356fc8c3114c3d0fff4c96eb1f697b588efc94641b51c4a45e5265bf8a03007f44622536eb4505ee9cd227cdb7292964fc629102df9eb9
 AUX duplicity-0.8.19-fix-docs-cmd.patch 628 BLAKE2B 6acf30fd8881a14003a158e76a23b81af0e049c090c671adbf147c7a77b5ed57e75b9c9b169e38a06fdceb310bdc4f74bacb543a66e5820d3d1ab9951dca997d SHA512 6b2e401d6ce8c2ee41dd1ea8ffaed7602b8167fbf0cf465c214ddf8d1ef8af8b74a1a6c93741c6b34705b53b2caad438736a6ee7c6c3483b11d8ede029758348
-DIST duplicity-0.8.15.tar.gz 1482647 BLAKE2B e1ddd4232611ad5fcf8faa5135c925aef68a21eb9dec50de7194562a0d4871e9c58132faf9340f71367025dcc84cbc6f1aae69bd37cae294d4200a8ca8b796b3 SHA512 2d048377c839ae56fc2828997c9aa7ba8c339e815e1e2ae738652037508ec276a2c72583687da34408fadd4839011e242b51bc73cca954227fc51db5683c258c
 DIST duplicity-0.8.17.tar.gz 1351433 BLAKE2B 39c87c421bb8a4bf27e60c16b6dde559ed4468a1062f02623d8e37deb62e63101b6fb5524e5a991139d39422cab2803b89007bf1ca5819817ab3b53d5318b88c SHA512 6f9f6b45953d2bc7ed403d68bdc419f384e07f831c783af720f15f88b100f5becb3f83f65cfc715b02686c24d18c5ec8f80c27789d1ec01cdc8efefa7590c211
-DIST duplicity-0.8.18.tar.gz 1352646 BLAKE2B 9703ad0780d6bd7db970941f529192132f1b7c138c72831cfdeb1b703dc9d952e28cf453a77a62babc872ec57d9193fa7293607401e278d12ec8143f779d2a60 SHA512 fd9dc472e4145725de343a3195ca8c898570ec492d46bc385d354c40b2c31e7c0da1f6e15e2a4a391d35926ae77e854992f4c973e55b072006c3f6489e27408f
 DIST duplicity-0.8.19.tar.gz 1372739 BLAKE2B 6a5a642597529eea37c7224cbfdd115db42c16f6391e553454f8f82cea86240bbd68a62513129496a1f978411fdeec50c3d918bb99b470fa1444fd77e7e6c9b7 SHA512 c1a1f5894f8b94ac61bd98270f138c58ef5a68f3624e7e88224b15539ca6e08874df9cebb36b10167d133b1af6a93b29e7bf4084c348b9cd7914ff24415be57c
-EBUILD duplicity-0.8.15.ebuild 1192 BLAKE2B 80d739f5f1233b296fdf055c5dfbc2560c235bb68cd5ab422e9cf1a3d4a977702741c9f8ebc8c4797a2ab3c0874fc71c0e33e3c27f244786a88fc5773b54ab01 SHA512 716293085d14335e2d67f6bab2cbad7a78bd1c60441b587f2cbd21a902b25054bf175ff876c62ec39e176575cef2d57d8ddf07ed608b646f0fb9c2754eec7ef3
 EBUILD duplicity-0.8.17.ebuild 1192 BLAKE2B 80d739f5f1233b296fdf055c5dfbc2560c235bb68cd5ab422e9cf1a3d4a977702741c9f8ebc8c4797a2ab3c0874fc71c0e33e3c27f244786a88fc5773b54ab01 SHA512 716293085d14335e2d67f6bab2cbad7a78bd1c60441b587f2cbd21a902b25054bf175ff876c62ec39e176575cef2d57d8ddf07ed608b646f0fb9c2754eec7ef3
-EBUILD duplicity-0.8.18.ebuild 1204 BLAKE2B e3174011303a8557ff6419cfc083e96b74137076a60806ddc8fab2e7ff89816fa7d29ba873cc80efe17f8dc39c86670ef2474f75b035001f9571062943c959ef SHA512 eee4782590317211f959fd1ac24013e4c1dd0e237ad174bea6415e3af4e13a72abbf89451375506cb7b8824cc6bef57f0539cfa5f2e4f5c75907b7ad18ecb259
-EBUILD duplicity-0.8.19.ebuild 1203 BLAKE2B 3d9a652dc0ef3d87f3119982e7d7112a2e6af3d1570ddd06e9e144e452906caae73dcefb19762a9d09102ccb645fcefb2c53a0202b276414427933e5ce760f53 SHA512 49c98315a8e58b42dc40945956da0bdaf6cdb03469fccfb993f4a489c9f55a863b6dfdbcbbca2f5e88a62a6cb2d7c2e4015b0dfd9889ebd02363b8967be2b69a
+EBUILD duplicity-0.8.19.ebuild 1202 BLAKE2B b2ec8a0ef183bd7b20d018c44eca71dc7440ae910d2d97d5f0ba9185cd9982d091bc79400cecd1bcae86efb46178973aae9c467b7749db976bbd7cff9b622437 SHA512 6cdfb73228e6327fad27f28725d48353b9e1c933470c51fd73d5aec98623916878a69964cea9fb0dfd812fcd1abd99f3ef7846b9b1b816db5117e68929615f43
 MISC metadata.xml 454 BLAKE2B 08e99a3d0e80e38e1ec062be7e4a1a4cc5b8d9e579381142a7c274c27cf585b7c3fd62fa14b1b2b486ec26d8aec4f7dcbc91fa7d8400b36fe609e240c67d6552 SHA512 a4c895eaf690f40fc197acf26501b2da386a3af716b4dda87d84e2d459ef9642e19e1e5ebca8a6ae156c272321d82279e573eaaf1ad3e19e7d5dd35e9f9e69ea
--- a/app-backup/duplicity/duplicity-0.8.15.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.15.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="https://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		app-arch/par2cmdline
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs-cmd.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Duplicity has many optional dependencies to support various backends."
-	elog "Currently it's up to you to install them as necessary."
-}
--- a/app-backup/duplicity/duplicity-0.8.18.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.18.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="https://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		app-arch/par2cmdline
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs-cmd.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Duplicity has many optional dependencies to support various backends."
-	elog "Currently it's up to you to install them as necessary."
-}
--- a/app-backup/duplicity/duplicity-0.8.19.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.19.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="s3 test"

 CDEPEND="
--- a/app-backup/duplicity/files/duplicity-0.8.15-fix-docs-cmd.patch
+++ b/app-backup/duplicity/files/duplicity-0.8.15-fix-docs-cmd.patch
@ -1,29 +0,0 @@
--- duplicity-0.8.15/setup.py	2020-09-01 15:45:48.664058429 -0400
-+++ duplicity-0.8.15/setup.py	2020-09-01 15:46:44.745709363 -0400
-@@ -93,18 +93,6 @@
-                 u'bin/rdiffdir.1'
-                 ]
-             ),
-            (u'share/doc/duplicity-%s' % Version,
-                [
-                u'AUTHORS',
-                u'CHANGELOG',
-                u'Changelog.GNU',
-                u'COPYING',
-                u'README',
-                u'README-LOG',
-                u'README-REPO',
-                u'README-TESTING',
-                ],
-            ),
-         ]
- 
-     if not os.environ.get(u'READTHEDOCS') == u'True':
-@@ -340,7 +328,6 @@
-         ],
-     test_suite=u"testing",
-     cmdclass={
-        u"build_scripts": BuildScriptsCommand,
-         u"install": InstallCommand,
-         u"install_data": InstallDataCommand,
-         u"sdist": SdistCommand,
--- a/app-backup/duplicity/files/duplicity-0.8.18-fix-docs-cmd.patch
+++ b/app-backup/duplicity/files/duplicity-0.8.18-fix-docs-cmd.patch
@ -1,28 +0,0 @@
--- duplicity-0.8.17/setup.py	2020-11-24 19:32:40.089024404 -0500
-+++ duplicity-0.8.17/setup.py	2020-11-24 19:33:32.326309755 -0500
-@@ -93,17 +93,6 @@
-                 u'bin/rdiffdir.1'
-                 ]
-             ),
-            (u'share/doc/duplicity-%s' % Version,
-                [
-                u'AUTHORS',
-                u'CHANGELOG.md',
-                u'COPYING',
-                u'README.md',
-                u'README-LOG.md',
-                u'README-REPO.md',
-                u'README-TESTING.md',
-                ],
-            ),
-         ]
- 
-     if not os.environ.get(u'READTHEDOCS') == u'True':
-@@ -339,7 +328,6 @@
-         ],
-     test_suite=u"testing",
-     cmdclass={
-        u"build_scripts": BuildScriptsCommand,
-         u"install": InstallCommand,
-         u"install_data": InstallDataCommand,
-         u"sdist": SdistCommand,
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@ -1,3 +1,3 @@
-DIST stress-ng-0.12.08.tar.xz 538832 BLAKE2B 67db0a377f256f346e1a131ae31271f9cd8be5186bf370504f943f168d873fd0c16579edd527de848e55e493917e36b1ac5211ce570eb73fdf078897b2698375 SHA512 992977c4d5dadae0a77e24ba4103ecf293cc7a56d0b254b235fbd9920968eb591bfa98b44c0002cf18103c0da4c677d577526538844fd67a47e7a721ac0aa596
-EBUILD stress-ng-0.12.08.ebuild 961 BLAKE2B b15477132bdb95e598dc787a8dc5aabf767a872b0583156fbccb65c3213c1a32e539aff0096b47d61c12aa66d6822b3dd565182fa21a6b2b889d21762a2d5c94 SHA512 3e8e2ad9f49312240b63e0feb6752ede355c094fd77fe0669d27c69436d58f939b27b64b68d7164c3cd0f211dfee2e5a17952181e4382149df65a6d314850c9c
+DIST stress-ng-0.12.09.tar.xz 545756 BLAKE2B 72c5b1acf3f82f8d609da8b213f6321486cda9b8e05fd7390b846bea541610bab70bceb99c3684fbff732805eade7c37840d77e4ce901cc81a53ded0968bc6a1 SHA512 510b210a920b540c25e9f4cc0597924f72a80a85e6cd647346f7e91335e127e776bfa1bdcf0e67f557b7c154d2e6f2b2ed5abe9612b2552f53a8d21c920dc6c1
+EBUILD stress-ng-0.12.09.ebuild 961 BLAKE2B b15477132bdb95e598dc787a8dc5aabf767a872b0583156fbccb65c3213c1a32e539aff0096b47d61c12aa66d6822b3dd565182fa21a6b2b889d21762a2d5c94 SHA512 3e8e2ad9f49312240b63e0feb6752ede355c094fd77fe0669d27c69436d58f939b27b64b68d7164c3cd0f211dfee2e5a17952181e4382149df65a6d314850c9c
 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
--- a/app-benchmarks/stress-ng/stress-ng-0.12.09.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.12.09.ebuild
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/sword-KJV/Manifest
+++ b/app-dicts/sword-KJV/Manifest
@ -1,5 +1,3 @@
 DIST KJV-2.10.2.zip 4065733 BLAKE2B 9c2fa48a38fe6352232b402de03bd2ce0651e1f30fa4a9e707b98412940a9b18c9fc465b1bb2628bdcd21bf3f8369da7eecf3a68e088ed6072fd9af1cd2f6e5f SHA512 43e841f9a6e833e8f39ac57c75d781af7b3b2d8ba59568300d0829eae809cd190e35639eb60342f36b87e5cdce6093fba4b2d7a55ed97fcdc8681025ed4100ac
-DIST KJV-2.9.zip 4061008 BLAKE2B e29bdba1147b96210b68a221f254b13f63f80616b80e241926b1d4af883cb5b611259668bfcd6f943a333f46f9a3fa24565c461181379428b80a4e41d1dcc502 SHA512 80af4ce768ec5c93e8e502338320c3b7fa5127fcc91ddb22969e0c1cac056538b5296b4b886ae653146cd2e21a61441e3c34f62f90cbec30510a81abc5408ec6
-EBUILD sword-KJV-2.10.2.ebuild 360 BLAKE2B b53a90e89785226ef087b6258ded2d3e344c753e8688f02a3d5efa4530d4e0da84ef73361baab6188814ce2bb047e29d7cefc0c383818d532a2e1415c0e984ae SHA512 fe1eabd6e63f281cc9691c3fca2499f954a7e029aaa88ddf2e83d5640c7ffe9baf5b6fe416c6cc7b1e9e6e4284f8eec43aeb9ee6d5f33707097858386377bfa6
-EBUILD sword-KJV-2.9.ebuild 358 BLAKE2B fe24be39f723950c6f721121340a3da6e420c88b6a892c649d8f845c84f36d4f8671828121df2e736196ec2fa1d5cfb4d578afd0545ac286e00ec5f1a854b893 SHA512 d4c25b9ebddc569e2be9b8a09918fee44a4fc982a20f901ee1f4d22e042e0ce5ed22ed5007f27c2fd183cdb55a60576f62c24f07437caeaa4c21581fa203e205
+EBUILD sword-KJV-2.10.2.ebuild 358 BLAKE2B 8616be316c1a2d65762a5d2632333d2d76ccbebe8b150e4c7bd7d362c232bb85ccd768193b72a596ae5536d1665dec43682c57323062e75d50b17795e69b18d1 SHA512 d50999424c72a25123b61ce97c4fe007edbd767f2b91a58b859ad3a473eb7fd0babe184fcdc8c2e8b990f9ec8f6f6b0b2a7a51e3d1ec80bcea0509d966bfc213
 MISC metadata.xml 1659 BLAKE2B 4b84c275017dda0e24343708867616fab721f830d35887349b0d81357272197d4e478dfa41451edcaf8dad52fd864c3a9e7aedb53da785089d0c4bc83fda37bf SHA512 1482b67d390f164304b9884a31bb3a9b9551b43dfaf574e7f868ce3872bb94997e639727ca2fa787ab32b1619873beaa148385c9d4dd259f892a0c96857de9cb
--- a/app-dicts/sword-KJV/sword-KJV-2.10.2.ebuild
+++ b/app-dicts/sword-KJV/sword-KJV-2.10.2.ebuild
@ -10,4 +10,4 @@ inherit sword-module
 DESCRIPTION="King James Version (1769) with Strongs Numbers and Morphology"
 HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
--- a/app-dicts/sword-KJV/sword-KJV-2.9.ebuild
+++ b/app-dicts/sword-KJV/sword-KJV-2.9.ebuild
@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SWORD_MINIMUM_VERSION="1.7.0"
-
-inherit sword-module
-
-DESCRIPTION="King James Version (1769) with Strongs Numbers and Morphology"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJV"
-LICENSE="freedist"
-KEYWORDS="amd64 ~ppc x86"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@ -9,13 +9,13 @@ DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
-EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
-EBUILD emacs-23.4-r20.ebuild 11072 BLAKE2B 560f125213e52175a0dff8437cad8278436e3d36a534b72dfb6031423f0403b1ec3f803a5ea68f96f0d9a7c0cd56fbcdd01afb30e29e8092751b3c7d1888a00d SHA512 c5420af73f2aa01ec6c914a965a1d15169caad80cd949768109b85e0fb925135653eced075990413f03c139f0ead04162e3ed91681b1a17834ec95a7d9630dcd
-EBUILD emacs-24.5-r10.ebuild 10823 BLAKE2B a21968356333216b290d4ad3fc356261a0a924038c9c243a02c1ff286b252f2409344a9b377aa5b1ddad24c373bb81c71392da898f5dbd3e07c1e0749bcf707c SHA512 bc787ceccdb0386b8b233d12ef18be3d14d68e74dd33a07c1e6f41c89dca48ef5c5d0c1c082c28fde172ddf65c439e77da61f30fae6074086641a64a6ebe5a9d
-EBUILD emacs-25.3-r9.ebuild 11134 BLAKE2B 04c984fe3403dcc86a4aad93632f12a9f596dbd44b621c59f79073f90c4ca0740a036280ca3d7f4da15d813ac465915e55d3dfb8619f1fb4cca31d3d07f53b56 SHA512 03842263b26c437355e7ff0582b69daf39ff7ea4d9d56d2f66e255b6a1d6cdf6abf7fa2cca31229cffb1afa3fe3624db96925452ee500d97a72573d8ad270698
-EBUILD emacs-26.3-r4.ebuild 11815 BLAKE2B d47062336ca215fec5657dea95739751405f66b32f864ea2c72db58b81f01392d8f903c32701ac2ac308f77e854cb9d959fe558ad20387c66ddfb22334aa113d SHA512 eb768c3ded1a9a1303666e49868321b7341e152d109a068eea1b465dc344fcd87a2fbeb2e3c2fc244f7a2c9dec74650bb3e272ca1fb43fd1e5a229c5f4c443bc
-EBUILD emacs-27.1-r4.ebuild 14346 BLAKE2B 455210831d874ae10846d7872bafb5606275fb42c42074990f2b904c197b5e2948e98a5659537070b43df7935e357d226f89e75d4ed7bf2f01aab17f1282ec9e SHA512 b8389386ec5b510c044a138a256d44d6b4dc2de79aa490a86ee86039c6fb2b7d811e8d417e7f0b77d89693221721961555b27bb208ca00ce03d800c1c2e7455c
-EBUILD emacs-27.2.9999.ebuild 14310 BLAKE2B 80f0e564e88e59debc29f728776d22ca86f4b26733c6806c918f653da3b114794a7cebdc8d136fc00dfc50d94ebb0c4ad4763af874d52c3ba2322ff531a3b70a SHA512 d3f4b7be206b7dc430f536c9e59681be77adcd70885ce7c914eb96a65209ab6dcf7e338206c1f75c7ac6fc45f74aacf2eac502912b22e0b2592c76ff8d6e897f
-EBUILD emacs-27.2.ebuild 14311 BLAKE2B bb7104a2b5ecf0ed7a19d18d107607bf426f2d065b9895c45a2e20ea55243eb4e8fbfe06ce12848c4ba57a05bb8a30f37d8c7f6ed274980f447a6eb8c0d804c3 SHA512 3a0e3b915b413cd0c4b83bfb6d7a73e3dfebfbf87eae343607d956abaf42658947fe41263fc29ba13471ff60f160dfdace0ac75b5d218957365c501a29275d46
-EBUILD emacs-28.0.9999.ebuild 14196 BLAKE2B a45dd87886e1df006c1cc3e4301f03f3df30debe414fbe5c47fde4ecadb59ec5e4720e8eafee2053527dfca015dd73c526540f12cf666300c44644b2905058c4 SHA512 05ffce7d2b738d300ff9b393e52115b8327f7616bd946e87ed9d132b7fdfa965f8d231df5819a2f11eca6b46b1dea0ea09df6429eff872966568242fa39a30ef
+EBUILD emacs-18.59-r13.ebuild 4380 BLAKE2B 455969fb936c99bd04f5f5e85116e86edeb38b7bf29ba4765c6ef2333c756b612d57c57914b1571f9cf3222bb4d751e551c8e48d3ce2735799d0bcd30d8d9e4e SHA512 8f0c2e4ec5d73099619f78c734e6a048b9404b94a090ecb4babe7933caf55b92f632da7aa0f2b6ebf2862ce7a2d017b4cfd360be8c9b05617bc01ea2cdbcd2bc
+EBUILD emacs-23.4-r20.ebuild 11080 BLAKE2B 6306ed041c826846f116f40bb2b98f3be3d8f1ddfc1506083125ee2214ea8ceb3d5ed9d036c247f45ddd6e7326e6f9c5de93752890a05f272f67708d25291509 SHA512 679adade4cfe01cc2bf9936ed2bc657344019618109b74048575c53d135482afe4bcef637f85779a8bf92c152000e1e9432576704319f394c2281fcd83ad3d53
+EBUILD emacs-24.5-r10.ebuild 10831 BLAKE2B 87325c00c3115e3b3c8c0c6722538382a5bb0913e66bf17dfd4aa90447859c475e4189d6ef9f9dd5281c08200d3c6a0017a5df5d0b9f2046cd5b1a807ef5d975 SHA512 5480f9ec1d7c96cceabb2be9842561a24fb687adad5846a317c5c63a653707c6f6ea704853257aeb893ad0c91280199abbb6b821cfd2a073c2ca92cdd948d294
+EBUILD emacs-25.3-r9.ebuild 11142 BLAKE2B 2eb2fe9e84133d53d874e66b05fe8f98c5460fb47fca1f9aaae8a869742e1ce711cf0817fdfa03d9820b44ecbb2bf055cd23743acefeee6466a5c805fa01b53f SHA512 579a75ccbc660faf0ecfe2d28e339e50e1d24412ecb36b47c5d6196b66d615feecdf12557dd9973d8a79124681ca982ee248e17dce39836cd33bc15b6da520cd
+EBUILD emacs-26.3-r4.ebuild 11793 BLAKE2B 763f18c158963b680ffe0c6a165acf752b98ca918b5339ba2ef2af44f6d0ce427add5578c77aedaf16187c99c77e42007e385321147e8183f132526f45c7fc7b SHA512 541dcfdeced3fa0b50d82be6a839e2ef3251eca9bf52f4fff3f0f25735de9d00fc9bee57cd1d35292817f287cd115a1a2e46809aeda6c33bf6edb8ea273557cc
+EBUILD emacs-27.1-r4.ebuild 14342 BLAKE2B 6cbe2e3957580b67a16456b1e052f5fb27b0f366577cde2c2a75b189cf0b81d3c78fbb716be84475a288ec0d0ca6e92f9d34c613811508d642b2eb5c1bb05dd8 SHA512 f41f5465285f7f2dc0b14100cd5746b5c795be62b16800cbf0393c9c6e057d542c5b4a452c1bffd83477f367ae7755e0676c9be699428e9f268f41523f05a1b2
+EBUILD emacs-27.2.9999.ebuild 14306 BLAKE2B 1f2be5d61cf735985c853b910ee13c2d5ca715a65180ab87d0c5299b4c452bc7ad1f2472820673640d4421647528d29e37adbf103bcb902850e5effe0f96e796 SHA512 1c3ba3a69acd55af91c72466a1f79f490d9f67620936d82e09ae779161c3b0a8a14a5d9171f19371008353be18bd202cd25ef831f17daceb9a148e5c0ed01b00
+EBUILD emacs-27.2.ebuild 14307 BLAKE2B 9faa2dcb6062acd107fca6da404aa7066095577dd7db174cde7c682a4d2291df150566b376940db984d70726bf6dcd08149505c29323f1da5dd9100e6518c32d SHA512 727e6ebbdb9776c2b420ff555947f14642fa771fe73cc43b1dda47642d8b0b7830093df683901fe3c4d13e8910f975fe5337e74868e1c6f08d0eea0d846f1ae9
+EBUILD emacs-28.0.9999.ebuild 14192 BLAKE2B 5fa9b173b7d24fb1ff0a648d7f6d54230627b9671250f51764011f3bd4f1f199f3df059fdd29c58f99c97f365b01755983c04a0405f5195faa3df894d9363898 SHA512 58912827a64f4c0da66b979d40dfd0c756ae92396853428a9a3384411762b586c712312bde002f276017b9819cffb4735bf48ff0cec77f64bd74813a292abb5e
 MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
--- a/app-editors/emacs/emacs-18.59-r13.ebuild
+++ b/app-editors/emacs/emacs-18.59-r13.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -34,7 +34,7 @@ BDEPEND="app-eselect/eselect-emacs
 RDEPEND="${RDEPEND}
 	app-eselect/eselect-emacs"

-PATCHES="../patch"
+PATCHES=("${WORKDIR}/patch")

 src_prepare() {
 	default
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@ -90,10 +90,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # operations later on
 FULL_VERSION="${PV%%_*}"
 S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")

 src_prepare() {
-	eapply ../patch
-	eapply_user
+	default

 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
 		|| die "unable to sed ctags.1"
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
@ -97,10 +97,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # operations later on
 FULL_VERSION="${PV%%_*}"
 S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")

 src_prepare() {
-	eapply ../patch
-	eapply_user
+	default

 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@ -100,10 +100,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # operations later on
 FULL_VERSION="${PV%%_*}"
 S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")

 src_prepare() {
-	eapply ../patch
-	eapply_user
+	default

 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@ -110,8 +110,7 @@ FULL_VERSION="${PV%%_*}"
 S="${WORKDIR}/emacs-${FULL_VERSION}"

 src_prepare() {
-	#eapply ../patch
-	eapply_user
+	default

 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@ -150,7 +150,7 @@ src_prepare() {
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 	fi

-	eapply_user
+	default

 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
--- a/app-editors/emacs/emacs-27.2.9999.ebuild
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild
@ -149,7 +149,7 @@ src_prepare() {
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 	fi

-	eapply_user
+	default

 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@ -149,7 +149,7 @@ src_prepare() {
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 	fi

-	eapply_user
+	default

 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@ -145,7 +145,7 @@ src_prepare() {
 	# for live ebuilds FULL_VERSION doesn't exist in global scope
 	use jit && QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"

-	eapply_user
+	default

 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
--- a/app-editors/pyvim/Manifest
+++ b/app-editors/pyvim/Manifest
@ -1,3 +1,3 @@
 DIST pyvim-3.0.2.tar.gz 35227 BLAKE2B 8edc2218b3a0f2ba922531b75f65a5273ad9a2697f72ecf994cf7d2406c6311c3f28b22b6adb1243150a90db74962256ceaa7cf47ec99c2388299742451d6efb SHA512 da961342ba52e5beca44a607cbb923953388e8674409db9ca2b152017eeedce84f92e42a9f6d0e5019c5c4d88d82f4a987cb378f311cf84a169cefa54dc5efce
-EBUILD pyvim-3.0.2.ebuild 841 BLAKE2B a89ff0e37418d8074590bdc466043814495da8ff8a9afa098d41d81d481b775455ace75ed545fcfa2f8d7d65410a548c5ee362fe7a40e610a10548f50b19c2d3 SHA512 1a951ab19f8eea020cf65a27bf2916b0aa77c0350be1f71c5145f07d48c18d539bf9cef68cdb354afb9450f882c5c4ab844016866a6a1a96cf261885d52ec2bc
+EBUILD pyvim-3.0.2.ebuild 844 BLAKE2B bc26e36c80766ccef0ba23182d13ec76043629c942e08513c1327153583d09a9d87c9142aefcf53f374c3738f213c8322bfe297f6cde5a7e9cfac1977cdf3c7a SHA512 2c1c96163032704aacaa6414f3946328af026eec8d7a0d86ec289266b2b5c5eefc03c5d927c88927d2bb11ae25b1a2bbd407b808c76333aa8dcd50fffb312170
 MISC metadata.xml 489 BLAKE2B c68a02d61b1c1e6f577c4fa415ce88e93cb4fad16418800dbdb5121baba72f521f18c1d253089835b7b99ff94e6f095051974dfadc5c55b6dc33a52ac6b25b58 SHA512 8ad8692c0a2e47b5135497d49c4a5676607e429a5281b7bfc3f9f0ba6e77195020218f1a444cfd587deee7a7cd2cd6f56ff28d66392f14b5b48203097b08680a
--- a/app-editors/pyvim/pyvim-3.0.2.ebuild
+++ b/app-editors/pyvim/pyvim-3.0.2.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )

 inherit distutils-r1

@ -17,12 +17,13 @@ KEYWORDS="amd64 x86"

 RDEPEND="
 	app-eselect/eselect-vi
-	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
+	dev-python/prompt_toolkit[${PYTHON_USEDEP}]
 	dev-python/pyflakes[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/prompt_toolkit[${PYTHON_USEDEP}]"
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"

 eselect_vi_update() {
 	einfo "Calling eselect vi update..."
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@ -1,3 +1,5 @@
 DIST buildah-1.20.1.tar.gz 11522195 BLAKE2B 2fe2aa9ad5c2212b98be5bced24b6aee39a43ab2c1b28c2c1729cce2b8cfe5920ecb64f013c28d870c6b8c9b369630f83e27dc7698eb66b3e368ef0bff4cb3ed SHA512 22495d9f0da1d6061ddb41e4cecfdb2108c152262798d6c959fc524870160f15ee486bcc37e262e571c64dc732e852f05e6c4b9331bbdef4150bd56997fefa83
+DIST buildah-1.21.0.tar.gz 11693220 BLAKE2B 1f281830ca348e55e9cc2e55dd92e8372174f736c6e8a7ae4de1f5c3279bc272036cf65a2946a143df6e1f282461d347f26c361894b83399854cf900e9f2cc71 SHA512 2ce6afceadec37f54f7f80562969cc382267dabc4fa5a89a09a211326e403376d209d89162333337af8602cb5c551eb446d3c9fac26f516fb8d354a7b5b77472
 EBUILD buildah-1.20.1.ebuild 1142 BLAKE2B 66e377badc4f4ab69dc41f0c04a88a92c7114f5a0171359898f3c8061dc04bca813f627cdf88390a89900d07f7ea8d89adca952a0434a0321cfc824534a6da46 SHA512 5beeba858d55b381e7de141256c6a3f07d4bad59367b3957977871b27105f455a4535a9152909a72c6bc11bc121cff5c5eef901a26ad6c5fa2f4497352f4bf84
+EBUILD buildah-1.21.0.ebuild 1178 BLAKE2B 9e6bb617764112b169d3c7ca3e40dc277954a55add0b04fbfe3856dd07ee7b19c9f00b0b5110a1d44b2b67e744080675413c5b9391ba0827c934a909ae72e05d SHA512 3ebbef12e29c24a2c30f5225cce157dbd5fe3d007f99855ffea5ab739ff005241f35fe5f3ca0834b5bf7bff75367523d56e859e4ec88bac9a28adf75d3992f49
 MISC metadata.xml 327 BLAKE2B cd14ee5c563ac21da34ce7728d2d12b797374bc43c50f4a9923d773ae4e010d4930793a0f0ecf610bb798fb3f1b7cd567944cf9895258e9244c3852969ac2406 SHA512 bed26d87edba20ed9385633b70b8bc23fc046ed95aa9b608400933ed4199594f6d0461854060a68b42d33a9b7be0d1b61f52e22e0d3b6d2c2248f58442094711
--- a/app-emulation/buildah/buildah-1.21.0.ebuild
+++ b/app-emulation/buildah/buildah-1.21.0.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=5e3515c5
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="selinux"
+
+RDEPEND="app-crypt/gpgme:=
+	app-emulation/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+	sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
+}
+
+src_compile() {
+	emake GIT_COMMIT=${GIT_COMMIT} all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin bin/{${PN},imgtype}
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@ -2,7 +2,7 @@ AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037
 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
 DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
 DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e SHA512 f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070
-EBUILD containerd-1.3.7.ebuild 1958 BLAKE2B bc1157830c72a3b592bbca0bf059cbc799d56773c3339c891d65b916d5a12d0a845a632329572a6b6806b342263d5f8a09fa518772b0faf1fa80949c170ba8f8 SHA512 8b97b3a417b03b0f6a343a90cbcdd50b623c903ec545626e3c433cc62bf3ad4595dbc936a2de1f26237891fb13132e8b7c504b685902ce062609b1a7c3d98cc9
-EBUILD containerd-1.3.9.ebuild 1925 BLAKE2B d934c46fa35d50cdbe3c91857733def0504b867a800dab0f9b60353726786db2c2b87b98fdfd9bfbaab25d00802dc181c55cd45bec27cd210c61c964e1bf5d68 SHA512 4b62ffc53a2cc143b8551ac56b1bcc9af5c808f4727aa662da301654963eccbed5b50269e01b862e6fa07793c9c576775fff297fae8c63efe4c4304624bbae03
-EBUILD containerd-1.4.4.ebuild 1788 BLAKE2B d6a1e413b8c8c31c083928147e0887a2f31d7dbdaaf3b36b6a71e1e769b4c320ea5fe55fbf2efc74a1b1707ade20dc031b2a1ef72b597255cc2054b258fc39fe SHA512 8540d2c35455becee67b991f3b34675c24e107188b352acd3f3b38525053589f37a9e0f02d154b80aa8dbbc2cf956d779c659b5af3ffe1e90745c2818f2dfc5e
+EBUILD containerd-1.3.7.ebuild 2060 BLAKE2B 17a524d749ab4c93a10b611809f63b951093f70f3b54bbcfb7ab37b3bbbb16bfbc4663f38dce3b4a358a7226ac7c93501d5de35595a5b864fb8917eb970553ca SHA512 fd421d1d9c0ed3fda728591611f9c691bcdfa58d8daa185c1a4cd244d9206f3e9c2a71d56742ce850f84aa61266ccc9f6172fda20b31b67e14c8800ff9cf367c
+EBUILD containerd-1.3.9.ebuild 2027 BLAKE2B 5147229fede581c46fcf29583b7b06e56586a06e9a29fa27b984ec00e87abab743565befea28a08e722bd97aa160ba98654bcfd95ed852a35b619b8e66184120 SHA512 f686aebab6556ac6694aae474894f054cb13c0076258de179e75b735a9685360778491bb233148185cfc1bea346cb6aebeeed5b7e903185a451812467cd54985
+EBUILD containerd-1.4.4.ebuild 1890 BLAKE2B ceb56a42ce8c8447bcb2daa7ca9b9cbd2c2142cb926f94f106314261e53db675295afb8786cb7405bb695ddd9d80e9d8483f890ef507ca523438efa0d877fddb SHA512 e3d9bec60e941dae7d3d8398eb8c8ef5e006e3557563cca1e50a3577d30424ed4d22c87f25b6c82874c74851a086d1d61ae32f6eb0aec0eeba131e10ff39c498
 MISC metadata.xml 1073 BLAKE2B 5f1a667e9b8812a71e24318d51353b010f9a3662c608627c68cdd13431a6d8380b51b8b8619b2a98fd9dece381a391f18a35458156ef7743b10825aee4c58e8f SHA512 46e110750ad8da48d741b612c8c1f030d493636c0255f1944134660eddb5693488c1093df47252d09589bf90565d525819a82a0594ce8f727165f1a822acb537
--- a/app-emulation/containerd/containerd-1.3.7.ebuild
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@ -66,7 +66,9 @@ src_compile() {

 	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
 	export GOFLAGS="-v -x -mod=vendor"
-	emake "${myemakeargs[@]}" all man
+	# race condition in man target https://bugs.gentoo.org/765100
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
 }

 src_install() {
--- a/app-emulation/containerd/containerd-1.3.9.ebuild
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@ -66,7 +66,9 @@ src_compile() {

 	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
 	export GOFLAGS="-v -x -mod=vendor"
-	emake "${myemakeargs[@]}" all man
+	# race condition in man target https://bugs.gentoo.org/765100
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
 }

 src_install() {
--- a/app-emulation/containerd/containerd-1.4.4.ebuild
+++ b/app-emulation/containerd/containerd-1.4.4.ebuild
@ -63,7 +63,9 @@ src_compile() {

 	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
 	export GOFLAGS="-v -x -mod=vendor"
-	emake "${myemakeargs[@]}" all man
+	# race condition in man target https://bugs.gentoo.org/765100
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
 }

 src_install() {
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@ -1,9 +1,6 @@
-AUX protontricks-1.4.3_no-setuptools-scm.patch 1174 BLAKE2B 16ad14073457431d388e295d5004874a8b7bc74aa5762c3f4a950c35ad485d9dc60312acaa511541ff4f2d2e826c31e5c74d1f51d80721bb5ffaa23903714283 SHA512 99349a830eba3e248db3f67f5cd842764700fff51788db1fc649ba9dbef3f356c6ec4a66e4608a74eb67b919d53700b5c501e55a98f78e67e9c63e6f851aa18d
 AUX protontricks-1.5.0_no-setuptools-scm.patch 1321 BLAKE2B d96472bf9b0827cbc6bb9debf6c8da9f27773da4587d5b5c663180913ef4595fe21c5edd4798a8e98ee0a00dad75acec41dd0776e3dfaa6ff0aa186167e70c6b SHA512 9fce0b3ddd34801b7af8adcce2990c875ce68ed9289717f08f1f1653d447887b67b65d5c35de14a126dfbd4d1143fdef8fb8399f55aa59c498a68b0bc0480bad
-DIST protontricks-1.4.3.tar.gz 43573 BLAKE2B 3a3050ba6e940182d81d98498a5558433ceaa4282f5a23fb93b3cfc299699381493eb2912c5f03bb6a8092be5c50b94bf7181208cda3d4c0f4c90c0f438f7f1b SHA512 7ca8c7c273d92f7c4526caaa8c9db6988c642913c33c6b6188d285d5cfbe30924533a9f024135865cdc1a25bd867ac00bd915b0a61417d17fe0e5ee451417e64
 DIST protontricks-1.5.0.tar.gz 46957 BLAKE2B 622affd9a1bfff3a5cd76fa8e279f25b5c91a6f040b6cc4e5f42e58be08a232fad2be179a47e063b45b1b1bb11b6ae9ce26cce499f4c1dae460be0bb8247e619 SHA512 6df3e0dd638684e70a8d40b7440e2340765109e31dd47fa5e33e4959bc34d3ff4cfa70c8689cafdcce82f1d97ba6d25de724ca7439e5d1ffd634b729ab222716
 DIST protontricks-1.5.1.tar.gz 48111 BLAKE2B df7feaefd2ec1c058fa7190ec9c981bd480e5d36cf7a3e15868aa8e052857e69dc573559e35faf74d9d2f4a5549471cb0e8fc0be58ed2431890e37751c88cab8 SHA512 4b8d5d17a4bce8bd987c032f5a5ae689d1dcca4694463778398bb62b983afe6eee666aed891c810e852a9f873233b1822d21878464b25f07f8ab92e1777f3ff1
-EBUILD protontricks-1.4.3.ebuild 1442 BLAKE2B a1656810ec6810c0899349e7a03835a45a92183799d0a39e4257c551208a4a589211127e6b3087d4a7c68024eebd6a54be841a13e6c25c1b0a51e0b755a1e90e SHA512 9b9a9d1de030e9e7e2574295e3ed054c90a36237c462024e2a8996082e088a903a535d27a8f45742345bba6edc84ee476d0639ff60e1411045ef165dfc4c6374
-EBUILD protontricks-1.5.0.ebuild 1444 BLAKE2B cdb33ec0c2fa7d1c941f478f2613f54da28aac8b075deb185f3e96c294e88f1010f97d4f024fa36954371be55481c88ab4c274c222b1454778c50eeb528ce845 SHA512 d3e7c95a8f9869ce7722514b361f5e663092c5994a14a3e39345bd1b6dc5e13ebe31042767441ec32569cd43ed9129a99231cae52cb280b550817a5f6084018f
+EBUILD protontricks-1.5.0.ebuild 1443 BLAKE2B a64ee0e8679859aa818b2c34e42dadfe9eb194c6f97d526cbc4dec8ff0121598f8fcb9e9a006d694318cfffa4f8040f25dd664c576bdcc7383669c5eb7d71dd4 SHA512 382d6f5fd98f523cf954763c5cb61bc39668af84eff511e38fe867d50d10b1971dbeb047137ecc5ed44f0a0a94eb62db78f38d86841bbb430dc7c657acce5ca2
 EBUILD protontricks-1.5.1.ebuild 1444 BLAKE2B cdb33ec0c2fa7d1c941f478f2613f54da28aac8b075deb185f3e96c294e88f1010f97d4f024fa36954371be55481c88ab4c274c222b1454778c50eeb528ce845 SHA512 d3e7c95a8f9869ce7722514b361f5e663092c5994a14a3e39345bd1b6dc5e13ebe31042767441ec32569cd43ed9129a99231cae52cb280b550817a5f6084018f
 MISC metadata.xml 808 BLAKE2B 9abbb6d1689e04026c239dc2bde4a2d975bb260473178e68c0ec3e37a3e4c3e6db701ece9e8551d5ba071db14effc7e59a15a5e13c2049a6cd9d0709562bf709 SHA512 21452c10fe698d461aa814bc1bddb6350fcd8f60b7c84d8949f1eb8a1932ae3f9214c123451334ac2108f6ad930d5e6f5b522eac477ed6f6af1c916326254c32
--- a/app-emulation/protontricks/files/protontricks-1.4.3_no-setuptools-scm.patch
+++ b/app-emulation/protontricks/files/protontricks-1.4.3_no-setuptools-scm.patch
@ -1,32 +0,0 @@
-Since version 1.4.1 upstream has used setuptools-scm to determine the
-current version number. Unfortunately the package in question does not
-support GitHub release archives, using GitHub VCS snapshots would require
-retrieving and updating commit hashes corresponding to release tags, and
-PyPI tarballs do not contain tests. setuptools_scm_git_archive does not
-help because it requires extra files to be included in the repository,
-which upstream has not done.
-
-Seeing as we already know the version number, bypass setuptools_scm
-altogether and create the version file ourselves. For obvious reasons the
-latter has to be done in ebuilds themselves.
-
--- a/setup.py
-+++ b/setup.py
-@@ -16,9 +16,6 @@
- 
- setup(
-     name="protontricks",
-    use_scm_version={
-        "write_to": "src/protontricks/_version.py"
-    },
-     description=DESCRIPTION,
-     long_description=LONG_DESCRIPTION,
-     author=AUTHOR,
-@@ -28,7 +25,6 @@
-     packages=["protontricks"],
-     package_data={"": ["LICENSE"]},
-     package_dir={"protontricks": "src/protontricks"},
-    setup_requires=["setuptools_scm"],
-     install_requires=["vdf>=3.2"],
-     entry_points={
-         "console_scripts": [
--- a/app-emulation/protontricks/protontricks-1.4.3.ebuild
+++ b/app-emulation/protontricks/protontricks-1.4.3.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
-HOMEPAGE="https://github.com/Matoking/protontricks"
-SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+gui"
-
-RDEPEND="app-emulation/winetricks
-	$(python_gen_cond_dep '
-		dev-python/vdf[${PYTHON_USEDEP}]
-	')
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.3_no-setuptools-scm.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file"
-}
-
-pkg_postinst() {
-	elog
-
-	if ! use gui; then
-		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
-		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
-		ewarn
-	fi
-
-	elog "Protontricks can only find games for which a Proton prefix already exists."
-	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
-	elog
-}
--- a/app-emulation/protontricks/protontricks-1.5.0.ebuild
+++ b/app-emulation/protontricks/protontricks-1.5.0.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+gui"

 RDEPEND="app-emulation/winetricks
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@ -8,7 +8,6 @@ AUX qemu-5.2.0-disable-keymap.patch 884 BLAKE2B dbbe245a52615f8894cbac1c94ce3fee
 AUX qemu-5.2.0-fix-firmware-path.patch 596 BLAKE2B f46890eaa22ac7f94725f5dec86ccabe78f002ef6e4ce6b8f3323362203783ae65f77442634520863abc7a5ed91639c6284ccb53f0ed4f87523c7e45e4a0f186 SHA512 9fe5ed5b72098b0c5b9f9b6ae371ac745de9e269f3713b47ac2bd13d2f03f0827128d43757876f83eeb770dbeeade32db5f10bc9f58d02ed929a45caa5f558ac
 AUX qemu-5.2.0-no-pie-ld.patch 2929 BLAKE2B 07126013ba465c30fe9ddc8e690e1906d5fa187cf47adcfe94177fe46e6a0365622e938090b23b5517df9e78aa211f4b014939e50503ba8bc09afca5794479ca SHA512 d6cecad4d98fad469dd8514e02372053a99d8077aa4348a36609cf459d7dffa962df937fe0350540ecae4beb274dc1b3c72bce34145474491156ff564104532f
 AUX qemu-5.2.0-strings.patch 799 BLAKE2B 8f249a647714a4a677d1aca5d8d5c19b27a0e1933877a286017928e01ec23d82e41dc1d196a50ba38bcf4ec8b71fd89c89e41b7c9673faf13935188eebaf4a56 SHA512 481917c8ec9c5089c210f80e719f5a65af1193323ccda4d68bec6afaab0d0e6407cee1d05cd1f3b1bfbd7b7a5f9d2cdb42dd12123813f2c3c51116e999c09288
-AUX qemu-6.0.0-sphinx-4.patch 1177 BLAKE2B 8628ec8e3c16b9c4bdcfaf8a1e9432b516ce6e9ada3b53cb0e31f6895835bd14e69e81b2a7c0385d0e3f725785fd9a649ee70d9ba4943cdc7f46b969bd8c0268 SHA512 a40d748da23e30be40cb17df2fa10d828dd0545de4a2005cf9bda43403338f92a8bdc4342bd238ff553d743d34ada292861e2e73ba1ed3a8c587e11a5c7061cf
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
@ -16,6 +15,6 @@ DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd
 EBUILD qemu-5.2.0-r2.ebuild 25479 BLAKE2B c53c242253d3571ba7d5484ff30773e16aa51c4c14be99c7c50326657220c3ddfe5e84074b0e99268582d8c735b6ce71a179ab5ce5d88cdda33dcd0f0cc3aef4 SHA512 88f55bba87bec4393f3e4e1706ad5352a7b2f1f531b2f4c74370beeab7e4318428113040861b0dd37ed6ce3524caadfb957ab15a329fc52cf13ea1cbbd70c86e
 EBUILD qemu-5.2.0-r3.ebuild 25639 BLAKE2B d23bdb53da967696bd56afd27ef58b4653b7954d170c6957a9956aca3f6b0d23c72a3e3f786826110652838bcebd4b765fcdd679b50754fe35d04e160bf44dd4 SHA512 4860b1b80237fa6c15fd798bd94327b3b573738365a768bb1c18ecb055bd30c8a762bbfa6df3b83c8293407e2029af05de4766c9310a64eb5382076865dfd70a
 EBUILD qemu-5.2.0-r50.ebuild 25747 BLAKE2B d3e246fe9e046bcdd7b8e6d0210f0189dc399a1fe01146467f0106e92b7a91b963fcecc990266aece5aa3fcfdc79f27d84d41bf9a9dd54d7d73d2fde7ce7876f SHA512 b7c010506d72909a01dfe01cd0118a67f274322aeb12adac700631dba7198c26d3c465bd38af9fcc0bd3d46890f7dc43b45897188b41ae1bfca27e1bf68eaa22
-EBUILD qemu-6.0.0.ebuild 25612 BLAKE2B 690f0c8c291ecfe08ddbaaa4bf8edf97f75466ddcc8a6ed7d981d0b4e919b07d18a51a6776f316153e36bb037ce66a618989d29bb17e0ecdc2baab870eb512a5 SHA512 485802867e888e54a7ded12c5a700bb4502d322ad683ab7645b179aa7d375b9c1ee919480a1c7ff988dfbff49c788f08beb5b6e59271412ecb208d310f44e42f
+EBUILD qemu-6.0.0.ebuild 25570 BLAKE2B 11df2d2670ed91c92b86d58e7db91bcd10b946875d6091aa83a31c90cdd28d3fa9bd749a591cc86e428ee085f914ab2b0fc4a42896ca3e3fb662c8bfdf0004a2 SHA512 b13919ebf371043cd1de8bac1e7acd6f157c94ce80f3d99beff68f4a5466ecfe42d1532508a3b87b7fd0dbc6618b17539c019546db4fef2b6fd9756d56367603
 EBUILD qemu-9999.ebuild 25570 BLAKE2B 11df2d2670ed91c92b86d58e7db91bcd10b946875d6091aa83a31c90cdd28d3fa9bd749a591cc86e428ee085f914ab2b0fc4a42896ca3e3fb662c8bfdf0004a2 SHA512 b13919ebf371043cd1de8bac1e7acd6f157c94ce80f3d99beff68f4a5466ecfe42d1532508a3b87b7fd0dbc6618b17539c019546db4fef2b6fd9756d56367603
 MISC metadata.xml 4347 BLAKE2B c82480d51523c9f3c1d78a1eb4bfda0319b1f7e4c1576df7588fe87d7746554dc585e86ecc04d58b5f41e72f9233bfbccbc62bab20171202dabf308a2ca200d5 SHA512 a317c1a529336c0dee2e06709654d7aeb283e27d6bec1a335b3bda151ca255e5a2e5d25a940bee9aadbe0ee1c15cd9ac07248552b6156f4f3c31f06354d0e05d
--- a/app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch
+++ b/app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch
@ -1,35 +0,0 @@
-https://patchew.org/QEMU/20210503161422.15028-1-dgouttegattat@incenp.org/
-https://gitlab.com/qemu-project/qemu/-/issues/256
-https://bugs.gentoo.org/789561
-
-From c1155afabf1a3e093049975ba1748cf39734aa52 Mon Sep 17 00:00:00 2001
-From: Damien Goutte-Gattat via <qemu-devel@nongnu.org>
-Date: Mon, 3 May 2021 17:14:22 +0100
-Subject: [PATCH] docs: Fix installation of man pages with Sphinx 4.x
-
-The 4.x branch of Sphinx introduces a breaking change, as generated man
-pages are now written to subdirectories corresponding to the manual
-section they belong to. This results in `make install` erroring out when
-attempting to install the man pages, because they are not where it
-expects to find them.
-
-This patch restores the behavior of Sphinx 3.x regarding man pages.
-
-Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
---
- docs/conf.py | 1 +
- 1 file changed, 1 insertion(+)
-
--- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -269,6 +269,7 @@
-      ['Stefan Hajnoczi <stefanha@redhat.com>',
-       'Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>'], 1),
- ]
-+man_make_section_directory = False
- 
- # -- Options for Texinfo output -------------------------------------------
- 
-- 
-2.31.1
-
--- a/app-emulation/qemu/qemu-6.0.0.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0.ebuild
@ -274,7 +274,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
 	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
 	"${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
-	"${FILESDIR}"/${PN}-6.0.0-sphinx-4.patch
 )

 QA_PREBUILT="
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-notify-send/Manifest
+++ b/app-eselect/eselect-notify-send/Manifest
@ -1,3 +1,3 @@
 AUX notify-send.eselect-0.1 368 BLAKE2B 444bbdd72f8334ed024d8c4c283842fda2fc3d1ac719a69960007d454da8209edd5dd0a6e65d168c4da1c8e0ce15e2aa284b4be491f8b9a14ff498c047d8a85e SHA512 13624909369f3f0563e6aabf1d7e7fe1a7f4fa59d705dd18aa73cc87cc346d4c62ed5566c45b87802452e45b59a4342d428a32125d17ad4629b0f8292fac4757
-EBUILD eselect-notify-send-0.1.ebuild 598 BLAKE2B 23580d27c3c0d31428ae83da4f105b74a9053b9fc7a1746de5e1759083dba8aa372cbbe4e5e6a0214f1f9faf61ee137dd6bc29c0305c53b3ab5722d2299b993c SHA512 527d63397225fd908cd6c7fc49eb45d3ded012905eeb09a4363505cb77ccc3f20de6ce20b1e432a626060c664d369e3a42babb265fb25d2ee58b9343a36998da
+EBUILD eselect-notify-send-0.1.ebuild 605 BLAKE2B 181af9f9d154cda8e47f00822072e3050773ac3600e265e8e9f3c20cc5ceabbda7e3e1e2431b8c7dd90e6a0b11b86043108b60ad75a6348b4db64cf00cf9db4c SHA512 b1d591a6f5ba9280827262ae311d9e0c2dd11df46402a324bdc4e698e9e8e2de7bcbea450e262900bd5a146d2cf8328b904b0cf8eb094c8c27811b6eda264811
 MISC metadata.xml 252 BLAKE2B 269351d5fec6de1f8236181ef68d9a75ee1f8dca300a841e4e710502a04cc5383cd310672f7b629185647e441fb4e0b49edce1a39f3c2b2607c5e9d4897fdcb0 SHA512 5829caf1025801115ab3af6b5036f61fbdacf2d84cac533fc0d61e348d8387d19796469c213422f98fd61587ecb483b00b6993ae30434fa5e89e5361aeadc6bf
--- a/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
+++ b/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"

 RDEPEND="app-admin/eselect
 	>=app-eselect/eselect-lib-bin-symlink-0.1.1
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@ -1,5 +1,5 @@
 DIST ibus-table-1.12.1.tar.gz 1365421 BLAKE2B 1ce49d5a837fc6cc1e00e681a51518d6ac5e9fb421a10493c110c67247a625df1fd6174c7bf4ee1c465253b77fee402ef5ae2a6f50b9466ffd64727e68edaafe SHA512 9cbd7c24067d182d3917eb66d8b18ea30e893b2d9a19dfb48ce4c91a41868707bf9682011f374dc2397f59f101855bddde0fbbe374856063e1f4226de7a9a01b
 DIST ibus-table-1.12.4.tar.gz 1371890 BLAKE2B e0d531bdd38e536ac9fc92465a651e971969278ab4826198d12399ebb1cd747d1f5d21713ecc86311ab3995b04a2842d230da8caed962045a959ba136f197cb1 SHA512 3e175dad8d9e12be91f6b6878b67301bbbf04c55e43d483162d3b10d2edbdcf1077d1f37beea2ef36323eb7de289a0c60cd3d055357a580e5d18bcc642bb907c
 EBUILD ibus-table-1.12.1.ebuild 1047 BLAKE2B a85be7cc7fb62c96fa5064ab29ef35f037ee5daf0f64d55737a75c4fa0775fabee627b76d0ec52dcb9faab2d605a359a190227651935915dc58348bfd316a9ea SHA512 e82a8475b8e4c93ce7fee1852994da8bdcac4a326d9817d4b356a2c4760de6ea9f0eadeb8fc91affa9d46232ba76c36eb67d375893faab1199e9230ebee3e5b5
-EBUILD ibus-table-1.12.4.ebuild 1051 BLAKE2B 1dd8c9008d0bdb0b8a0770d19e911fda75adf8c0e06e32e3f60b0f5b58d82a84e552e8920c64f297cf84f591511a52fc3f53c3e44571f63a1ba93979cce6dcf9 SHA512 92a7aa189d958e4951f9790a610334c6331144532eaf7632131549a953ceb9ad6642577cf99aee1299f529c390f1c8fc0cc621a538541a10d84ba0bb9a5454f1
+EBUILD ibus-table-1.12.4.ebuild 1049 BLAKE2B 91fdb64bf25c53f0969ca7daa33e8285dfcedc3cef1fbde7520b3fb3f985abdd3a7047160637f258da77845c93f0703dd702b59df088403170dee7a4f8339494 SHA512 d51fa637a388a012bfd488e553a09b7de95d189199a6080c023fdf1489528436c953c92c93b247dcd970f5aecca97afe701e3295c70185228797de80d4c6a19d
 MISC metadata.xml 314 BLAKE2B bf730195fa020f6a78881c37dcca2874ff8d055f92cbfdd5c8a051bae6e6e7ba79f3346962e9dba9b424e69e6c01dbaffd65b2ba27aa374bbb34d7569f360868 SHA512 9abb502029e18744eee84d9a362594222a10ae9efb9a4d42d9bab1fc04b57c1067051676b028b10304d10a3925b23ee8bb5542d289db071b1c189d19764f81ff
--- a/app-i18n/ibus-table/ibus-table-1.12.4.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.12.4.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"

 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@ -2,4 +2,4 @@ AUX i8kmon.init 397 BLAKE2B 54d12165aa4d8cee50e4e73392d39f0064669f55e57e999dce4d
 AUX i8kmon.service 158 BLAKE2B e567398b719557fffc6b4a244e4528d6147e8406db59d4cca39d531e88a04be5e4154971f15ed9db24d7f8ebfef103ea78cdaa4aeae356823045f7012782cf39 SHA512 77cbed13d4c1982a491faafe7e45da7a4fc06ea94e6b126405211f54a4bb5b4c794d94f6ca56d6d16ad0e0e62d8311bf90e0e6c60c74147ea12963c530c69529
 DIST i8kutils-1.43.tar.xz 29184 BLAKE2B 3489de1993267eb8aaca1dc00e6c19f68be14b5351715828eee9d4e6abbedbcd3faa58aba5e764de4bbf6cfa41e0a64d011d1d5ea904b261fa3f9842a4501bab SHA512 eed2db9e5864b0dc24e22302ce2abaa54415520a920cfa0be08068b8316a3c2c04b3565cc84164e36fb7ae5bb8b77be55ae179255e03ecd86ea664d85cece456
 EBUILD i8kutils-1.43.ebuild 1150 BLAKE2B a4fc7832095a20bab0267bfb2b95a4b2298eae3e272b115eee00cd1610016a2f6c0d7b2cf5d4a1da6314a773c2862d5578a25b36f74de12b49285b0261ba556e SHA512 c0bd9abc87d2b01253edc2af86c2f9ed5d91aed35c7f7a87d667c813498554996748b4cdffcab705e46dd0cd2f4b1bc25a356654405a84938332413171511e78
-MISC metadata.xml 485 BLAKE2B 75c334131b955002752321192acb3e3ae092e325e8d868477742a3a0c63d616cef83145d0abefce2a6b0c326295609a16700fdaa18bcebbff06e13e4fd6c0f3d SHA512 54f23399c9913a0cedc0d1f7db5a974b9f05827c30dd9ad95385b52807dfbbc75d72110659fa91613ee8a42893061f964675f53ed5a1e0415ad70fdbad45f48f
+MISC metadata.xml 485 BLAKE2B b84b7bf724c6e35765559b07bfc843d4da5fd500c8a229a18d43d50b94d6c4db3f8cf780deae7954d1b0c21e7a8d44608f318b6a2207d8d3ad727bb79084fcba SHA512 a3ae8021e58e4c021acaf1760a0f65ea829c67bbed0e0c1c679b031875a89b47a3fffea46a57676279ddd7eefd8ca8479db32497612968c4a4f46b1518026046
--- a/app-laptop/i8kutils/metadata.xml
+++ b/app-laptop/i8kutils/metadata.xml
@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>octiabrina@myrvogna.net</email>
+		<email>myrvogna@electrosphe.re</email>
 		<name>Octiabrina Terrien-Puig</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/logitech-applet/Manifest
+++ b/app-misc/logitech-applet/Manifest
@ -1,6 +0,0 @@
-AUX 40-logitech_applet.rules 251 BLAKE2B f29b2df9ca3427e4bfbe993a9d92ce39df25aefc13d4698418a13530e60f2c57c80ae9f4f2a3baecc1ddd2da2178d5be5f68d354f44fb88a5ce357e05d510c4b SHA512 689058ab61508c342a29dea2de620473453e9237c33cc0119b2c22dc502b6c345d8e42d7769c7cc246c75efbbfa91bd2fdaea15c40ce89468224274b20b80670
-AUX logitech-applet-0.4_pre1-configure-error-handling.patch 594 BLAKE2B fc1484e8e35e79f7d6e27ba51ec9093f11c48974a59ce20d01032d978ab3786a8ef44533dd8b84b63ed4713d47de052ce589b3f3a99bb3dff4364454520f7780 SHA512 b67e2ca4fffd907168f75764d5cdfd1eba10e2137365b970b74bf2bddac57b0a8733f3f87e222eaf945023a6c9405eb09775c17cbaffc1fb904b1e06ff16e1bb
-AUX logitech-applet-0.4_pre1-mx300-mx518.patch 5815 BLAKE2B 79c277fd37a439ba3441e0414437004443967c06db6d5615a47da134ddf2daa8b4ffbde43aa3a210e6a76e8125def42fd033fe706ed85a937249db6feb5feb86 SHA512 5b613821ed6c88eed99c36bf1d6df5c27183e41e176082247752970f372aef0e299e729aaeda508ef1cfe323a0e3ce368d3ca1a13a6836278458a531531883ff
-DIST logitech_applet-0.4test1.tar.gz 75783 BLAKE2B 71ac28c1efab922c5d48db00be53eb0c9200ea05972d1fc1a9551f3963fd9d4be46e7a66ebabb873873e1c0e89486e0e32ea7810cafb3eb0ade67cf399c46508 SHA512 64389b365d9d3473bf3ec027c7d9ee34cbdcddf9abb6bfabf4e771a255dade80e6758b7a997da3eaf23c19f1bd4559e79fb199e9f62e0f2ad1af92eab4b23789
-EBUILD logitech-applet-0.4_pre1-r3.ebuild 851 BLAKE2B 34e6213378a443a4af39475ac562fd9bab46f3d829247611f432e24c96efe0a2cf0ba46115d9dbab3f0b3ebf6246d3e925514b8a4217058b91f426d6744b46b0 SHA512 8cd14c25828edef0a7c9477f07c25732cef7ed7b7f481409ce04afa7c9c7ea10dba7635e983d28cc702af1da60e822f3d1095b95a4db27d74999522fb561470a
-MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
--- a/app-misc/logitech-applet/files/40-logitech_applet.rules
+++ b/app-misc/logitech-applet/files/40-logitech_applet.rules
@ -1,6 +0,0 @@
-ACTION!="add", GOTO="logitech_applet_rules_end"
-SUBSYSTEM!="usb*", GOTO="logitech_applet_rules_end"
-
-ATTRS{manufacturer}=="Logitech", ATTRS{product}=="USB-PS/2 Optical Mouse", RUN+="/usr/sbin/logitech_applet -s 800"
-
-LABEL="logitech_applet_rules_end"
--- a/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch
+++ b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch
@ -1,20 +0,0 @@
--- a/configure.in
-+++ b/configure.in
-@@ -24,7 +24,7 @@ if test "$LUSB" = "no"; then
-   echo "   http://libusb.sourceforge.net"
-   echo "   or use the --with-libusb-includes option, if you have it installed"
-   echo "   in an unusual place"
-  exit
-+  exit 1
- fi
- AC_CHECK_LIB(usb, usb_init, LUSB="yes", LUSB="no")
- if test "$LUSB" = "no"; then
-@@ -33,7 +33,7 @@ if test "$LUSB" = "no"; then
-   echo "   http://libusb.sourceforge.net"
-   echo "   or use the --with-libusb-libraries option, if you have it installed"
-   echo "   in an unusual place"
-  exit
-+  exit 1
- fi
- 
- AC_OUTPUT(Makefile)
--- a/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
+++ b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-mx300-mx518.patch
@ -1,139 +0,0 @@
--- a/logitech_applet.c
-+++ b/logitech_applet.c
-@@ -40,6 +40,44 @@
- #endif
- 
- #define VENDOR_LOGITECH 0x046D
-+#define HAS_RES 0x01  /* mouse supports variable resolution */
-+#define HAS_SS  0x02  /* mouse supports smart scroll control */
-+#define HAS_CSR  0x04  /* mouse supports cordless status reporting and control */
-+#define HAS_SSR  0x08  /* mouse supports smart scroll reporting */
-+#define USE_CH2  0x10 /* mouse needs to use the second channel */
-+
-+struct device_table {
-+    int idVendor;
-+    int idProduct;
-+    char* Model;
-+    char* Name;
-+    int flags;
-+} 
-+
-+device_table[] = {
-+    { VENDOR_LOGITECH, 0xC00E, "M-BJ58", "Wheel Mouse Optical", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC00F, "M-BJ79", "MouseMan Traveler", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC012, "M-BL63B", "MouseMan Dual Optical", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC01B, "M-BP86", "MX310 Optical Mouse", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC01D, "M-BS81A", "MX510 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
-+    { VENDOR_LOGITECH, 0xC01E, "M-BS81A", "MX518 Optical Mouse", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC01F, "M-BS82", "MX300 Optical Mouse", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC024, "M-BP82", "MX300 Optical Mouse", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC025, "M-BP81A", "MX500 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
-+    { VENDOR_LOGITECH, 0xC031, "M-UT58A", "iFeel Mouse (silver)", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC051, "M-BS81A", "MX518 Optical Mouse", HAS_RES },
-+    { VENDOR_LOGITECH, 0xC501, "C-BA4-MSE", "Mouse Receiver", HAS_CSR },
-+    { VENDOR_LOGITECH, 0xC502, "C-UA3-DUAL", "Dual Receiver", HAS_CSR | USE_CH2},
-+    { VENDOR_LOGITECH, 0xC504, "C-BD9-DUAL", "Cordless Freedom Optical", HAS_CSR | USE_CH2 },
-+    { VENDOR_LOGITECH, 0xC505, "C-BG17-DUAL", "Cordless Elite Duo", HAS_SS | HAS_SSR | HAS_CSR | USE_CH2},
-+    { VENDOR_LOGITECH, 0xC506, "C-BF16-MSE", "MX700 Optical Mouse", HAS_SS | HAS_CSR },
-+    { VENDOR_LOGITECH, 0xC508, "C-BA4-MSE", "Cordless Optical TrackMan", HAS_SS | HAS_CSR },
-+    { VENDOR_LOGITECH, 0xC50B, "967300-0403", "Cordless MX Duo Receiver", HAS_SS|HAS_CSR },
-+    { VENDOR_LOGITECH, 0xC50E, "M-RAG97", "MX1000 Laser Mouse", HAS_SS | HAS_CSR },
-+    { VENDOR_LOGITECH, 0xC702, "C-UF15", "Receiver for Cordless Presenter", HAS_CSR },
-+    { 0, 0, 0, 0, 0 }
-+};
-+
- 
- int get_resolution(struct usb_device *dev)
- {
-@@ -141,7 +179,12 @@
-     return cruise;
- }
- 
-/* resolution should be 0x03 for 400cpi, 0x04 for 800cpi */
-+/* resolution should be:
-+ *  - 0x03 for 400cpi
-+ *  - 0x04 for 800cpi
-+ *  - 0x05 for 1200cpi
-+ *  - 0x06 for 1600cpi (actually 1800cpi on newer MX518)
-+ */
- int set_resolution(struct usb_device *dev, int resolution)
- {
-     usb_dev_handle *usb_h;
-@@ -233,39 +276,6 @@
-     printf("Logitech Mouse Applet, Version %s\n", VERSION);
- }
- 
-#define HAS_RES 0x01  /* mouse supports variable resolution */
-#define HAS_SS  0x02  /* mouse supports smart scroll control */
-#define HAS_CSR  0x04  /* mouse supports cordless status reporting and control */
-#define HAS_SSR  0x08  /* mouse supports smart scroll reporting */
-#define USE_CH2  0x10 /* mouse needs to use the second channel */
-
-struct device_table {
-    int idVendor;
-    int idProduct;
-    char* Model;
-    char* Name;
-    int flags;
-} device_table[] = {
-    { VENDOR_LOGITECH, 0xC00E, "M-BJ58", "Wheel Mouse Optical", HAS_RES },
-    { VENDOR_LOGITECH, 0xC00F, "M-BJ79", "MouseMan Traveler", HAS_RES },
-    { VENDOR_LOGITECH, 0xC012, "M-BL63B", "MouseMan Dual Optical", HAS_RES },
-    { VENDOR_LOGITECH, 0xC01B, "M-BP86", "MX310 Optical Mouse", HAS_RES },
-    { VENDOR_LOGITECH, 0xC01D, "M-BS81A", "MX510 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
-    { VENDOR_LOGITECH, 0xC024, "M-BP82", "MX300 Optical Mouse", HAS_RES },
-    { VENDOR_LOGITECH, 0xC025, "M-BP81A", "MX500 Optical Mouse", HAS_RES | HAS_SS | HAS_SSR },
-    { VENDOR_LOGITECH, 0xC031, "M-UT58A", "iFeel Mouse (silver)", HAS_RES },
-    { VENDOR_LOGITECH, 0xC501, "C-BA4-MSE", "Mouse Receiver", HAS_CSR },
-    { VENDOR_LOGITECH, 0xC502, "C-UA3-DUAL", "Dual Receiver", HAS_CSR | USE_CH2},
-    { VENDOR_LOGITECH, 0xC504, "C-BD9-DUAL", "Cordless Freedom Optical", HAS_CSR | USE_CH2 },
-    { VENDOR_LOGITECH, 0xC505, "C-BG17-DUAL", "Cordless Elite Duo", HAS_SS | HAS_SSR | HAS_CSR | USE_CH2},
-    { VENDOR_LOGITECH, 0xC506, "C-BF16-MSE", "MX700 Optical Mouse", HAS_SS | HAS_CSR },
-    { VENDOR_LOGITECH, 0xC508, "C-BA4-MSE", "Cordless Optical TrackMan", HAS_SS | HAS_CSR },
-    { VENDOR_LOGITECH, 0xC50B, "967300-0403", "Cordless MX Duo Receiver", HAS_SS|HAS_CSR },
-    { VENDOR_LOGITECH, 0xC50E, "M-RAG97", "MX1000 Laser Mouse", HAS_SS | HAS_CSR },
-    { VENDOR_LOGITECH, 0xC702, "C-UF15", "Receiver for Cordless Presenter", HAS_CSR },
-    { 0, 0, 0, 0, 0 }
-};
-
- int main(int argc, char **argv)
- {
-     struct usb_bus *bus;
-@@ -318,8 +328,12 @@
- 		resolution = 400;
- 	    else if (!strcmp("800", optarg))
- 		resolution = 800;
-+	    else if (!strcmp("1200", optarg))
-+		resolution = 1200;
-+	    else if (!strcmp("1600", optarg))
-+		resolution = 1600;
- 	    else
-		printf("Bad argument (should be 400 or 800)\n");
-+		printf("Bad argument (should be 400, 800, 1200 or 1600)\n");
-             break;
-         case 'v':
- 	    version();
-@@ -363,14 +377,22 @@
- 				    break;
- 				case 4: printf("800cpi\n");
- 				    break;
-+				case 5: printf("1200cpi\n");
-+				    break;
-+				case 6: printf("1600cpi\n");
-+				    break;
- 				default: printf("(Unexpected result:%i)\n", resolution);
- 				    break;
- 				}
- 			} else {
- 			    if (400 == resolution)
- 				set_resolution(dev, 0x03);
-			    else 
-+			    else if (800 == resolution) 
- 				set_resolution(dev, 0x04);
-+			    else if (1200 == resolution)
-+				set_resolution(dev, 0x05);
-+			    else
-+				set_resolution(dev, 0x06);
- 			}
- 		    }
- 
--- a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
+++ b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P=${P/_pre/test}
-MY_P=${MY_P/-applet/_applet}
-
-DESCRIPTION="Control utility for some special features of some special Logitech USB mice!"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mx300-mx518.patch
-	"${FILESDIR}"/${PN}-0.4_pre1-configure-error-handling.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	# For error handling patch
-	eautoreconf
-}
-
-src_install() {
-	dosbin logitech_applet
-	dodoc AUTHORS ChangeLog README doc/article.txt
-
-	docinto examples
-	dodoc "${FILESDIR}"/40-logitech_applet.rules
-}
--- a/app-misc/logitech-applet/metadata.xml
+++ b/app-misc/logitech-applet/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
-</pkgmetadata>
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@ -3,7 +3,6 @@ AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd
 AUX screen-CVE-2021-26937.patch 1864 BLAKE2B 7425a49e003601f21130cf9c42354aaeb5f3cd639dd274971393420ccf45e8273539ae020f8a1a6e4063e741e75dcbf8cecd4e35b26c6d04ffca108ddea7bd32 SHA512 419f4d10b23369fccdadfb024b6ce268794e7f76188b25dd9051ff8cd6080dc0c70f66b9c2480095d655bb63f20ba1fdfa1ce0c681c9b8aff4d4918764018516
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
-EBUILD screen-4.8.0-r1.ebuild 4116 BLAKE2B 6379bf40480069dc89f62c11bf6eb74d1f2f0a437437b93a277a825a3b344baff2b589c41f09ecee6a0d703269ea95e834accebd3d869fe6fe99be26f868302d SHA512 a99f93b9e4127129ff3258e79cf5cbed5357919289f5c77e72aa9ce51c7c65c8e79286b4ff857e7656bf47d2b241f7b4a302294e18d46c47f1b64370bb9f7922
 EBUILD screen-4.8.0-r2.ebuild 4158 BLAKE2B 05754b07214cbdbef6569408e697e503b171639bb795f4f2a00902ab539a33fbf25cf7e8de4bf3effa1e8eadce6f95c4a4cdedb4541e215a0c29cf27be140a17 SHA512 b16dbfa0934cbf58e72989dd30b5bd19abcb4bedd81aa2169d88f7bb06995b368ab57801212b6b114b69e163489446803547bd2b07a26f6690af3b1148f5566f
 EBUILD screen-9999.ebuild 4221 BLAKE2B b3156a67b9708e22c231e902ee005bf034c118cf610f5461b6408d17694601bb00e4b3aaccc670247aae6b762241e6375324db184cd1410fc3baca8a5bf22e13 SHA512 a8b839ebdbc262851c3725c7099bc85b444b8b00ed40badba7c240a5810eeb22aa0714971b2f116e1860de2c1204b403ffe3bda1200e86ecad2dd5c667a98ba3
 MISC metadata.xml 1782 BLAKE2B bb6d45dd49af2c1abcaf4801d509421a885cd9c636c44e71964962abbd111a54505cd3dcdc594479489b943714a4b534332eb4aa1c5a43d0d679a18866983920 SHA512 d12c60725b314af0ea8ea909d387699e18da8a742036c35f2822235536b6787595ec5acaa8b7e1af0a429e0eb618051e62ba937dcf53a245ae804c3ace29d47b
--- a/app-misc/screen/screen-4.8.0-r1.ebuild
+++ b/app-misc/screen/screen-4.8.0-r1.ebuild
@ -1,158 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
-
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
-	S="${WORKDIR}"/${P}/src
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-	pam? ( sys-libs/pam )"
-RDEPEND="${CDEPEND}
-	acct-group/utmp
-	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
-	sys-apps/texinfo"
-
-PATCHES=(
-	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-	"${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
-)
-
-src_prepare() {
-	default
-
-	# sched.h is a system header and causes problems with some C libraries
-	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
-	# Fix manpage.
-	sed -i \
-		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
-		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
-		doc/screen.1 || die
-
-	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
-		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
-	fi
-
-	# disable musl dummy headers for utmp[x]
-	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
-
-	# reconfigure
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# enable msg_header by upping the feature standard compatible
-		# with c99 mode
-		append-cppflags -D_XOPEN_SOURCE=600
-	fi
-
-	use nethack || append-cppflags "-DNONETHACK"
-	use debug && append-cppflags "-DDEBUG"
-
-	local myeconfargs=(
-		--with-socket-dir="${EPREFIX}/tmp/${PN}"
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc"
-		--with-pty-mode=0620
-		--with-pty-group=5
-		--enable-rxvt_osc
-		--enable-telnet
-		--enable-colors256
-		$(use_enable pam)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
-
-	emake -C doc screen.info
-	default
-}
-
-src_install() {
-	local DOCS=(
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-	)
-
-	emake DESTDIR="${D}" SCREEN="${P}" install
-
-	local tmpfiles_perms tmpfiles_group
-
-	if use multiuser || use prefix ; then
-		fperms 4755 /usr/bin/${P}
-		tmpfiles_perms="0755"
-		tmpfiles_group="root"
-	else
-		fowners root:utmp /usr/bin/${P}
-		fperms 2755 /usr/bin/${P}
-		tmpfiles_perms="0775"
-		tmpfiles_group="utmp"
-	fi
-
-	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
-
-	insinto /usr/share/${PN}
-	doins terminfo/{screencap,screeninfo.src}
-
-	insinto /etc
-	doins "${FILESDIR}"/screenrc
-
-	if use pam; then
-		pamd_mimic_system screen auth
-	fi
-
-	dodoc "${DOCS[@]}"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]
-	then
-		elog "Some dangerous key bindings have been removed or changed to more safe values."
-		elog "We enable some xterm hacks in our default screenrc, which might break some"
-		elog "applications. Please check /etc/screenrc for information on these changes."
-	fi
-
-	# Add /tmp/screen in case it doesn't exist yet. This should solve
-	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT}/tmp/${PN}"
-	if [[ ! -d ${rundir} ]] ; then
-		if use multiuser || use prefix ; then
-			tmpfiles_group="root"
-		else
-			tmpfiles_group="utmp"
-		fi
-		mkdir -m 0775 "${rundir}"
-		chgrp ${tmpfiles_group} "${rundir}"
-	fi
-
-	ewarn "This revision changes the screen socket location to ${rundir}"
-}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@ -1,3 +1,3 @@
 DIST bibletime-3.0.tar.xz 1568732 BLAKE2B f1e9cb23d64d566d8b0934cfbdffabb52193f240523ad3ba79bbf0e3cd3ff516354791bf0b057354820cd3303c01d3ec50aa61f2e7843b1083c74d442d915a89 SHA512 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00
-EBUILD bibletime-3.0.ebuild 1466 BLAKE2B 913496634dcfe8e4fa3e3a5bd856d65255ccfed1dda8fbb225bee7ad00cb22f429ba2135cf129d7eaa209dd1910cc316348dd29a7a93162dfc247c916f5d7ef9 SHA512 226d64927296a001d9c8d620c6155daea681c00fd788622f9052d8baad1c3c22b8d2238e93319cbac7c94b5bb7018538f3e01fb5bcac33c294e9a1cd10877b9c
+EBUILD bibletime-3.0.ebuild 1672 BLAKE2B 13f482093e1343184923a56aceba19e243555a2ee941673d3a5b74daceeee741fd04864d711c317d3ad848be8d0382729bf9c9e20411c9d6d3323051b662eb52 SHA512 586841483afade07e9eefff33b2d07ba43aad50d2f9c24cfe0b8a914e8cd0e33db61deaebdc985c38c66405e9426440adef6d1ab93d2dc9c4a6092a76a2f459d
 MISC metadata.xml 656 BLAKE2B 2402db72930eebc4448e4f0e48ae2e0494a20b9f52ba82a4bf61ea446aa476c917ce0af0229bb3c935ee5648aa69ea82943dd3ef98649aa6ae58af85f475eb53 SHA512 4e72b972bdbbb02fd7297414ba11fcf1680f640a05a4d47e45a4765441923f5c3fea4c2e5c758355fec60b809d94897151a30a8c09675c9466201db62940bf83
--- a/app-text/bibletime/bibletime-3.0.ebuild
+++ b/app-text/bibletime/bibletime-3.0.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

 VIRTUALX_REQUIRED=test

-inherit cmake virtualx
+inherit cmake virtualx xdg-utils

 DESCRIPTION="Qt Bible-study application using the SWORD library"
 HOMEPAGE="http://bibletime.info/"
@ -15,8 +15,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"

-# Some tests fail due to being unable to find an icon directory relative
-# to ${WORKDIR}, some others segfault. Needs work.
+# As of 3.0.0 most tests fail unless Bibletime has previously been installed,
+# and one fails for unknown reasons even then. See:
+#  https://github.com/bibletime/bibletime/issues/320
+#  https://github.com/bibletime/bibletime/issues/321
 RESTRICT="test"

 RDEPEND=">=app-text/sword-1.8.1
@ -66,3 +68,11 @@ src_configure() {
 src_test() {
 	virtx cmake_src_test || die "Test run has failed"
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
--- a/app-text/capyt/Manifest
+++ b/app-text/capyt/Manifest
@ -1,3 +1,3 @@
 DIST capyt-1.1.1.tar.gz 3247 BLAKE2B 259c1cc7eddc88853518ed106f25e9b1d47a5c4604e749d25fb2133f11d90e78672473a9dd31fa80322b4c5177163fe5a177d27a6fd9a7cd31ef12db7ee3ed0f SHA512 863164967aab93088d39b0324d1324145f41ba76b9d21874ea6a3aa49955e1ec3430c7bcc9eb100c51b9e159c63758b6474d3bad586383d7c10d9f1118340123
-EBUILD capyt-1.1.1.ebuild 586 BLAKE2B c3db7b0845ee47d93d1e4f15e487fe17fda3b1160bb7baf5f67ed99165ef2cc4272256eacf6f3dea495bff8ae068dbe05e1eb35c13df215ca090ec8d621a8fdc SHA512 a4f00d09af5e0c9074fedc11a556c39e530be4d06429f656ff4c6574d2c55abfdab2d38ee5abaa3c62f0028ad3b87b912264e3611a7e944132eb3888a8e1a58f
+EBUILD capyt-1.1.1.ebuild 587 BLAKE2B 09da2c0814de376267ae4a17693bc9e606b1c7e2bf5084e4a4d454cbb613f8eb8a44178333ae7c8bbe21dee97ab1fbe1a7eab07bfcb0b1f577b7af0237e16f6a SHA512 f123d7fed9efe5c78efa7f195fec84b3904d9ec46bd75ac97d359da58cdfd44cb753dce3a4fd6bd32abe98ce04404e448eab4d6e8f0dc407060b177192414c43
 MISC metadata.xml 407 BLAKE2B edeeb79e203dcfb67d68dd96fc485221789def0b23937d68c493c000412eb6712d23c0eb2c7bec000a4a065a257187df0d0c45ce2ccb454b986c1049431f1441 SHA512 f8a8de49955a6e26d14d0e62312a942881ad4f3877c606b732c66fb38c9780667632de9721175952721a39b227d05c2564e500e0490c65d7d6c8a7e18d3ad129
--- a/app-text/capyt/capyt-1.1.1.ebuild
+++ b/app-text/capyt/capyt-1.1.1.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend

 inherit distutils-r1
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@ -1,5 +1,5 @@
 DIST coolreader-3.2.55.tar.gz 13230319 BLAKE2B 1cb414f38b76072f66705370162a28505ba2273282755704bb8ad28a7b0eb2928aba0a929291ae33fdf9ce42b442c4b941740d59f4f329a401470e2fceceef18 SHA512 4eef99c86259642d6a5c3d9eb388a11c27b7438c0f05a055ef61a1df93af567d30fa39790cc5d5b3d10dcaa4b2931a51773f967904ff75f7fff2040f313c09d6
 DIST coolreader-3.2.57.tar.gz 13281238 BLAKE2B 8a6739f38d72b13af7b79160dee8cfc08bd9e54d3698fd44c7f6ad8bd575b1f389c2c349c1e2ef71a55fb0068e9d64b5baa4a0a8b945cdb873e833178d81cbbe SHA512 d5bf46f7dbf19177a54742d5c300002c8b7a504052bd003d2e1a7380ac3460dbe648d7f923d26e6390e9296ce6b090c947204725ab2a30c78f26893868a61161
 EBUILD coolreader-3.2.55.ebuild 1838 BLAKE2B f5c912d33d88c0a9040ca6b495aa7a202b4d1f0eb043a57275fe1e9ff61081ed069acd9ae2c86381d7299a13ebfcc46f4eeb5f5bafe92da6c04c86750b8ea8c7 SHA512 50159e31e21ded5890111091f26ee10d91aab33714130be060d8ba7f4510ea90de2eb5f722be9007f67a2bbb71096ec39df3367f235643dfb97d02b3ecd37f4f
-EBUILD coolreader-3.2.57.ebuild 1840 BLAKE2B abd3453c6fe24d69196b10c6046e64ee0ca2639220287955a9453a3f170a85f7da536934518f1486402d593d5e2697be5bd5e90e32b29daf10ee1fcc3525e967 SHA512 a4aa23bd15bd0388e06f782fb90817a70056052277b3ac1cc0c05eab7202ed3ca2dc859809e55a1da0b88a865cad3a428413bf8e2540791f75e8015362769ada
+EBUILD coolreader-3.2.57.ebuild 1839 BLAKE2B c2756484a315047da734916671123ec5a612d0c9d3e0113e80cfb4d83f184fc39388d93af5bc7b3f7a9c77182670e2fba9f42de0a95a877c89c93aed915b9aee SHA512 41c953c3e02a0d7b4097494ddabacb03e4da9fa5a58c70edc77432d79bd8c22637fa25dd77b7e1b2c606cdec98d7f1a9eafa3ca113d86af7ea58d3ad3eddf535
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
--- a/app-text/coolreader/coolreader-3.2.57.ebuild
+++ b/app-text/coolreader/coolreader-3.2.57.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/buggins/coolreader/"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="wxwidgets"

 CDEPEND="sys-libs/zlib
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@ -1,5 +1,5 @@
 AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 BLAKE2B f1970ffe2cf1d369ffc3f3a5a6abea2f04fb32cfdc54dde9052ef468c2a274db2318495c80ec1ef0048fb65df8209bacb86392d9ff594fdc60ea92ebb85584ab SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c
 DIST gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
-EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1924 BLAKE2B 15ed597dc47ae7a5fbcd46991dfeeb3097d6b3e7e2c7b5707f72cf0c7c7752a6dfe996fd9dba7c5bb3f1eb117c069360f64221171f5c6d199758e757cdbe11e1 SHA512 b423ec742e42357bd045630cc7c630cb505a4d4594599f9d3374339d51f86758660d353ad2a832f5aa44d5b3e68243cea112cacd851582c5b3ad8b3368e64287
+EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1931 BLAKE2B c95eeb62b7a449dc86f22a621e538f109705ccf202cd34c4bf25379d86af454667744d0cae92f82df629a719d678ec858feb95008cf6ba7697e87f56a4322d98 SHA512 dd7ce0df21b6c20fb88a09737f7b9ec36c59fa576c457f2e0a9e8f14c394498193140f3506e9c783350dbdf4796738ba40a16c1bbc7bade5049f44da19d0712e
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10

 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"

 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
--- a/app-text/scrollkeeper-dtd/Manifest
+++ b/app-text/scrollkeeper-dtd/Manifest
@ -1,3 +1,3 @@
 DIST scrollkeeper-omf.dtd 11031 BLAKE2B 47a52f587447f30c1c93ebdb4d1339d714260c7bcf16711591edb0b0f8a41d6694a1f64f0306d0c296c032869176b884adb50762eaa445f50684820effcb9399 SHA512 edb38d85352d0ed4a4fd1eea108cd88696d2f0759bc4402d4b7f85aa56b5647ca5a518de14deb3a429344ede474d42a64b90100e5d3c772ae6e5e47a47d86ff0
-EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1504 BLAKE2B 61fead51a5786879caba3239ab844f78f9cc6a4ff0ccc7631fd5172f2f7d85956a88cedca9df1e76996bbaac526b67c75db7a00dc333176931691543f8cf1cbd SHA512 09b1e639cdaecfff1d2c031029067e4cb082d9eae1560bb310fce5f78d6cf28d12bbabc8b68bc89c39e5b2028a2c4c0b35ce54df359acea285cd88355025d2d5
+EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1511 BLAKE2B b946bff7451b44e8dea33f6232d2558d7b8681a9faa54bd65ebb87a265a77f91f41caf82563377bd83b9ae5e0f5260448103a921c23fe11d68a34007c4fc2eaa SHA512 b943c7de7a4fb55950fe013ee1797ca44c02ada5945cb2ce75d9598c87ce1f90a171e5a24eaf07b58ae773cb2f12a0f429e6ef2e4fafff9cc9d63bf85139019e
 MISC metadata.xml 335 BLAKE2B 5557a7230bee25bc8e1340443746da2d41568635c68904549b2ac2f6227a70444cf2753e6656de56c290c1a96e18dbe882401bcba68e271259cafaa44402a1f1 SHA512 c0180e1504b25daba0b5f2a6556793cf721eca12a4c488a57e7960b9b096129e5f535a24e1da1ffa6b1d9e8b646325edcebd00e5f7e908ace3d81d818e49f8e3
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FIL

 LICENSE="FDL-1.1"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND=">=dev-libs/libxml2-2.4.19"
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
--- a/app-vim/vim-latex/Manifest
+++ b/app-vim/vim-latex/Manifest
@ -1,3 +1,3 @@
 DIST vim-latex-1.10.0.tar.gz 260820 BLAKE2B 2314ad5ded3bea51def3172e8f2b7a7483839b58804f9d8c1cc1c8f1139c1da731f91525691d47dba57d07a7db85c371e87c5ce0d3d22a004a9402df7e7cad3a SHA512 1d22b675c124e402a280dcc3a675b49a92fb9f4d42efdda0ea97be26379cd6c023589a35e165f4231524d853380e22411901bfbcc98f171c938ba800821a1213
-EBUILD vim-latex-1.10.0-r2.ebuild 1497 BLAKE2B e070a54eab65f29777b4fd3adef6b06e3191dc4632520cfeff8ab1972fbe6a9e5dd10af0a3a4dc6ef486c83ccd49355cbf83b534ca66b602ea65e090b551ca63 SHA512 96c55c68e1717b239ab478b9fb7e9ddc20962bbba2df5355369d156e8fc5fe7409291b7c6ec1c0c66865c3e5c885a124393adc118d3cfc28ae6093a21133b2e1
+EBUILD vim-latex-1.10.0-r2.ebuild 1497 BLAKE2B 61baba11619b3492d401284bd6feca6ece3e33c316d96df5629041e2085337f608bb3274f9712d29cfb0db250883e96cd6bce871f005bf8dc009f6def653c74b SHA512 944a514d273a6f289a38ec09a9c721b6b29a9277edf300370e43118057772487b987bcf40513872e91b236aa373ef88cce763267178af93e67190cc800b8705e
 MISC metadata.xml 328 BLAKE2B bcf4c9979e43da6c141669c218e852e7a0c062d900c35790709e393f6cabc56f646f7a84e8057d9dbafa0a73e5786135a7cfe3ef825af867500bcd502f03a61f SHA512 e14b88742b6d8143cb578ddac61dbc0ac5e84c90659e8d9b5c40882ebdf35dc001b1ffae26eb90617434b2c8a898055c838738bf7cf18a45cd2a2ce66a30bdce
--- a/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild
+++ b/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..10} )

 inherit vim-plugin python-single-r1

--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@ -1,5 +1,5 @@
 DIST vimoutliner-0.3.6.tar.gz 210251 BLAKE2B d50b3d1c752fba80e26d7430801baf30a7945d84d30866556821319fb052252a37e2dd7f989c47c376b4986b616c7f99e0753ef3f6b54b9f4f02aa166e998b65 SHA512 62c860067d394dbae639aa9d51627637769c22c4c651f2f9328ca88e8afd85396e1f371bb0cfee432e7a1faabee570a1e29ec086c6532681a309b909225fb90b
 DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
 EBUILD vimoutliner-0.3.6-r1.ebuild 661 BLAKE2B 696d301988c28922e2a0ac21ae968cd7e839637c8f32feb9eaac0a0838d08cb258c62ef82bdf2e46982fada5a4bb96a2d5f4c60c542f7db69764588484527210 SHA512 4a6e991e78db3baf9650c4ced113f479dff68b6a81f12002b20c267fbdf8441da69851817c13601fbc308da32368da611b0b199f03f18c72f6acaf58c73779ab
-EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1261 BLAKE2B 8e200382c2c6b30e1bc1d3271671405ee6aa5dd721dbf5f16dce56468c2dd175dae3d5a1617a776188546fc7d477abd48f7da1824937fe4e25cc14ebc88ac71a SHA512 568b970a90353320771640880863f6299506fd2f865b22198bdbc3df3ad3c597134ed4d29ac28a80bc4a2f03cd1ab81d50c6a84d23680353c16b483340c40cde
+EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1258 BLAKE2B 2f5d01548bf83169e64ffbac3f4d91a247d4d18671da4259bb8a59667a639cce90c68bfb01521134bba612964c11dfec47221e83e8b51b981f95f10b38b3b04c SHA512 9ef0474a410b97eee83cdf2a49c3cde6c8dc4b366e8a2b46188d521024b93ff212fe1a06d44f2f90f142a2f1d909c70f1a8b90c02cd1ca856405ba37f5f18f7e
 MISC metadata.xml 361 BLAKE2B fb9ec07c9fec7dedf5f8a5717a7b4eb875264294f5eb9a24fed191a1195bea800bb0f0fe9ff4d81d02f36f35910239d96e218f332bf9818e27a3f7af7a1ee502 SHA512 c65f2146f0ddf4d6c048f5e6f87db0ab5814fb05966a2b2a9f60999485125975dacb5d609ec9484f7b4c8c6ef7b128d59a4f7ed104d6cb582c8c42a88bfb1fe3
--- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )

 inherit python-single-r1 vim-plugin vcs-snapshot

@ -27,8 +27,7 @@ RDEPEND="
 	$(python_gen_cond_dep 'dev-python/autopep8[${PYTHON_MULTI_USEDEP}]')
 "

-DEPEND="
-	${RDEPEND}"
+DEPEND="${RDEPEND}"

 DOCS=( README CHANGELOG TODO.otl )

--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@ -1,9 +1,6 @@
 AUX gtkada-2017-r1-gentoo.patch 2082 BLAKE2B 129c162fbc6d89565d4d383fe0f071b04513a66d138599d0b5dfce8f4bc40bb7609eb26a1df414dcac212827a2ece39c4db4a2f785d8eb5367688b83fd59c121 SHA512 defc57274798e8ff24436153bd4f6d6f94e25617eee249101708c1bfd01d3960a07a948407d2c126d21fba34a9f770762fc20d0c1711c28b4d77e11a190a9dea
 AUX gtkada-2019-gentoo.patch 468 BLAKE2B 80de36b927875d360e35be6b5829ced6fa1a0bff2c2e8f2186bdd375db27965cc9258b94c41ade6919047d0ac12deafe37b7a58c1365bd453b7293118f81709d SHA512 85b6e3d3060283370ab9d2ad5980a2aa110db44edcb615caf8ebfd6e49ca53011d5a049f4fac1584fce2755414883abde16824d28a5fa3db17d0d50cb00e8c81
 DIST gtkada-2019-20190424-19D98-src.tgz 12273911 BLAKE2B e2d0f3c410973d0412bf433f2e1cc60a5b00e9f34ad0471cb583596587e6073fdeb9b6441aa50dfa81894ce692101fe51c7714090477d585721571261737a823 SHA512 aed0758b42ee8eac752c2c83a0974ee0c7cddfa15149879472ff2fb8ee7565456a225ce783739ede76bc0f47340e97af5b5d1149e244611bcd3b3760e20f8cf5
-DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
-DIST gtkada-gpl-2018-src.tgz 11958880 BLAKE2B 4946918b52de5e15efc77411927812910d84d13cea66b86b1162b987c7849ba7fbb6da487881762f64005dc32a74fa73c9d759d25bb9ac0241d1d76cd4becbfb SHA512 9000de7675f8ee688b1c9cd93cf35b32f698aca8fc22d3b4e695d7c6b34feb60118cc687cf35432cd5ed9af7825eda7e20575a9fad4523a7b59cb0322bce0762
-EBUILD gtkada-2017-r1.ebuild 1101 BLAKE2B 844190bc4e75298c6854464062952d73f63103271a9c0bb4bbf451d0815c8fbc72471382af7253314b14737436e8a974a5ebef8508b223bb4decc4fe27b64383 SHA512 e47af143eda267de31b56d16e2884a1d22252516aeae5159992d9267ce78720cea8582880cee7e72fb9f7aac32d32df0a73d73340b1bb90afd0ff7c49d302531
-EBUILD gtkada-2018-r2.ebuild 1111 BLAKE2B 7156ea399e371958b6319e78e13cf34375dddef245f9b67631e1da424ae67bca44275118d47998b8fbf2a6837e9d68cd8e632b363bc46fccc929260f060cc376 SHA512 2ee7b3edc21dbe915c8c7cd5f838d2a3b806e7e08b5162da196df29b1a48f454c20eec658da3d909239e098e91da67db84ca7209972d79b4f68c2cd52780ebc8
-EBUILD gtkada-2019-r1.ebuild 1149 BLAKE2B 56fbfbd4dfa321def9c40e613f0df71f5538d2eb652c5b8bf2213e0df0d0d5d27b63409c831aa4dc12e4742b9b09296013de2b9a117cd5dd1a1619180a64f8af SHA512 38268434835bca957bc01332a1222717d9ea632cd59f2062f139abcb9eaef54ac5d03c88630dae47a3da0bde1864f937a282f8b2b3cf249970a1d5426e0bd85d
+EBUILD gtkada-2019-r1.ebuild 1132 BLAKE2B 527d869f7db0ebd302597434f415d098fc136908bf425c732380d76d50aef3fb1e3d9ac874c478580199f30676427ff8463c5f1f93312f27eb769d949a140bd4 SHA512 5128d19e17e567cc07d0a2e98f66a223f5bc874ca4bb25ccc92fd7397bcd6921c03164e0ad1b28d5b5ebe80ecd5886cb101bc25b3e4d64ee8581fa2f197c6a82
+EBUILD gtkada-2019-r2.ebuild 1141 BLAKE2B cf4ad6b9bd19465ff7487cc2fea129af2bce20d63f78a42033724cada78d38c785923c0a6e93c912e3b99ec1eeadcfbdcc64c4921a745d3547dcd0fe7cad5b18 SHA512 181e64541b7632845f7402ad12b57245eafdc5b2a7e3337bb2051a4ba101e5e8ce9b73624e2e62d94734151444b7d30d7ab89dc9cbbfc29b4f169a114cd0a4dc
 MISC metadata.xml 536 BLAKE2B 9809d3168ce41ea5f2aaaf8f9ed0c61ffca037a42dc1d3ba5424f68c399a24f64336494b0e73b3f6a3ab1be9c5ec2e499d93d62aa34a4e2a45af09bd15482b5b SHA512 f6ce7169d8015d691548836e074450d79afffdb7449bc7bd4b7ab868b967763675d8f69b1ad89a3642de0e1c5c9271261d72ee1b8fe448b9aa4afa4879b619d5
--- a/dev-ada/gtkada/gtkada-2017-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2017-r1.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_201{6,7} )
-inherit ada autotools multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
-	-> ${MYP}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs"
-
-RDEPEND="${ADA_DEPS}
-	dev-libs/atk
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-r1-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--prefix="${D}/usr" \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	emake -j1 PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 install
-	einstalldocs
-}
--- a/dev-ada/gtkada/gtkada-2019-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2019-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -47,7 +47,6 @@ src_prepare() {

 src_configure() {
 	econf \
-		--prefix="${D}/usr" \
 		$(use_enable static-libs static) \
 		$(use_enable shared) \
 		--without-GL
@ -58,6 +57,6 @@ src_compile() {
 }

 src_install() {
-	emake -j1 install
+	emake -j1 DESTDIR="${D}"
 	einstalldocs
 }
--- a/dev-ada/gtkada/gtkada-2019-r2.ebuild
+++ b/dev-ada/gtkada/gtkada-2019-r2.ebuild
@ -1,21 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{6..9} gnat_2020 )
 inherit ada autotools multiprocessing

-MYP=${PN}-gpl-${PV}
+MYP=${P}-20190424-19D98

 DESCRIPTION="A complete Ada graphical toolkit"
 HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced
+SRC_URI="http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53
 	-> ${MYP}-src.tgz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs"

 RDEPEND="${ADA_DEPS}
@ -34,7 +34,10 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"

 S="${WORKDIR}"/${MYP}-src

-PATCHES=( "${FILESDIR}"/${PN}-2017-r1-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)

 src_prepare() {
 	default
@ -44,7 +47,6 @@ src_prepare() {

 src_configure() {
 	econf \
-		--prefix="${D}/usr" \
 		$(use_enable static-libs static) \
 		$(use_enable shared) \
 		--without-GL
@ -55,6 +57,6 @@ src_compile() {
 }

 src_install() {
-	emake -j1 install
+	emake -j1 DESTDIR="${D}"
 	einstalldocs
 }
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/Show More
+++ b/Show More