17 files changed, 236 insertions, 258 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 2083a5ffa15b..7b28bb531bc1 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
index bc15ba97a718..f844c1fc6af4 100644
--- a/app-misc/abook/Manifest
+++ b/app-misc/abook/Manifest
@@ -1,4 +1,4 @@
-AUX abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch 1281 BLAKE2B d7de2b1609eaaae6ac9c993265d69faa41754b440b95da001622ea9a0033dbf93bc1d052561efc8ac580b6853b2314c061ad8331a83e1d08f6ae9d962cd5d384 SHA512 96be977b0c4bb22e580d8b2e4ecb2741dc0e45dbcd701d0aea3c65dc67d5725630ee322516837b522f43a85cf839bfaa67b8d50f1d82a38c6b13102621b299ad
+AUX abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch 1292 BLAKE2B fafc126e41c7dcd599d4101245b83e29814d5e5f1d9c1073b3bcc7385899909bb68f33e4d84a93a4cc3d4fedb2bcf19cfec4f1e7d9ac883c32f4962a7d9b5a45 SHA512 d0a779700e21b5a0c76e0ba3cafe9a85478e4f22b1d33e8486a2efdf37817e6ff9683d7e59ae6905578b48434e375f7f1956f86c65cd43abf6a231189cfa3474
 AUX abook-0.6.1-use-newer-macro-for-readline.patch 986 BLAKE2B bec102b0110e699df64758e0092d1e1bfb26b5e963f073e51f03e002d5cc31d34162ec5daf466866f032c64744bcc8ea4a1b6a930e3bc8a843303adf241391b6 SHA512 559551548a10a82ad529ab1181d42ed43f45c182530d88dd9c0cbb6423679109b5556cb9c1a27e7ea328db63e54b4196005850a1f8fe2a1dc95f3302c7efede1
 AUX abook-0.6.1-vformat.patch 336 BLAKE2B 9a45733e1ea3ddf996b6e75582771922c9189117580202e3f1270d6394b92ec0943207f803870709b2288755ac8e3ba150ceb3835ad178313eadea3bede347fb SHA512 e1da5d70edc8eecf0f860b0423a260bfb9b1f706a38872d8c793c76af3b899c86b9700df8816f952fb1430999acb00ac365dad58752c78c7535cae5d8b2814b6
 DIST abook-0.6.1.tar.gz 319558 BLAKE2B 9d750d97aac2336f1de22121035c0fc9c4707d970976f95890907e5ae2ae3249f563dc45fb34c32c2a5303a9cdb35256dc4581b5759058e14486ca2a7cfe3cdf SHA512 993895ef2fd6d98d50db610699f8f0a28112778065ac56484373eb814afd8ab7371201fc21506c090514f4b29570ec229dc62c606ab068301152567e2c47fe66
diff --git a/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch b/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
index e6f98906af3e..00b8e4449048 100644
--- a/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
+++ b/app-misc/abook/files/abook-0.6.1-use-PKG_CHECK_MODULES-for-ncurses.patch
@@ -34,7 +34,7 @@ We don't _always_ have split tinfo, e.g. Prefix.
 -		AC_CHECK_HEADERS(ncurses.h)],
 -		[CF_CURSES_LIBS])
 -	])
-+PKG_CHECK_MODULES(ncurses, ncurses)
++PKG_CHECK_MODULES(ncurses, [ncursesw ncurses])
 +LDFLAGS="${ncurses_LIBS} $LDFLAGS"
 +CPPFLAGS="${ncurses_CFLAGS} $CPPFLAGS"
  
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 0144ba432e44..8cbbceda6657 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,5 +1,3 @@
-DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a
 DIST hivex-1.3.20.tar.gz 1727498 BLAKE2B db6448242fc4b72d75cc7234a49e146cb165b1b9b9e2e72fb2a05be37cbb1d8ca865ccc51c4d2d50199e69cae2d870743ecd41534290e9a100bb268c2437ee22 SHA512 366e84c2a13ff53c70036df60db6e2b469cd06e3405761df73c47978b4fa0245246a1ea912aa5852b1272221d55c6c100b40b00e4c9a6f5668d12ff7f93c787a
-EBUILD hivex-1.3.18.ebuild 2005 BLAKE2B cf7bbe9abeb19c88ed381a5bf2f3dcd354ffa98555becf6062c228497c7ba9802a570e99acf7922356a792929e0cccb29c4fcb8813609ab3d9ae1f1b017e511d SHA512 49e373ab59d13a7bfd818be97bdef226c16cef543f446de658d83c573d7878574cb363f462cd656c85295b98060b3b969e5b13ac4e3c62c2cc22e32e9ba1462d
 EBUILD hivex-1.3.20.ebuild 2145 BLAKE2B 3e3890b323f7c0f8ff968e6adf62067f5a088d43b8ab67521a63de24496c5684c5bdb3dc45d5269043f6f4df41e502dedf6ff3e57703cb5697451617ca61f2ea SHA512 a14d1fdbae2a0d80b1ea15b02fa90b67807e1fe3112706f68decd0638d123da134b59e3cf738bdf1cc87b5dfc41442c98406d55ed55209e4dbe44c7d5a08908f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/hivex/hivex-1.3.18.ebuild b/app-misc/hivex/hivex-1.3.18.ebuild
deleted file mode 100644
index 8d2e2ccca062..000000000000
--- a/app-misc/hivex/hivex-1.3.18.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_OPTIONAL=yes
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit perl-module ruby-ng python-single-r1 strip-linguas
-
-DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
-HOMEPAGE="https://libguestfs.org"
-SRC_URI="https://libguestfs.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ocaml readline +perl python test ruby"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	virtual/libiconv
-	virtual/libintl
-	ocaml? ( dev-lang/ocaml[ocamlopt]
-			 dev-ml/findlib[ocamlopt]
-			 )
-	perl? (
-		dev-lang/perl:=
-		dev-perl/IO-stringy
-	)
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0 )
-	ruby? ( $(ruby_implementations_depend) )
-	"
-
-DEPEND="${RDEPEND}
-	perl? (
-		test? (
-			dev-perl/Pod-Coverage
-			dev-perl/Test-Pod-Coverage
-		)
-	)"
-
-ruby_add_bdepend "ruby? ( dev-ruby/rake
-			virtual/rubygems
-			dev-ruby/rdoc )"
-ruby_add_rdepend "ruby? ( virtual/rubygems )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-			ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-DOCS=( README )
-
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-	cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all || die
-}
-
-src_configure() {
-	use ruby && ruby-ng_src_configure
-
-	if use perl; then
-		pushd perl
-		perl-module_src_configure
-		popd
-	fi
-
-	local myeconfargs=(
-		$(use_with readline)
-		$(use_enable ocaml)
-		$(use_enable perl)
-		--enable-nls
-		--disable-ruby
-		$(use_enable python)
-		--disable-rpath
-		--disable-static
-		)
-
-	econf ${myeconfargs[@]}
-}
-
-src_compile() {
-	default
-
-	use ruby && ruby-ng_src_compile
-}
-
-src_install() {
-	strip-linguas -i po
-
-	emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
-	if use python; then
-		python_optimize
-	fi
-
-	use ruby && ruby-ng_src_install
-
-	if use perl; then
-		perl_delete_localpod
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index ae70b902f295..462dfe476367 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,8 @@
 AUX mc-4.8.26-file-seccomp.patch 4794 BLAKE2B f6b2ba15b2f7f57aa620fc5745816be434d357f8b4023197691f8827c1e5d6555fa542e0aa3b471036c7d60a3ab5761d261e62d3fc599fd14593c82c4cd238dd SHA512 a65b414dfbb4f934351a87496e012131b1e811cd1fd21a91c167e8db212ee7485f097d3a5a4faed2d904e50e34cb7488a6ffbbcb41bf341167f3837f891e85b5
+AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406
 AUX mc-4.8.26-shadow-crash.patch 936 BLAKE2B 65bf04b92a193de03457f95b94c7eff7677cedc0886fff4d934bd4e3bf94babf3650d5e56ad54eb73e41791e67089c9a65b6628615b87609035e6b823fd317e6 SHA512 8874e98bc5a9b032ff094d3042c71bf279f42c71840920ac3221011ae991fb199050e60d47ee8a65ef82bc5b64e4c14233fd3909c49de807fabf771a953a6c6a
 DIST mc-4.8.26.tar.xz 2492612 BLAKE2B e13ab99fb7d5a9e2cf1149ad96d763681b0186fbf5c03fc9e349a57a4a6f48b598c9eeed85e4cb94a18c5c5b89d4ee0e21f6d34c8cfd5e21da53551085aa3469 SHA512 f2f06915b775ecc94016fe5d5db9301e953cc89ee0708e79ee96e14a9f53142a467b27061ca57f65b40310fa86d4d13e2f2a29a601f8fefa6216fb10f73007be
-EBUILD mc-4.8.26-r2.ebuild 3296 BLAKE2B 1ab86edd791e881d8ef14d4e9512883c347d7cdd6d637ad4060aa808abe4cefef79307d9062f89c5036c705266ed947c063f33ccc0372c107978183a1a486275 SHA512 3892c4431fff390216f52d53c68c9f958352c79b33f6a616d27190b00a78f423a096acc5132d204a0dbacb0115870c0fbad31b7b609da76b69e0be7f8db8d9fa
-EBUILD mc-9999.ebuild 3189 BLAKE2B def2ba759136e6f6c0753d4882a4b9741f412875a772970998b63ae9c5321ee50c8069bcc3d695bcae2f02ae309d28f9468ed763cf33b5ee5488269cc64f3c75 SHA512 687a919633b26bd0ac19285bca140b6d336d1ce03e13799ef0e188e0d4065c98df93a068cfbea31393d3d6567f3ebd6b44cf2db2e6e924ef0f45d1f17cfe4314
+EBUILD mc-4.8.26-r2.ebuild 3292 BLAKE2B 2c091aa3262679fbb18f0390a372ff4ab90d80575e7ddb1e79d1352ef8ab54aae9dee11ef4bedb796f6626d279bc6c6f763d52b5ac70f3d7048d32b7589067ed SHA512 8cb3aace49f07d83e771cbd1b4a1695f737642066044ab1c89df938b41174a0d9129a9f51b4f7ec729ec835690b931780ab3751eff073db5e06f888b8ae8a31f
+EBUILD mc-4.8.26-r3.ebuild 3588 BLAKE2B 207bb1c63c1f0de049301e593bacaeb27cbd4a08d1a97c65d64f934eff494a7fc2e2047adad2dc11f6339f48888a3560d2f2dc5d93b3b64a1f43a60a247f9e80 SHA512 f04a40556918d46d9cc8cf020d7e5293ea45ea32fdb47ae8c5281eaf182f814d3debc70737b81fd806f4a10f14e0d1311bbfab20cd78be5141972363d5d35ab0
+EBUILD mc-9999.ebuild 3185 BLAKE2B 0a015b440cfa6b88613d3f5ff90ccff9cce90c23fea551d2005bafd655c6280aab472fa1221d3e28622e197d6232db65d7318871274754dc12e61cf877b2781b SHA512 6575219427eed552a7d272adfaf8245ce0590783cb32a6605cd7a1a577e0ca747b5a8ded18858cdc4bc58169165be353371cf6db21b90358c8ae8a5f3f096094
 MISC metadata.xml 886 BLAKE2B 940640f07b9e76e2d2baced47b9ed9a699fad9fcbcd9583b5f78f1ea69f949a26f8f1b34f1de88e5faeeed523fe8b4486724d6f7884c3f186635753391d4d1a7 SHA512 a876eb2a3581ef4e44600c750fa54f7cb85d76ac1a83cbfa982b71313404c89d73dc876cb2d86cb53853ab1e404f93549bef4b4769de11d543cb118e4be8a15b
diff --git a/app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch b/app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch
new file mode 100644
index 000000000000..bde04c99b86e
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch
@@ -0,0 +1,16 @@
+Fix mouse-key input with ncurses6 in terminals without basic X10 mouse
+support, at the cost of breaking it with ncurses5. See discussion in
+https://midnight-commander.org/ticket/4144 .
+
+--- a/lib/tty/key.c
++++ b/lib/tty/key.c
+@@ -2124,8 +2124,7 @@
+         gboolean extended = c == MCKEY_EXTENDED_MOUSE;
+ 
+ #ifdef KEY_MOUSE
+-        extended = extended || (c == KEY_MOUSE && xmouse_seq == NULL
+-                                && xmouse_extended_seq != NULL);
++        extended = extended || (c == KEY_MOUSE && xmouse_extended_seq != NULL);
+ #endif /* KEY_MOUSE */
+ 
+         xmouse_get_event (event, extended);
diff --git a/app-misc/mc/mc-4.8.26-r2.ebuild b/app-misc/mc/mc-4.8.26-r2.ebuild
index 8ceabe7658df..ad9cf8c1f56d 100644
--- a/app-misc/mc/mc-4.8.26-r2.ebuild
+++ b/app-misc/mc/mc-4.8.26-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
 MY_P=${P/_/-}
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
+HOMEPAGE="https://midnight-commander.org"
 SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
diff --git a/app-misc/mc/mc-4.8.26-r3.ebuild b/app-misc/mc/mc-4.8.26-r3.ebuild
new file mode 100644
index 000000000000..97a15d1bc054
--- /dev/null
+++ b/app-misc/mc/mc-4.8.26-r3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:0=[unicode?] )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.26-file-seccomp.patch
+	"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
+	"${FILESDIR}"/${PN}-4.8.26-shadow-crash.patch
+)
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if use slang && use unicode ; then
+		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# patch touches configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local myeconfargs=(
+		--enable-charset
+		--enable-vfs
+		--with-homedir=$(usex xdg 'XDG' '.mc')
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+		$(use_enable kernel_linux vfs-undelfs)
+		# Today mclib does not expose any headers and is linked to
+		# single 'mc' binary. Thus there is no advantage of having
+		# a library. Let's avoid shared library altogether
+		# as it also conflicts with sci-libs/mc: bug #685938
+		--disable-mclib
+		$(use_enable nls)
+		$(use_enable samba vfs-smb)
+		$(use_enable sftp vfs-sftp)
+		$(use_enable spell aspell)
+		$(use_enable test tests)
+		$(use_with gpm gpm-mouse)
+		$(use_with X x)
+		$(use_with edit internal-edit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Bug #759466
+	if ! has userpriv ${FEATURES} && [[ $(id -u) == 0 ]]; then
+		ewarn "You are emerging ${PN} as root with 'userpriv' disabled." \
+			"Expect some test failures, or emerge with 'FEATURES=userpriv'!"
+	fi
+
+	# CK_FORK=no to avoid using fork() in check library
+	# as mc mocks fork() itself: bug #644462.
+	#
+	# VERBOSE=1 to make test failures contain detailed
+	# information.
+	CK_FORK=no emake check VERBOSE=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
+}
+
+pkg_postinst() {
+	if use spell && ! has_version app-dicts/aspell-en ; then
+		elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
+		elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
+		elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
+		elog
+	fi
+
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 0c868d11135d..3bc775bf4695 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -17,7 +17,7 @@ if [[ -z ${LIVE_EBUILD} ]]; then
 fi
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
+HOMEPAGE="https://midnight-commander.org"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index 6ec3e56d9847..374618ee460d 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -1,7 +1,9 @@
 DIST QLC+_4.12.2.tar.gz 10804401 BLAKE2B 95b005985da99d1d1f557b4ac5d6ae7d844ea4f69a7cfa63d79b288ce654b5a70f9e6168f6fd4144496d3cff59a721972acd3ba47fd1477ab4bfd0218f5aeeda SHA512 b274f0559ce15e045d653f4c034dc083922a13c6f9c5e7ba11026b3be9bb85fe447bb489d536dd24bb99bd4b08433f24f1713b73701afff99fa845fcef2547af
 DIST QLC+_4.12.3.tar.gz 10954027 BLAKE2B 9a188e2bc2cce1a0a5170122989d5ee1194a83e7d1c8c05a80ad6271e903941effb5c63940a941fa32146699b3b2a7943b9938a5407420da69c1199b5f6f217b SHA512 f25601a44a81d2fd15c54a05588e687fa1f0c0473d0e2188fa0c052b905df806b0516f8b80bf28451a583aa241d137f858fe83b9d7e0e0747bcc3b0bae91d9f0
+DIST QLC+_4.12.4.tar.gz 11166224 BLAKE2B 37b5088c8e7be08fa39aa11e35b8284e60788da94ac4f2dfb9bf4b0615408735c8c1b7c61efe37810ea7ee662a4efe5c0e17d54d45a7b637ddef4a1cc4c5a760 SHA512 19893c5f29602e2e65db9eb162c3f45ce3f028424ecf17d7615f9d3ada8a871dd1a1827ea9a243d7bd0f23ba7e9fb2340531154ac557d5756f0aa05648c56b13
 DIST QLC+_5.0.0_alpha3.tar.gz 10016411 BLAKE2B 51c0885f6e2e286f9f63830bcd269db699946c0969cb0f0a0139f82a421a9a4957ab07612db7aa047fe6650a642479282f6cfe0d124a41a935dd853d09b7253f SHA512 e703747aa243bc4c6b2e9fc3cf1a4e67524fa13fa64a59054e66164e879073b1bd69756a42bb423ff05dcb7da946cbcd99bb9edc3fde9a70d75b8a9f164a71d0
 EBUILD qlcplus-4.12.2.ebuild 1217 BLAKE2B bd8c0c256e255ff88eed2f6f9e9f5d9f6af0011f1a5b540f254e8b068dcc7246cc8b08ef8e5ef12b7bfd4f2d9275929701f6dbff946aa37e888f2c4bdf4d45ab SHA512 f31e8a8572b0a6bb49576aed423449e33d6ea8bda937cbee4f4456202eb5b5b96e26d21a061c925f04f8e2364119827bd707ba7a8bd3215c6c7b86375e523e3f
 EBUILD qlcplus-4.12.3.ebuild 1217 BLAKE2B c4c507caf1551d22815ed9f2a863b5860fdb9e0aaaeef3e5dd7038e6e220c092bad8c3ac17861c3c13bf9df0f0c0a01088e9a3fc96d42715e84eced2ff4d33cf SHA512 4e10f5121e8d3c425c1a1c29ef7e72141cc3cbe5cdfe1273c83f6c63ea8e670a31259eae25f509847b4da8cfa424aa898e7c92d95d045f3aa8b6c3af617d2c80
+EBUILD qlcplus-4.12.4.ebuild 1217 BLAKE2B 9bc28c918fd34785f3c0dff2cadb3e83b364e790c12aa56fbaf9557ce021583e1c846d6e61ef3d75c99b2ab46ad35420f10fcd2a7402685e1490db7947885a09 SHA512 15a356f6ada2c4d0ebeb0d1363b963e51fa97609fb99a57555015bdf7aa59ab9aff657e49b97c2e2ec6aafc2084d761cb970679e1271fdcb29c53c50152b95b2
 EBUILD qlcplus-5.0.0_alpha3.ebuild 1550 BLAKE2B 2d6eaf0b2bbc348903813f202bb42f841d2f3da045827bc5b91cf9e6f27ee013e17b5b3c14d7cf45989af7f29dbd86d748eaaf69999df7e4a3b57f0c2c093f52 SHA512 dd496c3a3beba8fe9212bea0fb1b8e446ea9c5733df93133bbeeddd5180d6dd5004a57238bcd228da1cd2bd80dc9dc8da95f0ab41a0ff6b0d1e6bd3c9d98bae6
 MISC metadata.xml 485 BLAKE2B 4666f9cefe8331b06dcdace276a0abc7d69e9aa91d98f62db4b9cf35929bb0fb58bf7008914ad4e7808fa2f165e650cf5729863f72bbea7e2fc5f8de05291095 SHA512 925b1d7228135ef55a3c455821638fe8b2ea2f3eb591cfeb2576ad9c6f3870ecf9e9718fbc1f87aee7bebb0fbd0bba1e904fcd1cf5daa1d343d33448dc744c1d
diff --git a/app-misc/qlcplus/qlcplus-4.12.4.ebuild b/app-misc/qlcplus/qlcplus-4.12.4.ebuild
new file mode 100644
index 000000000000..e2652b670439
--- /dev/null
+++ b/app-misc/qlcplus/qlcplus-4.12.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils udev virtualx xdg
+
+DESCRIPTION="A software to control DMX or analog lighting systems"
+HOMEPAGE="https://www.qlcplus.org/"
+SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz"
+S="${WORKDIR}/qlcplus-QLC-_${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	dev-embedded/libftdi:=
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/libmad
+	media-libs/libsndfile
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	virtual/libusb:1
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	default
+
+	sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
+		-i variables.pri || die
+
+	## Remove Werror-flag since there are some warnings with gcc-9.x
+	sed -e "s/QMAKE_CXXFLAGS += -Werror/#&/g" \
+		-i variables.pri || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-misc/taskd/Manifest b/app-misc/taskd/Manifest
index 466b973b9d5a..c2e7172cbfca 100644
--- a/app-misc/taskd/Manifest
+++ b/app-misc/taskd/Manifest
@@ -3,5 +3,5 @@ AUX taskd.confd 27 BLAKE2B e60babd7477263d12aebb306607a6edea2cc4675d265b4c7a9592
 AUX taskd.initd 397 BLAKE2B 537dab2a50eb56f9830a83164b51f221a6ad219009c4b1bd176631b198d000017acf31b8c162c1ad6ef217e10d93da9a78413a7deb40e569676eff195176ba5b SHA512 92663323b44d5cb36d86ab2b33c761214926c24d5ba3e84c4495e3e6158e1ff4fe603c2f7e79070c02e88ba90904f9b701bc75feedd2a9ce5f1b9982192e1d3f
 AUX taskd.logrotate 114 BLAKE2B ec9fe02930b299dc309771b1b2b696a6e6e93722760ccc56227d24d7fc38bfbc6ee37a7cdd17fc042df98aff8584a765e1833f4e24520cd99564b70a2bd81f06 SHA512 4d8c3c12dc203cc6c9f27ad6882934a2786504a5b6ef7dfedd43deb61faaa4ceff452adfc93e2ed0074dd2545a90867c2ff85bca73adf9d1c858adfc76649fc4
 DIST taskd-1.1.0.tar.gz 120115 BLAKE2B 1baabcd29afb2c44c5da19f6cb926546e9beb5716ea1a04d247e62c02b4a4c5bc4bf3347e32e0e417f3b5edf1b78f58d306f1d584340c344a13fd29cdd39dcc7 SHA512 df2349c354258fd1b014b1a9c78f68dc10c9e5a48357e282e8a760cf4e4aaf4d36486796ad094ee2b050e7506195b778e3316c90ef543a2f8242de313daa13aa
-EBUILD taskd-1.1.0-r2.ebuild 1836 BLAKE2B 909433beffba43894458d9ec9e59c2e2fa6ac44075c171f02e14a339c665e31e286ffec02a4c099350b30d1d02bb0a828c9e29389e46ce70ae808e7755ed1f59 SHA512 3d557c41b4a46ab5e5232280771448e7c89c2e5db9aea03850cb77c4abf3df85ddac50fdda14d3d76a34288f0ecc391766142e75637a70e54ea058ae5f96f19b
+EBUILD taskd-1.1.0-r3.ebuild 1758 BLAKE2B 31e4d6d82287155316d129d2c5aae16a8d27d76fe6741f0690f17a9859d04b4c96fc9d5c3408331299a97dd8c1786d20fe53a2a213132f75f2f5a5330621214c SHA512 938f211d97b52818ac1b267c08006d71fde3223b1d492b0784d061d17213dd888c0b0396af627a04ab8c8f035fab8e7237ea42447828334b025a66bd2cfce709
 MISC metadata.xml 246 BLAKE2B bf870c5ee1af2f88418b8fac2cdf8adc852cebf6ee3d22f009ac4dda5307a5ff26d419f6d53c161d1096334a37b924d3188e51a299d3a4903ab842c68ee648b6 SHA512 cf3bffaa344cc0785ce4b3a18c5cef7b508e943de589d67485df46802f0c9c1b9bd6d51b7197fc84431180f82b8affae22175ae0bfe7616b57f6874a861f6698
diff --git a/app-misc/taskd/taskd-1.1.0-r2.ebuild b/app-misc/taskd/taskd-1.1.0-r3.ebuild
index 1b18af5ecd11..d86934a2f781 100644
--- a/app-misc/taskd/taskd-1.1.0-r2.ebuild
+++ b/app-misc/taskd/taskd-1.1.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils systemd user
+inherit cmake systemd
 
 DESCRIPTION="Server part of Taskwarrior, a command-line todo list manager"
 HOMEPAGE="https://taskwarrior.org/"
@@ -12,23 +12,28 @@ SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
 	net-libs/gnutls:=
 	sys-apps/util-linux
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
+	sys-libs/readline:0=
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/taskd
+	acct-user/taskd
+"
 
 src_configure() {
 	local mycmakeargs=(
 		-DTASKD_DOCDIR=share/doc/${PF}
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	systemd_dounit "${S}"/scripts/systemd/taskd.service
 
@@ -64,11 +69,6 @@ src_install() {
 	newins "${FILESDIR}"/taskd.logrotate taskd
 }
 
-pkg_setup() {
-	enewgroup taskd
-	enewuser taskd -1 /bin/bash /var/lib/taskd taskd
-}
-
 pkg_postinst() {
 	chown taskd:taskd /var/lib/taskd{,/orgs} /var/log/taskd /etc/taskd/{config,tls}
 
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index d17689d07094..e0f0f7f870e6 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -1,10 +1,7 @@
 AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b741cbe20ad9af32aefa52566fe99dedc31abf30c3f74d74ced97ce094f07203b1473bc79d9ee2546e2 SHA512 8a9e054b2ae3f5479504b0d466a96687f5be2c5d1d8fda740597ca21d8854b4ba4bc8576f8f903392e1b3c7564e3e9e80eb39f30f5a8df0b228d1bdae04725f0
 AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
-DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
 DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
 DIST uptimed-0.4.3.tar.gz 55396 BLAKE2B bebea6559c436d2700df905b63fabd73b1c55463e8633409bc05cd16c7d110d8116f52e00d63879cfb2e0482f648bda04dcb5a1d5ff629699d2758dcc85ba53a SHA512 f9485224dfe7173bab135a87b047d749f9b61d3c29d50523126b585ae77e68837680fdb725a08fd7cad39f0b35b2da7a6923b8540700881f9638286ab5082260
-EBUILD uptimed-0.4.1-r1.ebuild 1573 BLAKE2B 0a3565d49f793f34ee7942032460cf363d0fecf4603b86e256c154c634a528b446a641559f25b41340f00755346839876a2b024e37236e3269a28ad41747010a SHA512 b8417df07778fe93a935a1217b26992846ecf7389046c3ddfe8ef4b76960e5d86afd48f6c623972d9d463dd04b6deb83c965ee3a55ee1c93007e62760f3f332d
-EBUILD uptimed-0.4.1-r2.ebuild 1603 BLAKE2B 2fe5cb29ef9c1cc6c77898bc79ef14be68d90c8576bd2764cc939d4bbfb5d59dd9bc990618b7bcaa953335ccb3699d4558f3b96717b39886d107729fb01bb0be SHA512 c0a42a785ae77e3b4b79c0f7fef99696553294d5e54472b85b9990a6d562e76010f9903f46513899a103cd56edb6ba84345cc61f9bb621925da70e7ae6058e2b
 EBUILD uptimed-0.4.2.ebuild 1605 BLAKE2B f66561abfb9ab1ffab3f6ed3ef7aecb923f3a4727c52c82427c919057f506b34233dec125821cfefa5b0ad015a722c9b56be76ebf4f90341fd8da58175f2b638 SHA512 5a6e71aaa998f1ebec32c35a0cc3862cde612a2928a6cb8257e3e4ef8fcf97ffa384ec4392f2834164a0e85161fa7638930eff599755481df4c33475a0704996
 EBUILD uptimed-0.4.3.ebuild 1610 BLAKE2B d0e7bfc42af1f58fbb2ad1af6be005fd1205d3b2a02ea54df3436dfa7c1433c5c251db06db0eb4318276272103ed2fc39757008c0890393ea41c58cb89568f64 SHA512 55a244d867c1c3fe7c6b59b075664e8d9dda6fb20f0445b59c19f3a5162deb027fa6743b02190ce7045f43c13b1e7835a707ef20b2d3d5f3c8e13f2cfc97b9ee
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
deleted file mode 100644
index abc5e89c99e0..000000000000
--- a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools user systemd
-
-DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
-HOMEPAGE="https://github.com/rpodgorny/uptimed/"
-SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-pkg_setup() {
-	enewgroup uptimed
-	enewuser uptimed -1 -1 -1 uptimed
-}
-
-src_prepare() {
-	default
-	# fix configure.ac for >=automake-1.13 (bug #467582)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	local spooldir="/var/spool/${PN}"
-	keepdir ${spooldir}
-	fowners uptimed:uptimed ${spooldir}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	local spooldir="/var/spool/${PN}"
-	if [[ -d "${spooldir}" ]] ; then
-		einfo "Fixing permissions in ${spooldir}"
-		find ${spooldir} -type f -links 1 \
-			\( -name records -o -name records.old \) \
-			| xargs --no-run-if-empty chown uptimed:uptimed || die
-	fi
-	echo
-	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
-	elog "or systemctl start uptimed (for systemd)"
-	elog "To view your uptime records, use the command 'uprecords'."
-	echo
-}
diff --git a/app-misc/uptimed/uptimed-0.4.1-r2.ebuild b/app-misc/uptimed/uptimed-0.4.1-r2.ebuild
deleted file mode 100644
index f0e96cbc3b14..000000000000
--- a/app-misc/uptimed/uptimed-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
-HOMEPAGE="https://github.com/rpodgorny/uptimed/"
-SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	acct-group/uptimed
-	acct-user/uptimed
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	# fix configure.ac for >=automake-1.13 (bug #467582)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	local spooldir="/var/spool/${PN}"
-	keepdir ${spooldir}
-	fowners uptimed:uptimed ${spooldir}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	local spooldir="/var/spool/${PN}"
-	if [[ -d "${spooldir}" ]] ; then
-		einfo "Fixing permissions in ${spooldir}"
-		find ${spooldir} -type f -links 1 \
-			\( -name records -o -name records.old \) \
-			| xargs --no-run-if-empty chown uptimed:uptimed || die
-	fi
-	echo
-	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
-	elog "or systemctl start uptimed (for systemd)"
-	elog "To view your uptime records, use the command 'uprecords'."
-	echo
-}