gentoo resync : 29.06.2020

39 files changed, 391 insertions, 419 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 3c2879bc3f39..d5f96527abc3 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
index 041ca3197e4f..299874880bd0 100644
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@@ -1,7 +1,3 @@
-AUX beep-1.3-CVE-2018-0492.patch 3292 BLAKE2B fafed7dbe65438869adccf674b19c4e5b6655dca794043bbb9914879fc8e9bb6eac67b35254f47ec61a9ad5147aac6b819edb3fc8633e81c79d555023a422147 SHA512 e7ba3db3e70d2560c2a8701d9424db43a2e94988728b84bc84c5e6d777fc1e0596d767470fca41774a104cba9d2e58ef59f6449570c3d3887c1bf97861bc5bad
-AUX beep-1.3-Makefile.patch 516 BLAKE2B f69b5907e7a1342a574bedc273e609415e5853939aa694894c732333e482f2507462748cfb9ba1f0945f4778653d44c3fa04c4aca3eb78afb7152597beba759a SHA512 b21f788780a13bbef436b80ec020b8727b9c1a8ddac3552cb8bf05d7ab937851d05d72279b53b51dd0ae1f99e44f55caa494b7e61b59800d91dd186497b65009
-DIST beep-1.3.tar.gz 19344 BLAKE2B 4f9cf12f6983eeb53502fd85e5e1d428e1c1af481f8f424f6ae18cbe104462e8fdcc96670a72daa8a8a0d1430d00824d8795b4db53437e7bb7320cddfd84cfd3 SHA512 3f71146202208fa0c0cda360d125dd972ea003cf8cd62da21d67eb544c92f7b82640e7ce7c3835cbc65c75909a882edfa54dbd8d8b748d6f243711ea331477fd
 DIST beep-1.4.9.tar.gz 83154 BLAKE2B 073169ccb4919c17c0291951834fea682c87021f18562629013293432292750f6d6b3235e8882fa9cf26c9e055e1283cfa629c2e88e0f87a301b238c38380498 SHA512 46e6066cb4d9ad4a0c55a03bf5a2163426648ce3831fe1f7bafa2f02d0e407b50c52e58cc2b123c346df96e92b73d2458b473c3fb001d9a0d1470b7cf38cc35b
-EBUILD beep-1.3-r3.ebuild 678 BLAKE2B 8544f8f0ff6aa10875b13d401de593f49c1e6e1b14aca45dff03a053fc2b7c4350dc671766706b05ca87af655ad4db0c154f5eb67f524ca7c20c40501bd978de SHA512 e05d59079f1d8931e7c9626598a47e9d335f7fbd8fa564a35ff566656abfc09b10010922bbcb8d05a5b926820fd529620c3f678d994faf95769915f0925c8e84
-EBUILD beep-1.4.9.ebuild 1046 BLAKE2B 44ec88e8d8af64abb6be9e3b3c33338bbab93ba4e1a52f3836a899b6192baa222ba94b05bce2e5f5d4f72768181f5c1861d201810673646c9c1eb434b273044f SHA512 a802abf9efefcfa2e29974b8c5a0423774a76fe0f62acb65f93c9dc30f5614d4292e8826347f16c6eec8c3cb40647889feb5559e79443a97a39e93a54eaaa9d6
+EBUILD beep-1.4.9.ebuild 1044 BLAKE2B 2de3a51eb677557cc0012aad4573594c5bf0f86d489e95e1f32cfc73f2a33d18606e35158aa3af342833a768547d86a71f7c33a62ea3d98624b03ee57b7c2d57 SHA512 1a66a24c42965a2b2c80e4ba9698aa710d2beefc7bc40c3cae0933198a2a2f51a5b319c6f5fde1249dc47edc044332c2ae65409071640b1bdd84641c8c56f675
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/beep/beep-1.3-r3.ebuild b/app-misc/beep/beep-1.3-r3.ebuild
deleted file mode 100644
index 602be70f287a..000000000000
--- a/app-misc/beep/beep-1.3-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="The advanced PC speaker beeper"
-HOMEPAGE="http://www.johnath.com/beep"
-SRC_URI="http://www.johnath.com/beep/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-IUSE="suid"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Makefile.patch"
-	"${FILESDIR}/${P}-CVE-2018-0492.patch"
-)
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	dobin beep
-	if use suid; then
-		fowners :audio /usr/bin/beep
-		fperms 4710 /usr/bin/beep
-	else
-		fperms 0711 /usr/bin/beep
-	fi
-	unpack "./${PN}.1.gz"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/app-misc/beep/beep-1.4.9.ebuild b/app-misc/beep/beep-1.4.9.ebuild
index d6a43378d510..e8c215dbe0b6 100644
--- a/app-misc/beep/beep-1.4.9.ebuild
+++ b/app-misc/beep/beep-1.4.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/spkr-beep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 IUSE="suid"
 
 # Tests require a speaker
@@ -48,7 +48,7 @@ src_install() {
 	dobin beep
 	doman "${PN}.1"
 
-	if use suid ; then
+	if use suid; then
 		fowners :audio /usr/bin/beep
 		fperms 4710 /usr/bin/beep
 	else
diff --git a/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch b/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch
deleted file mode 100644
index f4894b51fc81..000000000000
--- a/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/beep.c b/beep.c
-index 7da2e70..4323d31 100644
---- beep.c
-+++ beep.c
-@@ -109,6 +109,7 @@ void do_beep(int freq) {
-      /* BEEP_TYPE_EVDEV */
-      struct input_event e;
- 
-+     memset(&e, 0, sizeof(e));
-      e.type = EV_SND;
-      e.code = SND_TONE;
-      e.value = freq;
-@@ -124,10 +125,6 @@ void do_beep(int freq) {
- /* If we get interrupted, it would be nice to not leave the speaker beeping in
-    perpetuity. */
- void handle_signal(int signum) {
--
--  if(console_device)
--    free(console_device);
--
-   switch(signum) {
-   case SIGINT:
-   case SIGTERM:
-@@ -257,7 +254,7 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) {
-       result->verbose = 1;
-       break;
-     case 'e' : /* also --device */
--      console_device = strdup(optarg);
-+      console_device = optarg;
-       break;
-     case 'h' : /* notice that this is also --help */
-     default :
-@@ -276,26 +273,6 @@ void play_beep(beep_parms_t parms) {
- 	"%d delay after) @ %.2f Hz\n",
- 	parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq);
- 
--  /* try to snag the console */
--  if(console_device)
--    console_fd = open(console_device, O_WRONLY);
--  else
--    if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
--      console_fd = open("/dev/vc/0", O_WRONLY);
--
--  if(console_fd == -1) {
--    fprintf(stderr, "Could not open %s for writing\n",
--      console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
--    printf("\a");  /* Output the only beep we can, in an effort to fall back on usefulness */
--    perror("open");
--    exit(1);
--  }
--
--  if (ioctl(console_fd, EVIOCGSND(0)) != -1)
--    console_type = BEEP_TYPE_EVDEV;
--  else
--    console_type = BEEP_TYPE_CONSOLE;
--  
-   /* Beep */
-   for (i = 0; i < parms.reps; i++) {                    /* start beep */
-     do_beep(parms.freq);
-@@ -305,8 +282,6 @@ void play_beep(beep_parms_t parms) {
-     if(parms.end_delay || (i+1 < parms.reps))
-        usleep(1000*parms.delay);                        /* wait...    */
-   }                                                     /* repeat.    */
--
--  close(console_fd);
- }
- 
- 
-@@ -328,6 +303,26 @@ int main(int argc, char **argv) {
-   signal(SIGTERM, handle_signal);
-   parse_command_line(argc, argv, parms);
- 
-+  /* try to snag the console */
-+  if(console_device)
-+    console_fd = open(console_device, O_WRONLY);
-+  else
-+    if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
-+      console_fd = open("/dev/vc/0", O_WRONLY);
-+
-+  if(console_fd == -1) {
-+    fprintf(stderr, "Could not open %s for writing\n",
-+      console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
-+    printf("\a");  /* Output the only beep we can, in an effort to fall back on usefulness */
-+    perror("open");
-+    exit(1);
-+  }
-+
-+  if (ioctl(console_fd, EVIOCGSND(0)) != -1)
-+    console_type = BEEP_TYPE_EVDEV;
-+  else
-+    console_type = BEEP_TYPE_CONSOLE;
-+
-   /* this outermost while loop handles the possibility that -n/--new has been
-      used, i.e. that we have multiple beeps specified. Each iteration will
-      play, then free() one parms instance. */
-@@ -365,8 +360,8 @@ int main(int argc, char **argv) {
-     parms = next;
-   }
- 
--  if(console_device)
--    free(console_device);
-+  close(console_fd);
-+  console_fd = -1;
- 
-   return EXIT_SUCCESS;
- }
diff --git a/app-misc/beep/files/beep-1.3-Makefile.patch b/app-misc/beep/files/beep-1.3-Makefile.patch
deleted file mode 100644
index f4b891e8b824..000000000000
--- a/app-misc/beep/files/beep-1.3-Makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Makefile	2002-03-29 09:37:22.000000000 -0800
-+++ b/Makefile	2009-03-27 22:19:18.000000000 -0700
-@@ -1,17 +1,18 @@
--CC=gcc
--FLAGS=-Wall
-+CC ?= gcc
-+LDFLAGS ?=
-+CFLAGS ?= -Wall
- EXEC_NAME=beep
- INSTALL_DIR=/usr/bin
- MAN_FILE=beep.1.gz
--MAN_DIR=/usr/man/man1
-+MAN_DIR=/usr/share/man/man1
- 
- default : beep
- 
- clean : 
--	rm ${EXEC_NAME}
-+	rm -f ${EXEC_NAME}
- 
- beep : beep.c
--	${CC} ${FLAGS} -o ${EXEC_NAME} beep.c
-+	${CC} ${CFLAGS} ${LDFLAGS} -o ${EXEC_NAME} beep.c
- 
- install : 
- 	cp ${EXEC_NAME} ${INSTALL_DIR}
diff --git a/app-misc/binclock/Manifest b/app-misc/binclock/Manifest
index c76664cc4f43..2dd392327942 100644
--- a/app-misc/binclock/Manifest
+++ b/app-misc/binclock/Manifest
@@ -1,4 +1,4 @@
 AUX binclock-1.5-Makefile.patch 479 BLAKE2B 72cb38107301d133e6c17f43f5b3cb35d9401d6c41712603e3c8c6231c4ea560e3e24958ab46a1a9878272ddbcb6ce7cb82e64d2716736eae2b5e4007078e209 SHA512 7f120eeed63f27753875c7a4b8924f5db9bfc9c5048d414c1e5de7f53cf36138bfc185843e14292c9f47e87e2aeec1fd08a31254f7ac0716e4549588776fc773
 DIST binclock-1.5.tar.gz 12301 BLAKE2B 598185f21d257bd02cd4d91e0ddc707d5eaa9ff52160bd9af0d8d50238fe6ca134952bfc99d285568b77c747ec388ed7e23e3c4bac0fec5fd150e34e55687ed3 SHA512 f3650c8befb999a7e6261bc72ee4f81be670fe95899efc742112102c4107ebbbb25d015d57a702630ce2104cf8c738953c7fe70f24814514d8a2705240000e75
 EBUILD binclock-1.5.ebuild 641 BLAKE2B 3cba39a9b3af121c1b1e3af26d7836d2377b1c52b690be4b6e88173347a27a27386515fc8ea458d13b83f9fc9ae61d7a98481a58c96eb1bb2dc25505c347e07d SHA512 d1feef6b90ec1dd93ee6e3d46ab7ea34f14775bf995e35d05a621e9bf7970105b838388a67edccba28f924cfd6180094acaffd7b542a5f5976a577700dbc91a2
-MISC metadata.xml 352 BLAKE2B 27cde27260dedf58780e1e1a2d53eababedd9d5166a2894ba4de8c50ecf78f3367c40e9fdcd4d8e55109bee2e6f371d5cb90ca57884dee5aca45845109d986c1 SHA512 f4fb925a021543b198c3fb8d4a53e5d1c5450fd7f49cd76c99d9252e1c52747359c327fa99ea3a1a8882d51949b298c39c368049f86b7890c84dccaa6746226c
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/binclock/metadata.xml b/app-misc/binclock/metadata.xml
index 0ca0fe608d0d..3cf14bf74636 100644
--- a/app-misc/binclock/metadata.xml
+++ b/app-misc/binclock/metadata.xml
@@ -5,5 +5,4 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
-	<longdescription>binclock displays a binary clock in your terminal.</longdescription>
 </pkgmetadata>
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index b8bb849de4a9..380a28fedb6b 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,11 +1,3 @@
-DIST byobu_5.123.orig.tar.gz 581421 BLAKE2B 450804be3d625c31a493edef0f398b528b5c3b21dd38bb8c9319857ead9c5bd1b5cfa01bfa190ad6fe0f5a99007ac68d068ec6082bc1fcf32c667d6035f1e296 SHA512 915ad330e85a4405ad808a6f03205c468800c0942507fc0183a883bb0b33be4023b5ef9d7a63b3fce328f771ac1a4952735ee6119a26d6a5f2b01afec7a04059
-DIST byobu_5.124.orig.tar.gz 582725 BLAKE2B 1bf4de3cfd5ce3a31c020f3a56ac495e89688a856e50b592f6999d3aae278358f7b0736b8b4c749fe577a1e9a326d3e1c5d4f08f15b033464cf890c47f4a3c96 SHA512 4ee12cdf2272532f35d2f7251e6f2aadb191f64db9f59cf63df54b2e4b1dacbac6ee9b65b8fed141204f9d309fb1a485ce86dd726c79106be0d52c2493a73bb7
-DIST byobu_5.125.orig.tar.gz 582407 BLAKE2B 7e74e121422bd9875697a96f39ab2e8e8f9d7f724ab8a597d2483bdbe89b3887e1894069dbe9b6ce75e610580b1bb002cfc632b6f2b8884db229382a719c86ea SHA512 cf5ef0e8902552fcfe839793b660454a6480154e0a315322311cecbc962ccf31aec5a6de035b7e83979d49058a64b222bade146163c31bd597feeed11c0a94b1
-DIST byobu_5.129.orig.tar.gz 758633 BLAKE2B 1ba446a5f1571bd36f7bf3e620d09022b93323e6f422067a4be0dfe28ee8332db481d99bb1000aa48d384efca33f76e5e42d7d1b795f527e95a17119936966cc SHA512 a555e2084863ac604c3a511e11339a65059058af454eeeeb24993c5e432b42527382d3b1d308996a732e190157dbc6f003d11bd5a611cd59799fdfbb3f9a5fe4
 DIST byobu_5.130.orig.tar.gz 761162 BLAKE2B 8ad45f3f8cba9435638aced30022e67e927288ac7f7bcea7d464d248a3fa0edddf4716bf782d790b8ea75d249e86f19acb76aa706c875f525f1b3b1ae9c47321 SHA512 dae3d0de3f1a65e5f3a647c1135ecf89261bf2518fea44bb49e00109ba5e1e5a8939206bb85d97f45fa01482438b3bfcb6f9ddd03dbaa1a8caca807f95b279cf
-EBUILD byobu-5.123-r1.ebuild 977 BLAKE2B a2f8b13b92d9bd618c46c6e2c9683a449fbfa68421e7713a602527a2f111192390d8f59a94308ee5a339585030586ec9f190e56ad04a33e8561afdc1f66ebcbd SHA512 2e3a4037f9608ea420bc321ada67ddd876f6439ef758f20f77ce079e61479de654d3ddce5d78f3d4d0cd40bd1e387c1b3e61179467564889d1ed3713fe47e0a4
-EBUILD byobu-5.124.ebuild 979 BLAKE2B 806914a9df9c9443e22840b2894ec6a7ab7607311ef497f94b98af5309411625133f0966a21c2ca902ae5c2f58be9e61d9e23704dcb66fd725a84e8f713111d9 SHA512 5a0be3feb1cd56710d8acc5723b98dd53a5aaca13b3e191b9e95ee1448450154eb8f981a8a3a864c6f9d01198c1b6d136ecc0e58b9fcf0a1dc856ef8facb8eed
-EBUILD byobu-5.125.ebuild 979 BLAKE2B 806914a9df9c9443e22840b2894ec6a7ab7607311ef497f94b98af5309411625133f0966a21c2ca902ae5c2f58be9e61d9e23704dcb66fd725a84e8f713111d9 SHA512 5a0be3feb1cd56710d8acc5723b98dd53a5aaca13b3e191b9e95ee1448450154eb8f981a8a3a864c6f9d01198c1b6d136ecc0e58b9fcf0a1dc856ef8facb8eed
-EBUILD byobu-5.129.ebuild 979 BLAKE2B 4d27530fb0965cb9e33ad34cda4211ad9f36992ef135efb9fe52febd93a7948db80aa22a19573a6ab0283692e14189737161cf453bcb9c188a39126eaa76fec0 SHA512 b09f18f9e7495814e9de79105e12bcd3d81f162c0f8d62287791f62dc9b65b3d7a75b06cfca78ae93383d2ddea395d944b6e4a1507dfcc10fc35e0878bf3569f
-EBUILD byobu-5.130-r1.ebuild 992 BLAKE2B 0cdcc9ab649b456a61254f9c5aa8229e859b7b6459fcea5af7204e5d07f60b9b3fd8a6375b8b33d83b63b027d8c7aeb4072d47205ed7e52b14e22f2efb73859d SHA512 30ee9fd03cf65004eb0ef05e3b7d39da0e70a9d29a0d88e857544a436ba655b0ea490a8ba04d6f6d3814d60464090c51b2e0b9e82bbcd87b00e80cabac5abd58
+EBUILD byobu-5.130-r1.ebuild 990 BLAKE2B 7ee65e526b9a7d20bd5634e4c5c54342821ceed51c28040759875a04192b1f0c6218d4a708dc0e667856e6059febcb5db18d68945209eabaeaf0c95a5dd9785c SHA512 2df7ad9733bc9f12a3e895581c4630e7610b5671c8fe3cf5073e6853e689e206809e5f80fb2373863c32f91dc363baec63502fa110427580770d76999e3d1b49
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.123-r1.ebuild b/app-misc/byobu/byobu-5.123-r1.ebuild
deleted file mode 100644
index 058f7590d893..000000000000
--- a/app-misc/byobu/byobu-5.123-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="http://byobu.co"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="screen"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
-	')
-	screen? ( app-misc/screen )
-	!screen? ( app-misc/tmux )"
-
-src_prepare() {
-	default
-
-	python_fix_shebang .
-
-	# Set default system backend to screen
-	if use screen ; then
-		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
-	fi
-}
-
-src_install() {
-	default
-
-	# Create symlinks for backends
-	dosym ${PN} /usr/bin/${PN}-screen
-	dosym ${PN} /usr/bin/${PN}-tmux
-
-	docompress -x /usr/share/doc/${PN}
-}
diff --git a/app-misc/byobu/byobu-5.124.ebuild b/app-misc/byobu/byobu-5.124.ebuild
deleted file mode 100644
index b8e2216b67cf..000000000000
--- a/app-misc/byobu/byobu-5.124.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="http://byobu.co"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="screen"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
-	')
-	screen? ( app-misc/screen )
-	!screen? ( app-misc/tmux )"
-
-src_prepare() {
-	default
-
-	python_fix_shebang .
-
-	# Set default system backend to screen
-	if use screen ; then
-		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
-	fi
-}
-
-src_install() {
-	default
-
-	# Create symlinks for backends
-	dosym ${PN} /usr/bin/${PN}-screen
-	dosym ${PN} /usr/bin/${PN}-tmux
-
-	docompress -x /usr/share/doc/${PN}
-}
diff --git a/app-misc/byobu/byobu-5.125.ebuild b/app-misc/byobu/byobu-5.125.ebuild
deleted file mode 100644
index b8e2216b67cf..000000000000
--- a/app-misc/byobu/byobu-5.125.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="http://byobu.co"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="screen"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
-	')
-	screen? ( app-misc/screen )
-	!screen? ( app-misc/tmux )"
-
-src_prepare() {
-	default
-
-	python_fix_shebang .
-
-	# Set default system backend to screen
-	if use screen ; then
-		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
-	fi
-}
-
-src_install() {
-	default
-
-	# Create symlinks for backends
-	dosym ${PN} /usr/bin/${PN}-screen
-	dosym ${PN} /usr/bin/${PN}-tmux
-
-	docompress -x /usr/share/doc/${PN}
-}
diff --git a/app-misc/byobu/byobu-5.129.ebuild b/app-misc/byobu/byobu-5.129.ebuild
deleted file mode 100644
index 9529149bb4e5..000000000000
--- a/app-misc/byobu/byobu-5.129.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-single-r1
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="http://byobu.co"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="screen"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
-	')
-	screen? ( app-misc/screen )
-	!screen? ( app-misc/tmux )"
-
-src_prepare() {
-	default
-
-	python_fix_shebang .
-
-	# Set default system backend to screen
-	if use screen ; then
-		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
-	fi
-}
-
-src_install() {
-	default
-
-	# Create symlinks for backends
-	dosym ${PN} /usr/bin/${PN}-screen
-	dosym ${PN} /usr/bin/${PN}-tmux
-
-	docompress -x /usr/share/doc/${PN}
-}
diff --git a/app-misc/byobu/byobu-5.130-r1.ebuild b/app-misc/byobu/byobu-5.130-r1.ebuild
index fa00fb9e9729..9b21e5cd6582 100644
--- a/app-misc/byobu/byobu-5.130-r1.ebuild
+++ b/app-misc/byobu/byobu-5.130-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 50723c398fa5..c6d16a0c07f0 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -9,10 +9,13 @@ AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a735
 DIST elasticsearch-6.8.8.tar.gz 149927766 BLAKE2B 329bb778100125d9624acc84252fe8281cd4ee3823fbafeabf8aeeca529c3cd8902b197d5e5a852d55f7a56ec410312e3932b34736607890dedad9e12c3afe2e SHA512 c703d6230a42b77fb0f169158afbc18517118375e341ef889c231acc0f096a44716ba4fc1a2558fd000b0ceff4d9c3aff2f2c792f2c2ae92f0e7f82c6a70eaec
 DIST elasticsearch-7.6.2-no-jdk-linux-x86_64.tar.gz 148140124 BLAKE2B 9a850011533052d7a4041484936dfa2c8fe7f7976314147bc2b1d5f239bbdfe68a3593d3e0d2bb4d709a71e81aa7c200f9530921dab9d50c0ab3e349f4769ffb SHA512 aa5f499b26e92e19a673093fe2ff73c1c03a8da029b59cb83db43f9e2dfd7c650ee6a122bcf647b7e83f658ad9b9cc64092e6e7c1b4f8476f2973a6006b8df3c
 DIST elasticsearch-7.7.0-no-jdk-linux-x86_64.tar.gz 157716656 BLAKE2B 812c4db511f844fb23cb79bdfe3778281f1b6dad6a45553380829e330231304ce0e18eb975867e8474f652a63bdab2f4fb8c14158753aa8b29db5debfd3f00ae SHA512 a8d6cb7186301f50ba72ee5cde6c26390bdb6a8c13d902a75c63038b3dbb3cd7e544bbf6934d88324d722a213b7bf2efc0b27f9cae64428e6842d640bda5ee54
+DIST elasticsearch-7.8.0-no-jdk-linux-x86_64.tar.gz 162422169 BLAKE2B 035b8405cfad0cc440c5732526b0b9bbf42466598a921c42e4964ffb441475244f6b45803556a93a207e63dfdbfb92eef731add3d71ebe737cdef70e0cb50d34 SHA512 0fdc8e3d9c83c35bc1a01ceeabdbcfe192c6a0243a2def923a14198d5e41ba804725ac39a2b6287a932b4807b3cb359adb0348fd96506d556d4cb280b6c01071
 DIST elasticsearch-oss-6.8.8.tar.gz 68655829 BLAKE2B 808b9dd49f7d9c9968e6e1c5dcd8d1150d3638b8380ad0608f1e85f00d98c6da6d0c9c324f244b510d35ecec0f37b40e29fd0761b83118e137cf394c231cc0e8 SHA512 7c5972d365a8a2a80c351039ff54a274bb1f95379d6f4feab4fa01360541bffa58409ffac6030acade24be54d1cc57e7ea24a7cf29531aba35a565718e30288d
 DIST elasticsearch-oss-7.6.2-no-jdk-linux-x86_64.tar.gz 72570377 BLAKE2B 5a5ec3e79cba236dd4a6ffd279b0fca4ad882c877b418261b0314d8101885a2d2496c837b44e5dbefe5ed994aeeca488a8f08a2ba26c4b44b156c180dae6004c SHA512 6197a0b62f577cd0692c1fb97a473a9971f8fef383dc6ef618035785dbc662947d2adbc425ce130ef531cbfaf9add9ed5da5a698387e770c49af820644d67e72
 DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
+DIST elasticsearch-oss-7.8.0-no-jdk-linux-x86_64.tar.gz 75549734 BLAKE2B 8223e0083d9a5199457957d22c8413f6d0d90c5c21bdcf4d9b573a7f3dc09dfce6c7dce5959e23c3d9c543df21d7fbbe1f7ba1124d40966d13cd7ddf8aeb4813 SHA512 4fe29f5395d938cf51d23ef7531f4d1b4c4a052d842ba2f77fe822a0986703315b2211602bf250170b99bc672fc0de09f0d1a04752322f398b6a55a057d9090b
 EBUILD elasticsearch-6.8.8.ebuild 2539 BLAKE2B 4fd8e35d07ece1117ca5b6ebaf8d75b1d67a4d870ca7986841fb360ff6948f22701048a591a200e6072f533091f08bc8d5a3d980d56b85de397618015540fe3f SHA512 972e2fca78cc29bcdef9c96dc0fcb0571dede8318b7afe907427b8bc1c46677e4b6b87333c65de1138a8fde6a9c04f605b69131509776b54cfa8712ca813aed1
 EBUILD elasticsearch-7.6.2.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 EBUILD elasticsearch-7.7.0.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
+EBUILD elasticsearch-7.8.0.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-7.8.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.8.0.ebuild
new file mode 100644
index 000000000000..2155270debec
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.8.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index c0cc80a85ca3..d916481cbd7e 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,5 +1,5 @@
 DIST gnote-3.30.0.tar.xz 4017364 BLAKE2B e53240162d4814a0f004863ca5d309dce0b428d8ce4f7e8dc64c0ce683a830ebedc4809191e55818dba98de7d968413ae080f86367abacf3e4f3a404bbd62157 SHA512 7c1348b9fdbc84ea8cc74e214de50b594a1585031a40406ba73a8635362ef1769a37dbce79347188983970debf72d3c0f81523739a48bf27823f0233cc6cfd2b
 DIST gnote-3.36.1.tar.xz 3512000 BLAKE2B 00f5f8049085c855722f92fb3231684d53c4a15b96b7148a2a810d8fdd4c02b22510f4c4f9296fd7e2f4ba96e44d55215f71a2eb78ecb60170f8bb7ffbdef6ef SHA512 4c0c9d469836366a7886928beb0b47c48e60ee41591de193b9af597214f373c2c14b25745f6238ccbede8df8e7d4d83f39a34aed1b155895479bba3e043d2cce
 EBUILD gnote-3.30.0.ebuild 1606 BLAKE2B 74048690188d8e0c430082d90bde2b84b224437b0eb1cf5ba6ef094523fc985205ad1fbc6b5f0d9a5190f662180e1feed1ef9f27512bdadac4cffa00702035b1 SHA512 fc3688fa697ba4fc36b2140e31951cfae2b69092161bee5ec3e333bcae7b1167798c2a4b6796e469da5fa9ace62419bd20e5882f12f5dbb9464fec459019a0fd
-EBUILD gnote-3.36.1.ebuild 1548 BLAKE2B 6edd95f88dc91cb497d0c381d70ff6372ecdbfb576fea1b52225ccefe7e6ef1eecf1ff35fa2131c1778679c119a82121488f3f9777e8a01176324ffc4e9c01a5 SHA512 9a3d035a3eec9d4b03f3209cde5d15eb0ba39c882213999972eac931301d5a64f053c3927d79d293461047ad8ba6c4b5a7eff1665aa546c4ff3a847caaca76ab
+EBUILD gnote-3.36.1.ebuild 1547 BLAKE2B a78b2bfc54a7c1f323ef2bf6544e7518f2d54dd6ce11a4fde129bcc0fcf1fbb3e31c3fceede6fcdb29605069b4f549ac60d5ba4c9d62e8806f5bb2b9a754406c SHA512 942bc8c4f6024679ffda5dbfef0aa700d1c1f6f595d9f8f48283c1b7049dd7bb4dfaab25875b1d5227a2f455c54d2f9356f97c708b81e1b707e41c412dfb4ec1
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.36.1.ebuild b/app-misc/gnote/gnote-3.36.1.ebuild
index 95d5527ca525..c31e6fee60f5 100644
--- a/app-misc/gnote/gnote-3.36.1.ebuild
+++ b/app-misc/gnote/gnote-3.36.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="debug"
 
 # Automagic:
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index ca412dc28f46..a4e7442cc7cd 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,3 +1,8 @@
+AUX golly-3.3-allow-py23-exec.patch 688 BLAKE2B d72ba8e9264f2b677818f46e94efac0b185cfb72fdac045b124a931ed8c727d644df8e76cc8d237bdb09a8adcc4a085a780c7f443a9c5c5df510efc3e3f028e2 SHA512 af7a7e132464594726d71d056105f88661e0e585f6833ea222977c5f659d3b02f4c12f2231e645955a3fea1de31cf9481cdf0949bc71adec12876550ee190393
+AUX golly-3.3-allow-py3.patch 3018 BLAKE2B ca05bc615f2bce230bb80bddcfca5d017181fba11c3117c438ec8cbff16fbd645a49b0f8f1cb3f52efb6a5c6548e2398b95167b738dfa3df36336ff43fc59d4f SHA512 409f765d7107b1f9d7df8389a57a06c7be37c050eed26f5724f24bed36fa5d93ff074d6ded991faf1c02341c726c4c8ceca268f89b64fef38f98c5c331a51f23
+AUX golly-3.3-glife-py23.patch 1087 BLAKE2B bc00e95ac7f07bae2c778f1faf93fee7e1ccd92947e12bb1fbc97c0a074c5a347c6ff084a47085c656a94bd2add2fe14c313aff39f60174c983670be006ad9b3 SHA512 814c8a9ac2e96bf4ff61bd46b86a5ef7cfd5a4ba027fd5af78029cfbfb2b8334c76bede82770912509b0c858a2e3ff3af8258aec6e8ee328710d805d527a2863
+AUX golly-3.3-nondynamic-python.patch 1830 BLAKE2B b202aebb3975f55de4748a925d3e4ef87e2033fa6dca7773327e5ca272872bdd817000a02a9bf5a6630eb1716ffa220844bfc324271d9b9a889a4f3cb25257e4 SHA512 5e12d9e6800cf4f3a495964d9320dae1a8a9ad4350d374c9ffa0ec61316d48d4d545d95e200a4b04a700fdb923a841214788da05d0d05bb8768018f83e5bf9a4
 DIST golly-3.3-src.tar.gz 5465595 BLAKE2B e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba SHA512 2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
-EBUILD golly-3.3-r1.ebuild 927 BLAKE2B 622e0e227aae28d5d59f91728dda34f82bf3b5ddd86edebaeff2f6ac421ad2f5f83544476f7b8468e307763202cce818cb2fc076a88aba59fec24aa34a4ed7c5 SHA512 a4ccc1e2bd716c75d65ea612d4191c5eee371265ee389098f6717330acae8dc60459e24da877bb77aa84c97ada77c9438d5d4f1b59bb5f02928a477031531c20
+EBUILD golly-3.3-r1.ebuild 1026 BLAKE2B 8cde2168e0b3ee5608ad790dc1d6197f715d012260bdecdc572e5a5c4ebe2887ef612b17b4064b8b1f2fc6a127ac067f678c79afad774a7bd053c95010860d5c SHA512 e14e63e356a06d1e78c0837636c3d34cca9ead96c5e10ded6f119c0df00f6a7cc968108e4a9017389973fe26441f4e56cd71618263bad4780fc0265e8fa82018
+EBUILD golly-3.3-r2.ebuild 1352 BLAKE2B 890bee53df3849f02d929b52a1947271d0e67991c0a2a4e8e4ba0b166d4139edbe36117f0e9b0092eae32a5c79fe5b5bb7cc47c5244a1bb8254e5fe6a579dd3a SHA512 6e5853d8a28373452f7c35104bbc3348ba2876642363ec041e38195b0672206f3da62af10eed4505dda15fe92157cf4d8b3c2656158650f487a4b805423bb5df
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch b/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
new file mode 100644
index 000000000000..e46b608ed6c5
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
@@ -0,0 +1,12 @@
+'execfile' is python-2-only. 'exec/open' works for both python2 and python3.
+--- a/gui-wx/wxpython.cpp
++++ b/gui-wx/wxpython.cpp
+@@ -3356,7 +3388,7 @@ void RunPythonScript(const wxString& filepath)
+     // for the global namespace so that this script cannot change the
+     // globals of a caller script (which is possible now that RunScript
+     // is re-entrant)
+-    wxString command = wxT("execfile('") + fpath + wxT("',{})");
++    wxString command = wxT("exec(open('") + fpath + wxT("').read(),{})");
+     PyRun_SimpleString(command.mb_str(wxConvLocal));
+     // don't use wxConvUTF8 in above line because caller has already converted
+     // filepath to decomposed UTF8 if on a Mac
diff --git a/app-misc/golly/files/golly-3.3-allow-py3.patch b/app-misc/golly/files/golly-3.3-allow-py3.patch
new file mode 100644
index 000000000000..54a047830818
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-allow-py3.patch
@@ -0,0 +1,90 @@
+The patch allows python3 as a python implementation.
+Ports module loading to conditional python3 support.
+--- a/gui-wx/configure/configure.ac
++++ b/gui-wx/configure/configure.ac
+@@ -19,7 +19,7 @@ AC_ARG_WITH([python-shlib], [AS_HELP_STRING([--with-python-shlib=ARG],
+ 	, [with_python_shlib=check])
+ AC_ARG_VAR([GOLLYDIR], [golly data directory [default=DATADIR/golly]])
+ AC_ARG_VAR([PERL], [Perl 5 interpreter])
+-AC_ARG_VAR([PYTHON], [Python 2 interpreter])
++AC_ARG_VAR([PYTHON], [Python interpreter])
+ 
+ # Check for build tools:
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+@@ -76,7 +76,7 @@ AS_IF([test "x$enable_perl" = xyes], [
+ ])
+ 
+ # Find Python
+-AC_PATH_PROGS(PYTHON, [python2 python])
++AC_CHECK_PROGS(PYTHON, [python python3 python2])
+ AS_IF([test "x$PYTHON" = x], [AC_MSG_ERROR([missing Python])])
+ AC_SUBST([PYTHON_INCLUDE], [-I"'`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())"`'"])
+ AS_IF([test "x$with_python_shlib" = xcheck],
+--- a/gui-wx/wxpython.cpp
++++ b/gui-wx/wxpython.cpp
+@@ -90,6 +90,12 @@
+     #include <Python.h>
+ #endif
+ 
++#if PY_MAJOR_VERSION >= 3
++    // python-3 got rid of int/log distinction
++    #define PyInt_AsLong PyLong_AsLong
++    #define PyInt_FromLong PyLong_FromLong
++#endif
++
+ #ifdef USE_PYTHON_DYNAMIC
+ 
+ #ifndef __WXMAC__
+@@ -3268,6 +3274,22 @@ static PyMethodDef py_methods[] = {
+     { NULL, NULL, 0, NULL }
+ };
+ 
++#if PY_MAJOR_VERSION >= 3
++static PyModuleDef golly_module = {
++    PyModuleDef_HEAD_INIT,
++    "golly", /* name */
++    NULL,    /* doc */
++    -1,      /* size */
++    py_methods, /* methoods */
++};
++
++PyMODINIT_FUNC
++PyInit_golly(void)
++{
++    return PyModule_Create(&golly_module);
++}
++#endif
++
+ // =============================================================================
+ 
+ bool pyinited = false;     // InitPython has been successfully called?
+@@ -3280,6 +3302,13 @@ bool InitPython()
+             if (!LoadPythonLib()) return false;
+         #endif
+         
++        #if PY_MAJOR_VERSION >= 3
++            // Autoload 'golly' builtin module at interpreter start.
++            if (PyImport_AppendInittab("golly", PyInit_golly) == -1) {
++                Warning(_("Error: could not extend in-built modules table\n"));
++            }
++        #endif
++
+         // only initialize the Python interpreter once, mainly because multiple
+         // Py_Initialize/Py_Finalize calls cause leaks of about 12K each time!
+         Py_Initialize();
+@@ -3287,9 +3316,12 @@ bool InitPython()
+         #ifdef USE_PYTHON_DYNAMIC
+             GetPythonExceptions();
+         #endif
+-        
+-        // allow Python to call the above py_* routines
+-        Py_InitModule((char*)"golly", py_methods);
++
++        // Python-3 uses module constructor
++        #if PY_MAJOR_VERSION < 3
++            // allow Python to call the above py_* routines
++            Py_InitModule((char*)"golly", py_methods);
++        #endif
+         
+         // catch Python messages sent to stderr and pass them to py_stderr
+         if (PyRun_SimpleString(
diff --git a/app-misc/golly/files/golly-3.3-glife-py23.patch b/app-misc/golly/files/golly-3.3-glife-py23.patch
new file mode 100644
index 000000000000..8b1599712508
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-glife-py23.patch
@@ -0,0 +1,32 @@
+Use python-3 compatible syntax.
+--- a/Scripts/Python/glife/__init__.py
++++ b/Scripts/Python/glife/__init__.py
+@@ -90,7 +90,7 @@ def rule(s = "B3/S23"):
+ def description(s):
+     """Supply a textual description to the whole pattern."""
+     for line in s.split("\n"):
+-        print "#D", line
++        print("#D", line)
+ 
+ # --------------------------------------------------------------------
+ 
+@@ -161,7 +161,7 @@ class pattern(list):
+   It is also the base for computing generations subsequent to N-th."""
+         if N < 0:
+             raise ValueError("backward evolving requested")
+-        if self.__phases.has_key(N):
++        if N in self.__phases:
+             return self.__phases[N]
+         M = 0
+         for k in self.__phases.keys():
+--- a/Scripts/Python/glife/text.py
++++ b/Scripts/Python/glife/text.py
+@@ -173,7 +173,7 @@ def make_text (string, font='Snakial'):
+         unknown = '-'
+ 
+     for c in string:
+-        if not f.has_key (c): c = unknown
++        if not (c in f): c = unknown
+         symbol = f[c]
+         p += symbol (x, 0)
+         x += symbol.width
diff --git a/app-misc/golly/files/golly-3.3-nondynamic-python.patch b/app-misc/golly/files/golly-3.3-nondynamic-python.patch
new file mode 100644
index 000000000000..bc1c81a61917
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-nondynamic-python.patch
@@ -0,0 +1,51 @@
+Don't use runtime python loading via dlopen().
+
+Just link to libpython directly. That makes python dependency
+more explicit and allows catching more compile-time bugs.
+--- a/gui-wx/configure/Makefile.am
++++ b/gui-wx/configure/Makefile.am
+@@ -22,7 +22,7 @@ golly_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(PYTHON_INCLUDE) \
+ 	$(PERL_CPPFLAGS) $(PERL_INCLUDE) \
+ 	$(liblua_a_CPPFLAGS) -I$(top_srcdir)/../../lua
+ golly_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS_ONLY)
+-golly_LDADD = $(WX_LIBS) libgolly.a liblua.a
++golly_LDADD = $(WX_LIBS) $(PYTHON_LIBS) libgolly.a liblua.a
+ 
+ if WINDOWS
+ golly_LDADD += gollyres.o
+--- a/gui-wx/configure/configure.ac
++++ b/gui-wx/configure/configure.ac
+@@ -86,6 +86,16 @@ AS_IF([test "x$with_python_shlib" = xcheck],
+ AS_IF([test "x$shlib" = x], AC_MSG_ERROR([could not determine Python shared library name]))
+ AC_DEFINE_UNQUOTED([PYTHON_SHLIB], [$shlib])
+ 
++# Find python interpreter
++# 1. --embed is needed for python>=3.8
++# 2. statuc check is needed because python-3.7-config outputs error to stdout, not stderr
++if ${PYTHON}-config --libs --embed; then
++    PYTHON_LIBS=`${PYTHON}-config --libs --embed`
++elif ${PYTHON}-config --libs; then
++    PYTHON_LIBS=`${PYTHON}-config --libs`
++fi
++AC_SUBST(PYTHON_LIBS)
++
+ # Find zlib (unless explicitly disabled)
+ AS_IF([test "x$with_zlib" != xno],
+ 	[	AC_CHECK_HEADER([zlib.h], , [AC_MSG_ERROR([missing zlib])])
+--- a/gui-wx/wxpython.cpp
++++ b/gui-wx/wxpython.cpp
+@@ -59,8 +59,12 @@
+     #undef SIZEOF_SIZE_T
+     #undef SIZEOF_VOID_P
+ #else
+-    // load Python lib at runtime
+-    #define USE_PYTHON_DYNAMIC
++    // On gentoo just link against python to make
++    // python dependency more explicit.
++    # if 0
++      // load Python lib at runtime
++      #define USE_PYTHON_DYNAMIC
++    #endif
+ 
+     #ifdef __UNIX__
+         // avoid warning on Linux
diff --git a/app-misc/golly/golly-3.3-r1.ebuild b/app-misc/golly/golly-3.3-r1.ebuild
index 27ee1bae14e8..26742c324c99 100644
--- a/app-misc/golly/golly-3.3-r1.ebuild
+++ b/app-misc/golly/golly-3.3-r1.ebuild
@@ -4,8 +4,9 @@
 EAPI=7
 
 WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
 
-inherit desktop eutils flag-o-matic wxwidgets xdg-utils
+inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils
 
 DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
 HOMEPAGE="http://golly.sourceforge.net/"
@@ -15,11 +16,13 @@ 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}"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}"
 
 S=${WORKDIR}/${P}-src
 
diff --git a/app-misc/golly/golly-3.3-r2.ebuild b/app-misc/golly/golly-3.3-r2.ebuild
new file mode 100644
index 000000000000..e3a3e4a7e591
--- /dev/null
+++ b/app-misc/golly/golly-3.3-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0
+PYTHON_COMPAT=( python{2_7,3_{7,8,9}} )
+
+inherit autotools desktop python-single-r1 wxwidgets xdg-utils
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="virtual/opengl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]
+	${PYTHON_DEPS}
+"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nondynamic-python.patch
+	"${FILESDIR}"/${P}-allow-py23-exec.patch
+	"${FILESDIR}"/${P}-glife-py23.patch
+	"${FILESDIR}"/${P}-allow-py3.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	setup-wxwidgets
+}
+
+src_prepare() {
+	default
+
+	# patches change configure.ac and Makefile.am
+	pushd gui-wx/configure
+		eautoreconf
+	popd
+}
+
+src_configure() {
+	ECONF_SOURCE=gui-wx/configure econf \
+		--with-wxshared
+}
+
+src_install() {
+	emake docdir= DESTDIR="${D}" install
+	dodoc docs/ReadMe.html
+	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/lfm/Manifest b/app-misc/lfm/Manifest
index 4fe87c3d89c0..d0d4cb9796c5 100644
--- a/app-misc/lfm/Manifest
+++ b/app-misc/lfm/Manifest
@@ -1,6 +1,3 @@
-AUX lfm-2.3-no-doc.patch 418 BLAKE2B afefe598a4ad9d1540234cd92c7574fef10e59bfeb13a9e9e2156bfc9296d9c7bd72fa2f7221c25533bb286014f8f73e5ccf1f1de023db49ec773952164aabce SHA512 d914da807c56a8ba38a9c9c2d6ac8c1ab5a9ec935cc55fd0a8ca5d12ecda571fd64a41938942586c9cc0e80a53a8d83cecc347decc66ebec719f78ce9a0b0d3b
-DIST lfm-2.3.tar.gz 119120 BLAKE2B 12d72d1caed7745dc336644589fba359c198c145d29bb419dbd0586ebe5e170d1a743e24638913a4581137c6e0d2f312a58fb84b22218ecb3f93942cf3d63db9 SHA512 d244cd03ebf4b145c0d364d9d7038a2b640010e7e6bc413a3613d4519afac4856ee7694a962176d7693bef6503b80703685b1cefab1eda0f8d0768ae10abf6c7
 DIST lfm-3.1.tar.gz 88878 BLAKE2B 409b61d24de671db33c25ff78c039f690fb376fce7bf146c452a67e72d3b50d54b461994ae7a2fb9a17fb64fc94de83f58d5faa0bd960970a53ee5c42fc9c166 SHA512 9e6142c0d871fe19b4b82e5333e03de562ca87a7498bd7fb496cca27e0b42c56a33913f2a7eb46439447ab7adb4a87da44bfcc1548101e15703aaa21ec105af8
-EBUILD lfm-2.3-r1.ebuild 487 BLAKE2B b90afce9b3e1fcccf340b916a6f559a2ab9045072b90f413ee168da331aadf158d178f745a74426db6d463629dfcd74225ce48aa4c32574b9f24149dca28e024 SHA512 0a336f8697a43fe176bc3001182be2eae2ca6e5058095247e6e5af3eccd89b89ce6d2af4bd486d4ba5912dc8d72d345b408f8d681b7a563929afe50aca0c0d26
 EBUILD lfm-3.1.ebuild 424 BLAKE2B 67781cc586f7dc65f4ad081c1bc561ea28089d473a5bf915ccb6c3499564bc9c28b059625d18d4dd92abbd46c364b31f778532c207b71ffcea18c1dbdc638af7 SHA512 6a10a255d627b5dd091223e25c9cfccc993ea9390905204290fa3930fc4901aa7fed5417801c2d617da5257ebbc47142b61862d277f8c7d00f6fdc8d9d7103ba
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-misc/lfm/files/lfm-2.3-no-doc.patch b/app-misc/lfm/files/lfm-2.3-no-doc.patch
deleted file mode 100644
index 3b69881589e0..000000000000
--- a/app-misc/lfm/files/lfm-2.3-no-doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lfm-2.3/setup.py.orig
-+++ lfm-2.3/setup.py
-@@ -56,8 +56,7 @@
-                     'lfm/actions', 'lfm/compress', 'lfm/utils', 'lfm/vfs',
-                     'lfm/config', 'lfm/pyview'],
-       scripts = ['lfm/lfm', 'lfm/pyview'],
--      data_files = [('share/doc/lfm', DOC_FILES),
--                    ('share/man/man1', MAN_FILES)]
-+      data_files = [('share/man/man1', MAN_FILES)]
- #      **addargs
-      )
- 
diff --git a/app-misc/lfm/lfm-2.3-r1.ebuild b/app-misc/lfm/lfm-2.3-r1.ebuild
deleted file mode 100644
index 63105cd4a3a5..000000000000
--- a/app-misc/lfm/lfm-2.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Last File Manager is a powerful file manager for the console"
-HOMEPAGE="https://inigo.katxi.org/devel/lfm/"
-SRC_URI="https://inigo.katxi.org/devel/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-doc.patch
-}
diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest
index 00f8163231ab..0a06da9810db 100644
--- a/app-misc/oneko/Manifest
+++ b/app-misc/oneko/Manifest
@@ -7,5 +7,5 @@ DIST oneko_1.2.sakura.6-14.debian.tar.xz 10996 BLAKE2B 4507243c28371d99976a3ef4d
 DIST oneko_1.2.sakura.6.orig.tar.gz 64623 BLAKE2B 262f9373b1739c0181a52377dd72c5f35bd9d8e4e54364304704bb6794216585a7617525ccf439cef4783556aa732ac84f60a45424021b5963d69485c21a15fe SHA512 3f06b1c23ac6e3d9864530904bccbe0fdbeebb512233e35555ae44d2b45b2e6e50480081f46b048994c9415dca05691a0796357d86b4b7e8dc0bbcf1642ae348
 EBUILD oneko-1.2-r2.ebuild 1662 BLAKE2B 016fc1f8ce45f304683bb4a56d5d1a5acf7029f4704d46ca5d3cf8c9089be0389cb03f444db45681cbaaab7e70e0b3e5b8076f6ff47ed9d5491b50f8d6fa5519 SHA512 031f740ec81e3e4b6a8b94191c8422bd274a68c3c36f038208cf3253bcfe522c1ba923b44eb0ef9ee4b0ba5837ea5ecb2068109b9b5266fef58789921f5f8fff
 EBUILD oneko-1.2_p5.ebuild 1369 BLAKE2B 0c43a1c58a73538b6ab7ecf59723b9160cddb68094ec4e415ada1a94bea85cca0934e6e3a6584cbfeb62088ba0279872b2c4a68ac477f5879b637f4996aea9a8 SHA512 517d0576f509b3f99ece67b42c7da2a2ace712cf79fe0902cfd44609cd22594dfac3fe6332a3738aabeb86c7b32b8ca69955b99f4203c9928e3e15e65cd80a23
-EBUILD oneko-1.2_p6_p14.ebuild 1551 BLAKE2B 21076d5e0dc7418a430e3a7c24f8125138e0804ceca34014ae47743ba900a70482a83f1f61aa2834f66d03bdb0c33d89555b26b8004c3c5a660d76a2d5e53114 SHA512 65310ec4c4e785e6835791fdd1cbc58559af545d0faa0d450e0313cf8b737dfec46e88535887968e27bfed0b9a098d8bd915217bce915d271c30b72fc5481144
+EBUILD oneko-1.2_p6_p14-r1.ebuild 1669 BLAKE2B f7a597f8670b5592e25fee76ad97c9c8e7fcfe6b7bb9f9d2fd1d5ed39387fd6885c0d38f9bc76fc1f835b811c94e6e2d2473c16650498facc7da9f433e3d161b SHA512 7729a838492ed85ef5fca9fba6f1664bc438b6bc2c05ec0c9a84a05365a55c3fd3c903c582b788c1ca84973570fbdd83304aa555db68dc215d3f9c681c1a0639
 MISC metadata.xml 623 BLAKE2B 55087cf6c20ffb041c6f80bb0adbdcc561c282e8de2284e139bf2b9e7156469f356210018f23229e826cc2822e84e88513e29b7dc25dc55eec583e2cb456ed72 SHA512 5f78a9557c5e87edff59075bb5a7d4dac93b4b1745244ad8b89ddcb02e997dc859bf682b7ce4dd774eab4d82e48f8895a86679b24a702e3b054f825b5d6f14f3
diff --git a/app-misc/oneko/oneko-1.2_p6_p14.ebuild b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
index 24af54e6b8a2..eb47a60002a6 100644
--- a/app-misc/oneko/oneko-1.2_p6_p14.ebuild
+++ b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,8 +23,10 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	app-text/rman
 	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/rman
 	x11-misc/gccmakedep
 	x11-misc/imake
 "
@@ -39,6 +41,10 @@ src_prepare() {
 	done
 
 	default
+
+	printf '#!/bin/sh\n%s ${*}\n' "$(tc-getLD)" > "${T}"/ld
+	chmod +x "${T}"/ld
+	export PATH="${T}:${PATH}"
 }
 
 src_configure() {
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index db52cbb796b0..0b83a061ec4b 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -7,5 +7,5 @@ DIST realpath_1.17_i386.deb 16372 BLAKE2B c8d7c2eb410c8c8129d6847d7cfe13265136fe
 DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed
 DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37
 EBUILD realpath-1.17.ebuild 1895 BLAKE2B cb908eb328e6dec2d6c6ef972b1af4f4dcbcfcf62e8d57ccf5c3eb145940a45b339bddae384562af8be7dc41c7e59d16fc6a39c54b32a3ea1303695c6a324bc1 SHA512 9df8b4c9b5d1083aca8430e6ca880eded53c7459d1731a51c1382e8b672541e1bd711754b6755c45725a173487ec4fd67321537401e00c01aba752e4592a16d4
-EBUILD realpath-1.18.ebuild 1912 BLAKE2B 9870745e68efaa1dc8ddb51b8813e817267fe376776b347e72dae60dd8ae6fe0da51b3de0142397e78e4851d8f47f1d54b355b6db60404340592b353dbaa81d4 SHA512 5c9cb987f33525f0999727918464d933c94468800e86a6c0745ed30c8c713a2b9cf9adab59a7ec547198a94caace9949c1bfe1ccc2522dd45c2f2ef8608e0e65
+EBUILD realpath-1.18.ebuild 1911 BLAKE2B 6b288e1c4c57d2015a9d6addbd3295511ebc9744bb630f2270edfa80900a4fef4ca35324019665c26cfa41f1936d0d96efb871ea8f4cdd942c7988ddb3e305b9 SHA512 b26b93a85e8689e52a8ab313f1659754d00f943ecc4ebc58e3217c9f8fe53027e0309f8b3734ae9c0ab7f790cd6f21be5e81ccd587b7cc959a5df95eef71231b
 MISC metadata.xml 437 BLAKE2B 57ad5c49f2a37e30ac6d2f4e4a169f3fca789aa45169d0b9acfb16ab2bdf714c0b2c32cc2c609dc96e6ba516991b667884714d4bb7fb74b9fb519ae3d4b32c23 SHA512 db21930053e4af656fc8043dd5f60b8a78010aacb019435076db21c201fe0bafb4e742e347c430026991ff32819cb30c9e17819a302dc927c2b513301b5d06a1
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
index 2589135ee379..1068c25a2dee 100644
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/rl/Manifest b/app-misc/rl/Manifest
index 6d7e86bea996..f35c7b0c7fb2 100644
--- a/app-misc/rl/Manifest
+++ b/app-misc/rl/Manifest
@@ -1,3 +1,3 @@
 DIST rl-0.2.7.tar.gz 131028 BLAKE2B 06db6d6e9c2dd88bce3145d0436544b5f5b848bc2e985db64ccc2146cf61be1b76b02bfe071169f6e346ad4f5ff9b9089c940ecf02e3c68efcfa2f74a9fe131a SHA512 c9db8564832494148ed8e60df844a2a383e52b9d293564cf46b393e57a88f773b7307a1dd749d4e5e2daef1632b5350de00ab2585478ff3c18bffa1c5c573f8d
 EBUILD rl-0.2.7-r1.ebuild 667 BLAKE2B 1f23d3f31c48b45bd25f7e0d4a558ecf4eb58d95b60bb35ede7c819d8aa6dcd87898f05f24db99a8ebd232c659cc19ea9fc5ff2b6d6887c3c0923aea4485422f SHA512 f0331652f2cd6729ae5dc517a70224a349e765047e0bd13e197caaadf1c3e4ce026c156b7f48218e6af484256dc562a1b587bed7600d02ccb98ac826422968b5
-MISC metadata.xml 468 BLAKE2B 4c1af622a68e3143bd38cf066917ea736fb59716aedb6d43e23579eed67d2f0180f7b3eb0565f7bd98c546e223cae59454aad21aa803c2898d6147d4fb4ec7e1 SHA512 0cffb46412913a382016065cf31b162d6043e94a4dc05f1f7b979e057717365ffd9702518330b0582218b792c8ac307184b22902c978e49b5e3de5471b1c959c
+MISC metadata.xml 345 BLAKE2B d9d62b5d814ad0d01c87bf7561708d2bb4924efab4e514830ac5e9791924d6ba26aee9f0974f36fedbd1445909aee5de079bba52de05f0f618b15a6fddcdae07 SHA512 95bf677226356a879a65b5c77b2134ec8efe29dcf194f7e01bda205eb90717b33fed0fb1559021eaf234996368d1f47c8a658161c69e587821c71c19fc66f765
diff --git a/app-misc/rl/metadata.xml b/app-misc/rl/metadata.xml
index b78a944212a5..33f5f6d36521 100644
--- a/app-misc/rl/metadata.xml
+++ b/app-misc/rl/metadata.xml
@@ -8,5 +8,4 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
-	<longdescription>randomize lines can be used to randomize the contents of text files or standard input.</longdescription>
 </pkgmetadata>
diff --git a/app-misc/transfolio/Manifest b/app-misc/transfolio/Manifest
index eb023cf0de18..d3b502292abd 100644
--- a/app-misc/transfolio/Manifest
+++ b/app-misc/transfolio/Manifest
@@ -1,3 +1,3 @@
 DIST transfolio-1.0.1.zip 158362 BLAKE2B 291e80e3576c3d92f00905c49d891c9ff926229cc2d843520b9b69f44660ec16ea274b4b68f4d8f3e353d140a6f8549697f3d2456310a5cd3a0e736ff6e0b61a SHA512 5d8c348cabcc3765c192a200ec011344960704085e815d249db23ac3669760c15ec343b16ecdce3469f49f76872f6f93563d50a96cf305f75ed19235d3a5d665
-EBUILD transfolio-1.0.1-r1.ebuild 640 BLAKE2B 19fbe0b0803d0cb1255ac8f5b4210cd5a1280c646e64240b16430790b25b96f55257b7fed3ae38648bd98cfd574d09477cf3089eb33e57dc5598e9966a24fa1c SHA512 cdd7e2b2107978f67f2f89b8591099446edf179da81aef5976ffaba6ba2ebbc2996e47bc63589246a1cd0f23e9b255e518bab034bb08e8d063a3d735d90d044c
+EBUILD transfolio-1.0.1-r1.ebuild 639 BLAKE2B 630fa4a2eb20c434ba41283f54ad3a450376ab6a5449551087c6d5c8f78b4c38d92a6bdfa804c6a5ca69fc82640611b24a76c5c05028ef1f493f51a8af5f7f77 SHA512 79ce9e3eb31350470bc00a05e471f60e2bde7cd880e58d9e7e81619e4a7ca7aafc1e5035bdc7e53b484ce36f0ab885615f64a894c7a21ba7237a20d5f3a1ac6d
 MISC metadata.xml 455 BLAKE2B daac1fc9779cbf0d98aa7e7bb3a42bb5b39b23a2e37f286252f7a427a327e6f15bb7357cf08d98a7f13331fc2b34d721f3723d28d5ca770b82eecaff07e96835 SHA512 b3422e3bf6f540318733516149e402521f2ccb83c3ebe89d5554a1fb505023eae6bdba8649a85c820208704213ec355555309189a49815cbc2408fafb7e5f99e
diff --git a/app-misc/transfolio/transfolio-1.0.1-r1.ebuild b/app-misc/transfolio/transfolio-1.0.1-r1.ebuild
index fb39bd28deaf..abcad10102f8 100644
--- a/app-misc/transfolio/transfolio-1.0.1-r1.ebuild
+++ b/app-misc/transfolio/transfolio-1.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://leute.server.de/peichl/transfolio.zip -> ${P}.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index d7f0b22934ea..54e1082bcc35 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -1,5 +1,6 @@
 AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676343296f6a9244d6b8e2726aea1b67ef19a8813a402bb0d8e3257cc6478d9a8559d5a035d9413dfe3c9e1b966f25 SHA512 5fa18db0c5ce37d15ea1d1b0b1653b43cf33a2c0f8f56708973a6d5fc59f5357efa2e6cab7113893ebedb1eb3943c6a1c8a9649c7bb407ddf4c6cfaded6e52df
 AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
+AUX vlock-2.2.3-echo-printf.patch 375 BLAKE2B ae93fbf307dfd0a911a38b2426d89d0a7a864c47db4c533af01bf2b12f89227e4af38e1eba00dac677b1c467bf688166647681265b3ff7006a323cc91e971306 SHA512 30d1f3d20e7e7881b0fa759f0cba1fed3249cd27c91a784624de23df07db821b2c0ec73b5ae54ce90bb8f58d9d68c4cc3bf10f738d99fda6d7bd1f16a429de7d
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-EBUILD vlock-2.2.3-r1.ebuild 1285 BLAKE2B 8495bed231ede5cef27cab97370ba7c4850861fbe4259843771157888eac85359f240854f776f14c6a642565088ab2f5eebe0d8ef7d7439136cb8972bb999f35 SHA512 76eb51ee9ac94da221f765da4004a17a2fe8be7865b8fdfc512e9256a01d2678b4f56e4fd550d0fdb003804ab6ac74c8d2db2210d034f5c2b9199d7989a8e18c
+EBUILD vlock-2.2.3-r1.ebuild 1352 BLAKE2B f8a6948b22083a18fcfd9fe367d58d9c1df57410908a87cc2d232eaa06661d21acf4cbaf21129e46d2577328fb8a301be98bcd6c452e93d7466eeb481525a1a7 SHA512 35711aaf093d31cdd9bcd9670d7bb7323c0753b5460618109343010594f7d2672a8e05a2d6c2a5556b7803c17b69030f6317e5bc9543b7c461f694237a6c7a81
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/files/vlock-2.2.3-echo-printf.patch b/app-misc/vlock/files/vlock-2.2.3-echo-printf.patch
new file mode 100644
index 000000000000..fd3653fb2824
--- /dev/null
+++ b/app-misc/vlock/files/vlock-2.2.3-echo-printf.patch
@@ -0,0 +1,11 @@
+--- a/vlock       2020-06-22 10:03:48.700469805 -0000
++++ b/vlock       2020-06-22 10:03:57.880385148 -0000
+@@ -17,7 +17,7 @@
+ set -e
+ 
+ # Magic characters to clear the terminal.
+-CLEAR_SCREEN="`echo -e '\033[H\033[J'`"
++CLEAR_SCREEN="`printf '\033[H\033[J'`"
+ 
+ # Enter message that is common to different the messages.
+ VLOCK_ENTER_PROMPT="Please press [ENTER] to unlock."
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
index b6c8a2c4b177..6bac4b08b79e 100644
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -54,5 +54,9 @@ src_configure() {
 
 src_install() {
 	default
+
+	# See bug #637598.
+	epatch "${FILESDIR}/${P}-echo-printf.patch"
+
 	use pam && pamd_mimic_system vlock auth
 }