gentoo resync : 21.06.2020

29 files changed, 405 insertions, 138 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b9d1a2927d32..3c2879bc3f39 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/asciicast-tools/Manifest b/app-misc/asciicast-tools/Manifest
new file mode 100644
index 000000000000..cbb8ba52c08a
--- /dev/null
+++ b/app-misc/asciicast-tools/Manifest
@@ -0,0 +1,3 @@
+DIST asciicast-tools-0.0_pre20190410.tar.gz 5812 BLAKE2B b5d64287c445e06fd8af6dcdcfaa372954a1ff412717dd0d5c32a45f84d71ecd207ed8d2441a4e37897bd652478f4a4915f83d94f8dc94103efe843615442b1a SHA512 881744d99caa8e50d9c9b977b1b4bd81d4f0037d2808eef39c7256b25ab82d57cee4572fdbefe95d729c444f16add9cceffa8af50b4180ce671e9c7c4f308a28
+EBUILD asciicast-tools-0.0_pre20190410.ebuild 702 BLAKE2B 89d58ee4ea02fb4c2962aa66052c21985632716ca3e160b220046ab6e51e02240de08dfd717dc5ba889fd283620e731528856b957730e2a8e2874a169a95ec0d SHA512 909531ffd88e5558eaa28b02eb3ed6408e604ff427ac2cdb8f7d45983e14396cf9dd0d0be1c45f853a9c664d8595cdb6e188d9c4852893ae33393c83c74de3be
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/app-misc/asciicast-tools/asciicast-tools-0.0_pre20190410.ebuild b/app-misc/asciicast-tools/asciicast-tools-0.0_pre20190410.ebuild
new file mode 100644
index 000000000000..59fcc3b08db3
--- /dev/null
+++ b/app-misc/asciicast-tools/asciicast-tools-0.0_pre20190410.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit python-r1
+
+COMMIT_HASH="f0ba10547cf79c645c9f8382c1626868bc90588a"
+DESCRIPTION="Tools for creating recordings of console sessions"
+HOMEPAGE="https://github.com/dcoles/asciicast-tools"
+SRC_URI="https://github.com/dcoles/${PN}/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-misc/tmux
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+	default
+
+	python_foreach_impl python_doscript ${PN%-tools}-pipe
+	dobin tmux-${PN%-tools}-pane
+}
diff --git a/app-misc/asciicast-tools/metadata.xml b/app-misc/asciicast-tools/metadata.xml
new file mode 100644
index 000000000000..cee379b15409
--- /dev/null
+++ b/app-misc/asciicast-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index 101519171d22..e9b9975dd586 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -6,7 +6,7 @@ AUX fdupes-9999-gentoo.patch 426 BLAKE2B ec2b67101e35617fdd479c68df0b61161852d18
 DIST fdupes-1.51.tar.gz 48942 BLAKE2B b2673a5601d0bc1d7bb0d312c3d4fbf67494916e9445fba6c46bccbeaa471ebc776b9deb18b323c6eebea4f231bdf1503af9010cbe83b6aae2a3efe479c3a49c SHA512 7cbc414f25427793317667b8d5494f7247a08ba402855929de77d1db01eb3dce41ea608f8dcca047c4a7856e02b10261982cf2acd7f6a79ab726b3009c710a8d
 DIST fdupes-1.6.1.tar.gz 20869 BLAKE2B 683b75b44ea4662e555a81405d6c9c291c7980b579c866ad953e18ad8c92beb37c2b6f7ca29ea4e40269ef751851dd8afbb77b0bffb5139bbfbcc0d41ab23a5a SHA512 6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db
 EBUILD fdupes-1.5.1.ebuild 966 BLAKE2B e68e295be16aa80d712fca947b259144d2a53bfb26629341b54699d9c1fa3547d4caae7713d15da3c2e75b21c3e241b10cc27cec6860d49ffea3a278d121eb78 SHA512 4d3eff880cbac6a6bbd94c5ad59ce229d8200deb2c8bae84bd9a89f5c346c49dd0f5787417f03d706271041d8752b4156a508cd977ed510c18f64820ae88ab07
-EBUILD fdupes-1.6.1-r1.ebuild 684 BLAKE2B 18a6313c4e2f3192c049db83278630ba938cbf8e48503f672b1be4ff6a3fc5e2071b8cda985ace481c3fa2fa093f35df9bd0a274cb8f2c376d0111fa1407e6e6 SHA512 84434c700455f906ecc95f8386117c338cad2150bbd7b5fabf5a9e4251618a0831410aa2e9c817e4a6971d2aee1477da44e5e1d76f5444422177469c1678f4f7
+EBUILD fdupes-1.6.1-r1.ebuild 781 BLAKE2B 5a06c5e3e377a4ff287b037b909badb8c796b0b903b88312202a1f153c35b185fd3fda4833f7e2b7807b424442fa4185a512c9a3c226abda55424b0bb1a9ea88 SHA512 94926bdd838eb754e4f59ab049f45e377ef9485c17970a67d8e52cc3ce9713e64a97261a0f93ddaa7e09b4a507b380c8af4566ed1c26bae0b99ef09c2f5895ab
 EBUILD fdupes-1.6.1.ebuild 707 BLAKE2B 6c1f60031766bb4d10490242dfcca71afd27875802e742a3bddfae3e976610dc5252ba4ccfe71e036efee845f014a83818b493bf6202271743970537d6846845 SHA512 0be0c0134f22a83e3e862b828d151fc20ef76635e33a77a4c6c0e93eb2a4197951be64c64a698466e61b3238aa06edac4593bcf727fc7d54c50597b22c3a5278
 EBUILD fdupes-9999.ebuild 676 BLAKE2B 061f5b9146f1a815ae16a056ddc95bf0f8bbcdda0b22e704986018df8d178582cfba854205814d41a7587433200eef4e326edc21b27f2715d1f641366e568077 SHA512 f04df62de8ddd45ad72015f8d346f15f4b81c066be0ff53e0f301ff5eb370ecc74192e2e03265f3fe729059cd1d330623eacca57177b1d8b9e777f8a090608d5
 MISC metadata.xml 353 BLAKE2B 39808fa78e13623faaeb1acf023d3bba06fb38635f315144fe9f0713b209e5c31ba36073f03102bf55fbc216c00347cef077f4ddd9e5fe585104bbeac954ac46 SHA512 a918f701cfd176d6281ce0703be9ced24bba96090d0c6ed0647e20909cc420336506c943cd5e82050ebba4618dba28b8543afc9baa394c35e5bcdd3d7ffebb8c
diff --git a/app-misc/fdupes/fdupes-1.6.1-r1.ebuild b/app-misc/fdupes/fdupes-1.6.1-r1.ebuild
index b127dfcbd858..a1e3cc6080c7 100644
--- a/app-misc/fdupes/fdupes-1.6.1-r1.ebuild
+++ b/app-misc/fdupes/fdupes-1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~
 src_prepare() {
 	default
 	append-lfs-flags
+	sed -e "s#^CFLAGS= \(.*\)#CFLAGS= \1 ${CFLAGS}#g;" \
+		-i "Makefile" || die "can't patch Makefile"
 }
 
 src_compile() {
diff --git a/app-misc/gcstar/Manifest b/app-misc/gcstar/Manifest
index afd2cccb499c..48ce60338553 100644
--- a/app-misc/gcstar/Manifest
+++ b/app-misc/gcstar/Manifest
@@ -1,4 +1,4 @@
 AUX gcstar-1.4.0-man.patch 902 BLAKE2B 092a745eaa409c8b4c8b44244c99f4012d9eaa25c530b7731ec8e1ee5750b62b25c518917afe112c520f8f38c1ac8d09c88305a4048a34203b4fcb3257194eaf SHA512 eb1f1ec1822927b5885350fd69f26e599afebe240cfdc01adde27894f37ebdfa2fe14fd0e5cda3e0f12acea622d852d5442fef1f08b4ab8e8238b9d1d5b56482
 DIST gcstar-1.7.1.tar.gz 4514370 BLAKE2B 001768d7e2b4d01c97b5a34d078979ce909def1e516166aa305dd03e343bd0188bb54c7adfeb84578f063e860fa78f8faf426f64938eba0688cf5c86feebee4a SHA512 2a37717c6e9bd83758bef99e810ef3321f5558bd5714aa2a332522262182daade9e623f51a256594f74094da3e680ba35d9650d0bc0451226bf41e98fdd57802
-EBUILD gcstar-1.7.1.ebuild 2167 BLAKE2B cc51012ca9e68c82b96a651e264f8bc3652155570af483c229c5a0c89e0da0d1e11995e376350bae47394aef065c5e7378865a29fdc906c7c76048c0af567cbe SHA512 af3fa39fae4ab45c94a9c0f7dad8c60565479c35c797b5a5d0aecf15553b47e5cddbd0e5b3e3d24e05b915af129ac1ffba2650dc9c64488e30d0a5b01d993d0b
+EBUILD gcstar-1.7.1-r1.ebuild 2062 BLAKE2B 4e72b619bbb7d545bc83c0f4c78be8135ca010d4e8e9817533daf0ca41d0216ec4a04d4492d5a599db58f9180fd705b78d985c8b3c2882d35ffde0a4b33b596c SHA512 3a0ea9924d835fac8b853a0ede19aa64c6c6671fa40c6f312bf533543b4ced130df99fa3c00c6f1fd8f40e6a65aa971cf221588c5be5efe4c041609343885783
 MISC metadata.xml 878 BLAKE2B 08bd6224a9066bcd47292389f3718d5378934bcf6b76c2d969f0703003ca50b725429dd3c336b4cb9021bd3dd0534d7ec7a5c1b6030f8338b952ae8c187c20b8 SHA512 b086dcfa2d846aab85f413600ba9f8db1bce21d6ff2463d7fd2f4328c10a5343013b049bf5143c0591f52ff111415ddd2863b09d634fa3cf124b384dad4f4dc2
diff --git a/app-misc/gcstar/gcstar-1.7.1.ebuild b/app-misc/gcstar/gcstar-1.7.1-r1.ebuild
index 0406723f3796..3ebe4524ca94 100644
--- a/app-misc/gcstar/gcstar-1.7.1.ebuild
+++ b/app-misc/gcstar/gcstar-1.7.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit desktop xdg-utils gnome2-utils
+inherit desktop xdg-utils
 
 DESCRIPTION="Manage your collections of movies, games, books, music and more"
 HOMEPAGE="http://www.gcstar.org/"
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/gcstar/1.7/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="cddb gnome mp3 spell stats tellico vorbis"
+IUSE="cddb mp3 spell stats tellico vorbis"
 
 RDEPEND="dev-lang/perl
 	dev-perl/Archive-Zip
@@ -35,9 +35,7 @@ RDEPEND="dev-lang/perl
 	virtual/perl-libnet
 	virtual/perl-Storable
 	virtual/perl-Time-Piece
-
 	cddb? ( dev-perl/Net-FreeDB )
-	gnome? ( dev-perl/gnome2-vfs-perl )
 	mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag )
 	spell? ( dev-perl/gtk2-spell )
 	stats? ( dev-perl/Date-Calc
@@ -49,9 +47,7 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.0-man.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-1.4.0-man.patch" )
 
 src_install() {
 	# Yes, ED *is* needed here. GCstar's install lacks any concept of DESTDIR.
@@ -70,18 +66,14 @@ src_install() {
 	dodoc CHANGELOG README README.fr
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mime_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mime_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index d956bc4690e6..98fb71066a5c 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,5 +1,4 @@
 AUX geneweb-6.08-parallellbuild.patch 3166 BLAKE2B 3dd6874e194947f98be325ba0125f5d7a91798e9262e7fea2df434277c2300c1e96df70c463d166750c6fad9f6f43b2aa9735b6934f7718328fbd77a1311f9e8 SHA512 baa9790ea22e6c4f29c8fd496228296fee178a78b2539a37cda69750d7a20d0921722893343084efebe3fc3f3f84403e0db8e068fd4e8bdc49f5c81c2f25f907
-AUX geneweb-6.08-r1-gentoo.patch 865 BLAKE2B e2ebc31647148ccb18f173088d6fe7da5725e20f5897db5d8f998ad275ca765fc80d19a5f387225e6b2a003e8c0af6b46dfa44c85491d495f150a9c50e5c0659 SHA512 d4e74036384123884487458a5c3ae1f35ab39b87e31239c92f800fa5e758efdb52dc4cf84686295daec78e93cf06099a1738cc1a13add659547a44352999c3b5
 AUX geneweb-6.08.01-gentoo.patch 865 BLAKE2B 25fc6d494997de4cd053757d0e18df4cefd677c959b3ce6edb5ef2bfbb896e6db637327add130ffcf8fdda06b69465ec211f6fea23c59b5b3e86af7d2752c030 SHA512 a258145e5d0eca1a286ac425039ba3ddae838a2820c9dd6d3537e65a959298b9a75ef1f32737ff5286a5f76849076830ad08ccb6ec0977f43ea322a19c9d159a
 AUX geneweb.confd 67 BLAKE2B 83af31b2708fc64dfba852fce65d6c76bf71bceff40ef5b7ef32a58ea9ae941771569d664f3fc0d555dd8ac9e78740fc0449d1011dbcfeeb66dd320c7b1f44fd SHA512 5d7e373c042ba1de97261807cf3b223157c0f383106b4fb2f2b04de21214218ad3a6e0f097101d45cb61e74d90d060ead93dc6e79a125ad97a0126690ae732b3
 AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d6542aaf930f4e7e34d4f3e3cb844b734ee3e8fbae9950438f1a7d5b7206e9a2d304b77095107e5814 SHA512 8daa663aa7d7f614ddd709616411b2078dad492813de80dd9be9866c61a1ed97c41b28ec94fece79648e2c587b991ab0820e6601891add6d0c6867fe82782eb8
diff --git a/app-misc/geneweb/files/geneweb-6.08-r1-gentoo.patch b/app-misc/geneweb/files/geneweb-6.08-r1-gentoo.patch
deleted file mode 100644
index e5a43be720ee..000000000000
--- a/app-misc/geneweb/files/geneweb-6.08-r1-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- geneweb-6.08/setup/setup.ml.old	2007-08-07 19:25:13.000000000 +0200
-+++ geneweb-6.08/setup/setup.ml	2007-08-07 19:24:59.000000000 +0200
-@@ -5,8 +5,8 @@
- 
- value port = ref 2316;
- value default_lang = ref "en";
--value setup_dir = ref ".";
--value bin_dir = ref "";
-+value setup_dir = ref "/usr/share/geneweb";
-+value bin_dir = ref "/usr/bin";
- value lang_param = ref "";
- value only_file = ref "";
- 
---- geneweb-6.08/tools/Makefile.inc.unix.old	2017-03-06 08:15:45.334667626 +0100
-+++ geneweb-6.08/tools/Makefile.inc.unix	2017-03-06 08:16:10.162223399 +0100
-@@ -6,11 +6,11 @@
- CAMLP5F=-DUNIX
- CAMLP5D=+camlp5
- LIBUNIX=-cclib -lunix
--OCAMLC=ocamlc.opt -w -3 -warn-error +a-52
--OCAMLOPT=ocamlopt.opt -w -3 -warn-error +a-52
-+OCAMLC=ocamlc.opt -w -3
-+OCAMLOPT=ocamlopt.opt -w -3
- OCAMLI=
- OCAMLD=
--STRIP=strip
-+STRIP=true
- RM=/bin/rm -f
- EXE=
- STATIC=-ccopt -static
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 4365de15ed13..ca412dc28f46 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,3 +1,3 @@
 DIST golly-3.3-src.tar.gz 5465595 BLAKE2B e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba SHA512 2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
-EBUILD golly-3.3-r1.ebuild 1026 BLAKE2B 8cde2168e0b3ee5608ad790dc1d6197f715d012260bdecdc572e5a5c4ebe2887ef612b17b4064b8b1f2fc6a127ac067f678c79afad774a7bd053c95010860d5c SHA512 e14e63e356a06d1e78c0837636c3d34cca9ead96c5e10ded6f119c0df00f6a7cc968108e4a9017389973fe26441f4e56cd71618263bad4780fc0265e8fa82018
+EBUILD golly-3.3-r1.ebuild 927 BLAKE2B 622e0e227aae28d5d59f91728dda34f82bf3b5ddd86edebaeff2f6ac421ad2f5f83544476f7b8468e307763202cce818cb2fc076a88aba59fec24aa34a4ed7c5 SHA512 a4ccc1e2bd716c75d65ea612d4191c5eee371265ee389098f6717330acae8dc60459e24da877bb77aa84c97ada77c9438d5d4f1b59bb5f02928a477031531c20
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/golly-3.3-r1.ebuild b/app-misc/golly/golly-3.3-r1.ebuild
index 26742c324c99..27ee1bae14e8 100644
--- a/app-misc/golly/golly-3.3-r1.ebuild
+++ b/app-misc/golly/golly-3.3-r1.ebuild
@@ -4,9 +4,8 @@
 EAPI=7
 
 WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
 
-inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils
+inherit desktop eutils flag-o-matic wxwidgets xdg-utils
 
 DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
 HOMEPAGE="http://golly.sourceforge.net/"
@@ -16,13 +15,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="tiff"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="virtual/opengl
 	sys-libs/zlib
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P}-src
 
diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
index dbd7e73c9106..c9026e31d671 100644
--- a/app-misc/grc/Manifest
+++ b/app-misc/grc/Manifest
@@ -1,3 +1,5 @@
+DIST grc-1.11.3.tar.gz 45205 BLAKE2B 852f58145fe11ceab3e6222b61c18cdb18a09f0666f28df4b8b8a8bc42a22dd01ae7e2bcf6232a6aa0d1f42ac233148f694a0eafbd995fbd5d147e06480f7abf SHA512 abc756a21e039c136bbf9be1ef7c1890aa2415ac21e87fb7377c90ced1def2dcaf9ce5cce22edeac68db20f6d6ccea31a2ec57044a37ba200ff79273bf11d8cf
 DIST grc-1.11.tar.gz 43224 BLAKE2B 40fe050f1198dadd039ad91fedf279ad5e913e803a669335ee21158f7f9702f3fd65ee5876595b9a4ce46da2f7f3c2cc589bf7ea3e10d84c37b5f20677ed626b SHA512 abaa18aeebf9858369b639975ae6c9a33f3111beb783b4e86463ace70de1d660efc6c17b05020862c3b2f467310f0974443f96d4f91cd322a90731c4be49206c
 EBUILD grc-1.11-r1.ebuild 1360 BLAKE2B c9a615fdabffcca8a75928d50fa946a7ee00d82e3a8e809cfa7e31e412946c6310d954c7dd2f959fa9878622073d55445b2130159ecf199f6e3777ec5925d47a SHA512 0f47bd7d412ddd273e7d26d8f820a6fc3d0028dac4f8e26003fe323753b7323b2f98cc18a2b95a904ac15951d934dcbf450ba2222949f1b228035012acdd2d3a
+EBUILD grc-1.11.3.ebuild 1383 BLAKE2B fa7efd11c0a01be93f69b8575278c5670e2641c8ebfa13461f24445200b8f62d05e439c6de79c85d69e27c323c75a144c063db79e1c77952072eab08c7557adc SHA512 4357cb998c2b221f7ff8521120b4806b954b35e8e628435e8316b7a26b5d5fa48ae9fa178d8b8309d859b826ddb46e1f80479ef0e9e07251575655a1c7d7304f
 MISC metadata.xml 351 BLAKE2B b542ab1f09e03d0fcd473a1d364c557732f0ebd865398da2bf6b322987c0bf22d916d642dcb73c0c7c72d57f7eb41caa0aff1456b49dedb0895a5f5c31f3721a SHA512 39fabd038b08bc0fb057be0d211272b65d94cd9f1afedfd576138be1ddc1748fd673684b1c407649409f2834024cad324f78564348e9da570cde26be3282bc8b
diff --git a/app-misc/grc/grc-1.11.3.ebuild b/app-misc/grc/grc-1.11.3.ebuild
new file mode 100644
index 000000000000..a3ff83965e44
--- /dev/null
+++ b/app-misc/grc/grc-1.11.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit eutils python-r1
+
+DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
+HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
+SRC_URI="https://github.com/garabik/grc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.markdown INSTALL TODO debian/changelog CREDITS Regexp.txt )
+
+src_prepare() {
+	sed \
+		-e 's:#! :#!:g' \
+		-e 's:3$::g' \
+		-i grc grcat || die
+	default
+}
+
+src_install() {
+	python_foreach_impl python_doscript grc grcat
+
+	einstalldocs
+
+	insinto /usr/share/grc
+	doins \
+		contrib/mrsmith/conf.* \
+		colourfiles/conf.* \
+		grc.bashrc \
+		grc.fish \
+		grc.zsh
+
+	insinto /etc
+	doins grc.conf
+	doman *.1
+}
+
+pkg_postinst() {
+	elog
+	elog "Shell specific configurations can be found in ${ROOT}/usr/share/grc"
+	elog "Be sure to symlink one to use grc globally:"
+	elog
+	elog "    ln -s ${ROOT}/usr/share/grc.SHELL ${ROOT}/etc/profile.d/grc.sh"
+	elog
+	elog "Replace 'SHELL' in the above command with one of: bashrc, fish, zsh."
+	elog "Afterwards, use '. ${ROOT}/etc/profile' to activate grc in existing"
+	elog "shell sessions."
+	elog
+}
diff --git a/app-misc/hatools/Manifest b/app-misc/hatools/Manifest
index 3a034f416f45..3fdcd209a7b0 100644
--- a/app-misc/hatools/Manifest
+++ b/app-misc/hatools/Manifest
@@ -1,3 +1,3 @@
 DIST hatools-2.14.tar.gz 156771 BLAKE2B f8838054be4a9f4d197a494b5e27b16833ed2b902c2eaabb1bad1c5dc1bc8b1fbd99fbfb6ec3276934b61256f918f5936b8843d6ddab5920f8436b078736709f SHA512 359b652696b6f56287e336df0a844e3d4df098ee896bb5857e9fec087ccb122a5a94aac01ae4c87e530716dfa373814ec78b415dd76f65d5e60a8274af70755c
-EBUILD hatools-2.14.ebuild 521 BLAKE2B 9d5c2411107733285cbfd67eec5ebab51ddb8106ebb2c6e9f94d934e3c5e21d05c2be08250f14a7aea9be02e6e04eb485f4c4d382a6c37cebc880e8e2f28fa1c SHA512 f272517d774ea3de362d122cf955956b151a731ad438e4ab86a092ff9f635bd7216ab0692b2343bf39f832acae278b89ca23d36d60ebf537c4a96ed9527e389a
+EBUILD hatools-2.14.ebuild 522 BLAKE2B 002b5aad7a66ae76cab9424a9537a69e401b9e493c1434a16103f25438076010a1b266af73f32cb05743792ca437ac86f3a722396f5e79c866442848fbb6c52b SHA512 bc0c86821e157a1612121ee018df68b37976d9ae62dc2410522aa1556ca33b5384a71e89f334cd4be853c52e09174726660eba7c3384e35f520138cbfbc3aac7
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/hatools/hatools-2.14.ebuild b/app-misc/hatools/hatools-2.14.ebuild
index e4f4bc4ea279..a915b1bd85b4 100644
--- a/app-misc/hatools/hatools-2.14.ebuild
+++ b/app-misc/hatools/hatools-2.14.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="High availability environment tools for shell scripting"
-HOMEPAGE="http://www.fatalmind.com/software/hatools/"
+HOMEPAGE="https://www.fatalmind.com/software/hatools/"
 SRC_URI="http://www.fatalmind.com/software/hatools/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/imgurbash2/Manifest b/app-misc/imgurbash2/Manifest
index b8dfad524ee1..2a06ca9a6374 100644
--- a/app-misc/imgurbash2/Manifest
+++ b/app-misc/imgurbash2/Manifest
@@ -1,4 +1,6 @@
 DIST imgurbash2-3.1.tar.gz 9257 BLAKE2B d7383a89f96387a5dfa9096ad533f334e9e15ec5de8803a4e2623379d036e7f0810166e017b8d89d228418bb035a5dabd1e6d0e305d539544efb1b5fd4ae8bed SHA512 0ec3b081dcd3da7a558c7895eafadc9c98f6b32c4aecb3ff579392599f785bf0716a80053b743ab32fe4e1a9f7253c9c08acf3d6f1c65d2a4c40d4c7ac222e59
+DIST imgurbash2-3.2.tar.gz 9569 BLAKE2B c34cc0cb8e5ca3b7b7da201dab90c3adbd11544950b61c834b6553262ceb42bdf9aa3b3f16f660da6ad1059015e9ca4c013dae93ba90797ec0c15bdda833150b SHA512 e6737967c20d50659222c7dca7c5fbc590a410db54f41419fe009a9fe8dc569c5b9c74eb6b53203690e9a03b0ec5b943bba45abecb243bf2ebc5377e2022471d
 EBUILD imgurbash2-3.1.ebuild 601 BLAKE2B 89ebc31aab052a83a482e669867a07d557ceb709d7bba03b6186e8fcd9a93ab7b369a8cd630c92f4e89c8bc513f8ba88a92103a3d4017d407f9e4a7cc27b0e3a SHA512 0d80a0b34a8f5414918e383a4e732ca1441afd367dc40ecb99ba6c81cee64cff49ef24f3bbc419bb0d10a8850995d34f420bfb34bd991d9eaf3b583fe2e66a37
+EBUILD imgurbash2-3.2.ebuild 645 BLAKE2B b48d7b8e1104950100b00a3629f29d88c7baf04ef0757c25fda29ddd0ead58ec0d17b17f504f93c558610b0ddc0c80c86ce9ac89bc41ab22247b4671c6252b90 SHA512 c5231527ecc57c22376e978bb8a9e0cf2850139057a7af3bb23288dfb62cb3c0d8d11b64162fc1dd1512e733b5ef306d79bf70b56a232c20f4fd3d771bf60336
 EBUILD imgurbash2-9999.ebuild 604 BLAKE2B b59d77dcfe8dab3d3d3f527618202ec252f8734d3df91fdbc8e7fed2e8871bd29e462dc8a641b1c5e6c27735507ddd925ea345111b7bcfb3dadab8233cacfff4 SHA512 bc052a2c24c485ec2afc2a4ef13d2c2ed99eba4d442802c3b7725724bb7c5f69c247ab44533d86bffa2200d86bb53f01d3988814dbac4a4d2ff430d68c1f16d4
 MISC metadata.xml 446 BLAKE2B d320d9d38032271643c158fa8bd5e356c41a2fa3d91c375eb58a42084f2d202a3728a4b49e2826111bf01de57c5e451b82be8cd8c11ce40f4ab86a41981839d7 SHA512 f5d5aa394eac1885bc1aec85009b73bce9f875ede01719a234a84d8a311441e372288abf04d993263828b0bdabee6da1ab81c7ebd70f1100f5c4c17a0ca6e1de
diff --git a/app-misc/imgurbash2/imgurbash2-3.2.ebuild b/app-misc/imgurbash2/imgurbash2-3.2.ebuild
new file mode 100644
index 000000000000..c47b35c320b3
--- /dev/null
+++ b/app-misc/imgurbash2/imgurbash2-3.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ram-on/imgurbash2.git"
+else
+	SRC_URI="https://github.com/ram-on/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Bash script that uploads/deletes images to/from imgur"
+HOMEPAGE="https://github.com/ram-on/imgurbash2"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="X wayland"
+
+RDEPEND="
+	net-misc/curl
+	wayland? ( gui-apps/wl-clipboard )
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+"
+
+src_install() {
+	einstalldocs
+	dobin imgurbash2
+}
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index f37562376311..e10be4f41fe1 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -3,5 +3,5 @@ DIST khard-0.12.2.tar.gz 5064055 BLAKE2B 5dde8d4e535e5eecdbcd679e96db51e6d96cf4a
 DIST khard-0.13.0.tar.gz 5083020 BLAKE2B 6dc95335f89d5034ddc5fdfafca06b2bfc96c2dd05e966d975eea508a939cc4d64b749c3c6c2a7ce6e74ac40835b33f90442d357b871e47b8f0b2df351225c16 SHA512 353a51a06d6c7aa27b0f1cf35b3f7c113097ea4fa5e27bcb400f00de0cdd65ccaeadcc835b1cba541361a0395265cb967f731b23d875162f2be13381bc0979a6
 EBUILD khard-0.11.4.ebuild 1047 BLAKE2B 5a49a1924187a58ea0bf40b424d401ee0baae588df144cc5e108861f96de4cf46589a8c99ed52df38ec8c73060f8f23bfa46ee082aad7bf77df4b72d0211f025 SHA512 4eb9eab539505f09a209f0e85ee00f0279ef8ede395932db733e9edd1f647d271594c3a96add9a5879b399ab0201a4b763294ac5d757016dd75b373ced314583
 EBUILD khard-0.12.2.ebuild 1088 BLAKE2B 302dfb8248572c15237119721c0fab8ce08aea7932f60df758c4ea60d204a1e18e506362bd5ac986cb768a1fb99dc1ac230939d4ec266e1693c51c43f155f657 SHA512 bc1b6f651bdaa91d218744c8e36ce757cb3f0411e58b7bbbf625bf486d55d85f73bed6ced12357b3d6d0561d84fcbee60f6952cd73c8d1856b19b9971499cdc8
-EBUILD khard-0.13.0.ebuild 1188 BLAKE2B f7ba99a42412afcf135c561f6dda8a4e809bed38e23f363627c85b36787d9a492da52e9246a36c893bc69c57f59d1a470741b90f702d28263e4750e60ed7f5a6 SHA512 f5f7cad69f5d856d81098d0dd854983b424839fb12bb1dd6ee515254019f2549dbe4d7285507ca7f42b4c4f427c44fc20249efc61d216297d8c01516158c2c61
+EBUILD khard-0.13.0.ebuild 1193 BLAKE2B 226590ecf10851053f081775381fb60052e0de8f0dbb9c6d31652ebc2e64400b3bb976d0b84e37d7d27c27f2edfd1e7336154667fc4b92e6da9b38f569fa238d SHA512 cf660d793764431e3ad8929f6112a86a3c6a721e16049109c2ea4244933889c98e1b691f654e0f00e62073fb1aa9294378e6bc6487aaed0e869eb78be0fd1096
 MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
diff --git a/app-misc/khard/khard-0.13.0.ebuild b/app-misc/khard/khard-0.13.0.ebuild
index f90ea2f5a63f..4cb2597381ae 100644
--- a/app-misc/khard/khard-0.13.0.ebuild
+++ b/app-misc/khard/khard-0.13.0.ebuild
@@ -16,7 +16,7 @@ if [ "${PV}" == "9999" ]; then
 	EGIT_REPO_URI="https://github.com/scheibler/khard"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 RDEPEND="
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 151f2d9fc28a..3926e6cadf8a 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,4 +1,6 @@
+AUX lcd4linux-0.11.0_pre20170527-python3.patch 1437 BLAKE2B b6b3e3267761d4b8df64687137451bba8cb564e9de2c5e1891061d0adf7927aeb1834ef40d46594569f3fa04141083ef43957efa54dbbac7a83a1ffa742e1f76 SHA512 ea4ddb89702d37200e0118df019d3971dd85f977ffeb1f50b3b54d48536efa91e9f0747bd235a68b0b0a33f7a7a3be76b4a29e852431a17887b370200e2cfe62
 AUX lcd4linux-r2.initd 746 BLAKE2B a4e7ce0f6780fab205777c13c1e0dbe6d7d6a8b40c45995d248fd1553f4e967b59fba9e6a4c56a777e013693b743c7939b382dbe9bb1c3d856ca9ec23e1661be SHA512 8cc10e236dcf045f6da955fcbdfd1ecedf24cbe8a31dbb39c7b8830007de790e38b6af31549fa552cb35e63ed4ef75738b4b40f672ce05c72d28ec95c2580142
 DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
 EBUILD lcd4linux-0.11.0_pre20170527-r4.ebuild 5561 BLAKE2B 2e2bb11514bd884f02649b6a620a9f4f92097a8d53bc04e1e9b594ea0022ee00de1facd1189c1d93b68edcb9677469c5cb6190fede0ce47eee9ec89ef199204c SHA512 8c2661960d0e099309b0f28f82c301e56accae7a85ef70edbb133fc4ad4c4be71b20b36cecb1f50a8ffcd680e8ff8f55e69ec201fa270dc9b22d08900c15606b
+EBUILD lcd4linux-0.11.0_pre20170527-r5.ebuild 6017 BLAKE2B a715a37f3c9125a15b6f71bf68911484ed7b79a058f8bc060d51691cd94ebf624fc7a60ed9079727c4531bc131f68679fee69cfc05b87e0b4f2852f0f2c07f2d SHA512 5d2ec4fa02fb0d2e1ff79f0d5d54ad4112b9ae7f9d317ea8048ab30c916d36a9cfbf5446ba59517eeea3ee24bc7abc7847ef0036b98fd2537334636e954143b9
 MISC metadata.xml 3436 BLAKE2B 7c72d72e9be5929fac6f655c2607e5b4140ffb499b4dd3dadfb8a23202c9dedc80650de7593331cb617dfdd04a321679c91e23f7ad187569ab54790eb1dcac49 SHA512 e38a9292bd89f0fa2027b131c60b9faa82c3e12c76caf22d3ec36fe33b51cf3dba3d5e753e2a2587dbc576d5c6a89662806f006d6a665ad1b00f87a6c1b6f29e
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.11.0_pre20170527-python3.patch b/app-misc/lcd4linux/files/lcd4linux-0.11.0_pre20170527-python3.patch
new file mode 100644
index 000000000000..f39a72e56528
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.11.0_pre20170527-python3.patch
@@ -0,0 +1,41 @@
+Update python plugin for python3
+
+Since the python plugin compiles against python2,
+it must be updated, in order to use with python3.
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+---
+ plugin_python.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugin_python.c b/plugin_python.c
+index fcd3419..4468a46 100644
+--- a/plugin_python.c
++++ b/plugin_python.c
+@@ -55,7 +55,7 @@ static void pyt_exec_str(RESULT * result, const char *module, const char *functi
+     const char *rv = NULL;
+     int i;
+ 
+-    pName = PyString_FromString(module);
++    pName = PyUnicode_FromString(module);
+     /* Error checking of pName left out */
+ 
+     pModule = PyImport_Import(pName);
+@@ -71,7 +71,7 @@ static void pyt_exec_str(RESULT * result, const char *module, const char *functi
+ 	if (pFunc && PyCallable_Check(pFunc)) {
+ 	    pArgs = PyTuple_New(argc);
+ 	    for (i = 0; i < argc; ++i) {
+-		pValue = PyString_FromString(argv[i]);
++		pValue = PyUnicode_FromString(argv[i]);
+ 		if (!pValue) {
+ 		    Py_DECREF(pArgs);
+ 		    Py_DECREF(pModule);
+@@ -85,7 +85,7 @@ static void pyt_exec_str(RESULT * result, const char *module, const char *functi
+ 	    pValue = PyObject_CallObject(pFunc, pArgs);
+ 	    Py_DECREF(pArgs);
+ 	    if (pValue != NULL) {
+-		rv = PyString_AsString(pValue);
++		rv = PyUnicode_AsUTF8(pValue);
+ 		SetResult(&result, R_STRING, rv);
+ 		Py_DECREF(pValue);
+ 		/* rv is now a 'dangling reference' */
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
new file mode 100644
index 000000000000..c8254373f7a8
--- /dev/null
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="A small program that grabs information and displays it on an external LCD"
+HOMEPAGE="https://lcd4linux.bulix.org/"
+SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dmalloc outb"
+REQUIRED_USE="
+	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree.
+# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel.
+# - st2205: It's needs dev-libs/libst2205,  which made it never to the portage tree and is quite outdated.
+IUSE_LCD_DEVICES=(
+	ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD
+	FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530
+	MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson
+	PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD
+	SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11
+)
+
+# Define the list of valid lcd4linux plugins.
+# Some plugins were removed from this list:
+# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server.
+# - ppp: It has been replaced by the netdev plugin.
+# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
+# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
+IUSE_LCD4LINUX_PLUGINS=(
+	apm asterisk button-exec cpuinfo dbus diskstats dvb exec event
+	fifo file gps hddtemp huawei i2c-sensors iconv isdn kvv
+	loadavg meminfo mpd mpris-dbus mysql netdev netinfo pop3
+	proc-stat python qnaplog raspi sample statfs uname uptime
+	w1retap wireless
+)
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+REQUIRED_USE+=" || ( "
+for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
+	LCD_DEVICE=${LCD_DEVICE,,}
+	IUSE+=" lcd_devices_${LCD_DEVICE} "
+	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
+done
+REQUIRED_USE+=" ) "
+unset LCD_DEVICE
+
+# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE'
+IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} "
+REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) "
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="
+	lcd_devices_astusb? ( virtual/libusb:0= )
+	lcd_devices_bwct? ( virtual/libusb:0= )
+	lcd_devices_curses? ( sys-libs/ncurses:0= )
+	lcd_devices_dpf? ( virtual/libusb:0= )
+	lcd_devices_g15? ( virtual/libusb:0= )
+	lcd_devices_glcd2usb? ( virtual/libusb:0= )
+	lcd_devices_irlcd? ( virtual/libusb:0= )
+	lcd_devices_lcd2usb? ( virtual/libusb:0= )
+	lcd_devices_ledmatrix? ( virtual/libusb:0= )
+	lcd_devices_luise? (
+		dev-libs/luise-bin
+		virtual/libusb:0=
+	)
+	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
+	lcd_devices_mdm166a? ( virtual/libusb:0= )
+	lcd_devices_picolcd? ( virtual/libusb:0= )
+	lcd_devices_picolcdgraphic? ( virtual/libusb:0= )
+	lcd_devices_png? (
+		media-libs/gd[png]
+		media-libs/libpng:0=
+	)
+	lcd_devices_ppm? ( media-libs/gd )
+	lcd_devices_samsungspf? ( virtual/libusb:0= )
+	lcd_devices_serdisplib? ( dev-libs/serdisplib )
+	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+	lcd_devices_trefon? ( virtual/libusb:0= )
+	lcd_devices_ula200? (
+		dev-embedded/libftdi:1=
+		virtual/libusb:0=
+	)
+	lcd_devices_usbhub? ( virtual/libusb:0= )
+	lcd_devices_usblcd? ( virtual/libusb:0= )
+	lcd_devices_vnc? ( net-libs/libvncserver )
+	lcd_devices_x11? ( x11-libs/libX11 )
+"
+
+# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS'
+DEPEND_LCD4LINUX_PLUGINS="
+	asterisk? ( net-misc/asterisk )
+	dbus? ( sys-apps/dbus )
+	gps? ( dev-libs/nmeap )
+	hddtemp? ( app-admin/hddtemp )
+	iconv? ( virtual/libiconv )
+	mpd? ( media-libs/libmpd )
+	mpris-dbus? ( sys-apps/dbus )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	python? ( ${PYTHON_DEPS} )
+	wireless? (
+		|| (
+			net-wireless/iw
+			net-wireless/wireless-tools
+		)
+	)
+"
+
+RDEPEND="
+	dmalloc? ( dev-libs/dmalloc )
+	${DEPEND_LCD_DEVICES}
+	${DEPEND_LCD4LINUX_PLUGINS}
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="sys-devel/autoconf-archive"
+
+PATCHES="${FILESDIR}/${P}-python3.patch"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if use python; then
+		# Shipped one is outdated and doesn't know python3, use system's instead.
+		rm ax_python_devel.m4
+
+		# Use correct python version.
+		append-libs "-lpython${EPYTHON#python}m"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
+		if use "lcd_devices_${lcd_device,,}"; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	# Enable all users enabled lcd4linux plugins
+	local myeconfargs_lcd4linux_plugins
+	for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
+		if use "${lcd4linux_plugin}"; then
+			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin/-/_}"
+		fi
+	done
+
+	local myeconfargs=(
+		--disable-rpath
+		$(use_with dmalloc)
+		$(use_with outb)
+		$(use_with python)
+		$(use_with lcd_devices_x11 x)
+		--with-drivers="${myeconfargs_lcd_devices#,}"
+		--with-plugins="${myeconfargs_lcd4linux_plugins#,}"
+		--x-include="/usr/include"
+		--x-libraries="/usr/$(get_libdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install sample config, and must have 600, as lcd4linux checks this.
+	insinto	/etc/lcd4linux
+	insopts -m 0600
+	doins lcd4linux.conf.sample
+
+	newinitd "${FILESDIR}/lcd4linux-r2.initd" lcd4linux
+}
+
+pkg_postinst() {
+	if [[ ! -z ${REPLACING_VERSIONS} ]]; then
+		use python && einfo "Starting with that version, the python plugins uses now python3 instead if python2!"
+	fi
+}
diff --git a/app-misc/ondir/Manifest b/app-misc/ondir/Manifest
index bfb9fd8c5606..9f4db3add12d 100644
--- a/app-misc/ondir/Manifest
+++ b/app-misc/ondir/Manifest
@@ -1,5 +1,5 @@
 DIST ondir-0.2.2.tar.gz 20138 BLAKE2B 3724b8d356cec16e1f60ec49574e2f688d4f7456f48f1d909402e8436f588d9617c827eda9a74c1b930d2538fe8c9d1372a1d222124d8f7b863bf8e895cfaa25 SHA512 5c2c53532934b25d2a170c619d067c369b6acf2ef3e0a87607619613dcc0bbfc570937fb91cdc5df3f22ae0453b5a5d00edd57cd1b852f7a076c15b96c45d4dd
 DIST ondir-0.2.4.tar.gz 52860 BLAKE2B e9111f9a64d8d7393d9a8e48d5dc66d5814995ae1dbd2f577538a03021c1b1b92af43acbd0ab9cb24ab29ba16c50d5752a9442689effc62bd8c13b6fe11a4785 SHA512 f59a823807f86ce2992aaf5fb174ddea222b02ed18e1289ca450179bd090892f1467072dfcec97ce219e216c055781ea7a1a05bb9402276fb9404a57f42ddb52
 EBUILD ondir-0.2.2-r2.ebuild 983 BLAKE2B 1ad1bf96ffea8060f6a676183d5c200165e928cbf46e5a4ddc2dfdd342e150c53bc9375a8413fae34a2a0af147a34ab1cac6caa19b3858e0ae33e85bbeb4e8b6 SHA512 4da1bcf80437796ea0c427f3be610c406880ff76e2d59c651078ab86917c3a06ad3e1b5b017836d499a7cd3ad1095ea9a5308def391764c78dc042063b1af7fe
-EBUILD ondir-0.2.4.ebuild 936 BLAKE2B eaaf969c2efa62b1f186c2101ea597f22ec5d5a0731500615468238ea21a25ead29baf87e113d022380404c0082da32305eb77c5c36bef30c7e0871cc6eae8d7 SHA512 b76a67250437ff8cf6014502bec594bff0e3aeea9ea14b472e7c09bb02f2a8c2b595cd5e3a870cde4b63f15263a1c3a74b4620ce18402f96993a03cc8b30bc31
+EBUILD ondir-0.2.4.ebuild 1014 BLAKE2B 19916edbcffd21f4f80fc0df603a2c7f74b3590f44f133b94e29036bb7d25697eda3d0b421c1b44bbf7111238c4525e7cfce8f473a27ed5880b805d1f595ac8f SHA512 17974ea87fcc7ed018b2c150762b559f5167752fd8621a09ed63944efb65b408ddd6c9b150c70d633c7ed19c27a5457e0f3a5a387d04ff28ec7a157f5411083e
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/ondir/ondir-0.2.4.ebuild b/app-misc/ondir/ondir-0.2.4.ebuild
index 2f51ec18dee6..e3c9190d013a 100644
--- a/app-misc/ondir/ondir-0.2.4.ebuild
+++ b/app-misc/ondir/ondir-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,15 +22,17 @@ src_prepare() {
 	default
 	sed -i \
 		-e "s:\(/man/.*$\):/share\1:g" \
-		-e "s:-g:${CFLAGS}:" Makefile || die "sed Makefile failed"
+		-e "s#^CFLAGS=\(.*\)#CFLAGS= \1 ${CFLAGS}#g;" \
+		-e "s#^LDFLAGS=\(.*\)#LDFLAGS= \1 ${LDFLAGS}#g;" \
+		-i Makefile || die "sed Makefile failed"
 }
 
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
 		PREFIX="${EPREFIX}/usr" \
-		CONF="${EPREFIX}/etc/ondirrc" \
-		LDFLAGS="${LDFLAGS}"
+		CONF="${EPREFIX}/etc/ondirrc"
 }
 
 src_install() {
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 7fd11dd72a03..cf7f142d595b 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,3 @@
-DIST pax-utils-1.2.5.tar.xz 679604 BLAKE2B 348c6ab52a5e950f346115802d596fd33142fe2d93a83d686fbec917d3f74c53c332f2fcbd197c5bdd38b545f48568c7b461143fa328433ce3ee931901012601 SHA512 bf2f47393a66b4218eba7981100fc6936c7c9d6d98970f5337e7b3097ce6f7b2ca13de486ff7450e4395b74ba2308d37105508234f323230376ec5814cfe54f9
 DIST pax-utils-1.2.6.tar.xz 680696 BLAKE2B b271e19ed5ec1024d7c6e5723c12464c6ab07646dfbfd4738bfe0250629205051642421425d7c7c5f540b1ac3d100c13d1beca398d9766f7f477830ab128eef2 SHA512 59fe16c5573414aa2952a99c5b85c16cf10dbbee76943f263d31d5b1aa8818a9b00fa78c8b6dadbe02216de54fc32b26d80303a17e2d854de6bb9dd8b431f617
-EBUILD pax-utils-1.2.5.ebuild 1761 BLAKE2B 53b8fbc3524893c641669ab51b3de78f8d6d9e55ff1dec7736531762274e175a0965ab9060fb69ac1f2617ed4c2d045a30166393ec4ce44d3e13fad3d054def3 SHA512 c2a0d5459815b64725429b90bf81788c908265028562c667a215791da4152d3e094e356289d0abc8f013b5c66dfb15d6217cb615843396c1f4e2ea9a972f0086
 EBUILD pax-utils-1.2.6.ebuild 1761 BLAKE2B 53b8fbc3524893c641669ab51b3de78f8d6d9e55ff1dec7736531762274e175a0965ab9060fb69ac1f2617ed4c2d045a30166393ec4ce44d3e13fad3d054def3 SHA512 c2a0d5459815b64725429b90bf81788c908265028562c667a215791da4152d3e094e356289d0abc8f013b5c66dfb15d6217cb615843396c1f4e2ea9a972f0086
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.2.5.ebuild b/app-misc/pax-utils/pax-utils-1.2.5.ebuild
deleted file mode 100644
index 00767ccb7d09..000000000000
--- a/app-misc/pax-utils/pax-utils-1.2.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit eutils python-single-r1 toolchain-funcs unpacker
-
-DESCRIPTION="ELF utils that can check files for security relevant properties"
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps debug python seccomp"
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}
-	caps? ( virtual/pkgconfig )
-	seccomp? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_DEBUG=$(usex debug) \
-		USE_PYTHON=$(usex python) \
-		USE_SECCOMP=$(usex seccomp) \
-		"$@"
-}
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux ||
-		has_version '<sys-libs/glibc-2.10'
-	then
-		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
-	else
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-
-	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
-}
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index 4723cbb44ce8..f21f838e82bf 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -107,5 +107,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 EBUILD rpick-0.5.0.ebuild 1828 BLAKE2B c24e1c4ee0cab50b58e1d7d7b36993e888bdc3c20fca7a00ab35d48eb006ae368fb68cf25a2b0cc7ccba8da7a9c4fab888cc49595c09a7734b44a1c262e90282 SHA512 8fb1124d11afef641088dd34f3b3bfe086e4abca40556776bbb998e4047e7ee8bc2e29d9cd0d6a068d7d8a5d74da5b5b9dcbfff223e7a4469fd4f06f77c7debc
 EBUILD rpick-0.5.1.ebuild 1727 BLAKE2B 67a4547c436326007aaba207d5df880f5aa53f310f50573f7cc5a758e2803469c99174e6327fe62f691f04be83ef376470e634108068cfd676251aee298ddb3c SHA512 9b8c2cae542b5d7c650f3907aca05b830040ae9f3809bf92b2630f6b667082e1f1659efac089ee69f83e8eb403ed5904787900025639f3adc11344081f6b2e46
-EBUILD rpick-0.6.1.ebuild 1729 BLAKE2B ec2e7b2397827420aad4d8d0c5f77faa9fc121c3ba14752cf9b880f14ac09a94dd15a6d77b5e9dad86195a2a9d6cd0824dd1494c0d98882385194b99e0bf6c06 SHA512 ee5fb45a300d5e688379aa98acb64891c2c9739d2984fd6c5ba4353cb001f3234da8d16b80e4c472e3061ae3ca9637fb1e6813a625fea9f43c19e92ae54b4372
+EBUILD rpick-0.6.1.ebuild 1726 BLAKE2B 80001b4d34c5ad00b9981e04a44f372773b4615418a18fbe24c00fa8912acb354e8a8f81b1d09efa406709d0472cf4939e94446b0c40b58c0965e57efb36ddc5 SHA512 fafcf0e4956e0d66e1978b2ed4bb456c6447e1f00b83425a93169d7e9a99e3050ee5ac483f827136cd9a464a3fdc60cc15cca196a1e63a7c99d789ecd58aa520
 MISC metadata.xml 952 BLAKE2B 96e5353f41d21e7bf84e9519ce7fcfb39e2a06ef805751efdca7c85c5d7c121114a425c79b2d50c1eabd654b8519d4a51e66fd26e2ed55c821584ee9e6b821e2 SHA512 4da1e603b5f60c93f5d6a423a0306ee6132cfb2ad32b6acdf922e72d633d9a87abcefbb236011d63469a25247288cf2f618b4764cc43dfa8b21ed25bf2f7a2b3
diff --git a/app-misc/rpick/rpick-0.6.1.ebuild b/app-misc/rpick/rpick-0.6.1.ebuild
index 9cb7e8ee3048..ed79d3064a24 100644
--- a/app-misc/rpick/rpick-0.6.1.ebuild
+++ b/app-misc/rpick/rpick-0.6.1.ebuild
@@ -73,7 +73,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 # use cargo-license for a more accurate license picture
 LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 CC0-1.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DOCS=( CHANGELOG.md README.md )