gentoo resync : 23.09.2020

28 files changed, 392 insertions, 73 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 950568e50353..9e8b51bbf131 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 0982da4d07c0..7044a0b42b04 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -1,10 +1,10 @@
 AUX bumblebee-3.2.1_p20190421-gcc10.patch 2006 BLAKE2B 136c9f5aa38269efa2ef59f410668f1ce5e9976eb377036596a455e27188a88691099eeb7e14b7de92ce0621fc1d36ca32d8301e982fdfe41c138aa7fffc017b SHA512 da2330ca2c915349899a6d7dd525308b02f3ed527b18496ea48889a41f4b4299260d53dab85c78f14a7778576dea47e2d140690c68b61de715cbe0e8722f2031
 AUX bumblebee.confd 60 BLAKE2B 68cfe5dd4db512e10cf82977556336e7bb8eb7ab3f397a2ba5b75c4d5e0856d957a126e741d2c3a45f3453479b42e0b1b42b9aab411eb80de9afc73f3c2ff8bd SHA512 4c773002e372e1696c0922bda91a104ea0ee244eb6beac84a4e7ad2ff1aee265aa248e63c3ad55ea75cabbd36b03d9efa3f8ec3ef708346837ab6a10d6652251
 AUX bumblebee.envd 127 BLAKE2B 2a993cd77706c2da4f90a3a77b4a6d0014b1322c584ae8970d75539b04b5d6a23adac7067a511f4f9d9a47797ac1d55f836c3242d26d0c464f6ea3833dc30ae5 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af
-AUX bumblebee.initd 485 BLAKE2B 7583befe5a3e3b699bf895f1e4ac445dbe1bbbb172ef0c9e4d38a6c347699e80aca7a450f95cde9d8fe0f033d5d5a80716c9f17155f7d5ebdfa286b533fc4ab5 SHA512 12c4d28bb0dfa17239c7bf488408f3ca5e672a2167664b7d9f5501fcb878fe679c351bbe037f31b762e8e9a911088d08d66814cd8cc6b257fd973cc6c54ee10f
+AUX bumblebee.initd 488 BLAKE2B be625ab381b6f588bc86402bfe7aacc8f541c0ebe2f8fdbc4309bdef5dd1cfa44953a3488bde8d0af67b8cf4b14b7b5de77ab125067b6b59379ceba75863fc45 SHA512 5c733a901e2bed20082d01f0db2e8d168106b082f2f6300388edbeec7f5b7a70ddfed908012c8ccf9a3caf070669cfb550368237dd6f8ff62018f8b767012cd7
 DIST bumblebee-3.2.1_p20170130.tar.gz 63428 BLAKE2B 33a2fbbd6e6cbc6cd026b87714d06e54d8803cc75e997cc1bd1aa1d1263c3fe9602f822b92c67fa7e76632bb19daaae11e591b88d087889a970d374f6316e847 SHA512 b457e8ce197782bd1b1fabd3c0c67e4ec26cdb90a3715bbe7a8e1550cdde19134151567cfa0c73d800c30e5d303b30bc1261d5f3cbceaa64d559416e4d541070
 DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec
-EBUILD bumblebee-3.2.1_p20170130.ebuild 2219 BLAKE2B d422665f2e8033f644162a7ade48b83f7416747ce29a3dcaca58190054510e445bc72515d36e435dcf6990960ea1db852b3dab8b4cdc9ff42da54f6d1c174b93 SHA512 38bd8fe978bed7807f5fda4d6d48fbd97e648cd47e022efd5b11f5805aea5c175cb091eca7ae4f0da8faf67d8e27c49eae89691516932c63805258e85b080e28
-EBUILD bumblebee-3.2.1_p20190421.ebuild 2317 BLAKE2B 5189a2f0ab287b44c2fd72f5f4f06734e4db53db95ff2b98cf093a01202f1764275483f03a7383f82e0799135976a7d8b039870d626f9959ecf8072fcf623d3d SHA512 75ecf2b663e7f72ddc38a55a56783e218d9f6f2ac6e8bb91ddda91e902f0841c1c1b655679e9316981a4398f84df6baf4630e6102dfc17e7f5534c120d896acd
+EBUILD bumblebee-3.2.1_p20170130-r1.ebuild 2219 BLAKE2B d422665f2e8033f644162a7ade48b83f7416747ce29a3dcaca58190054510e445bc72515d36e435dcf6990960ea1db852b3dab8b4cdc9ff42da54f6d1c174b93 SHA512 38bd8fe978bed7807f5fda4d6d48fbd97e648cd47e022efd5b11f5805aea5c175cb091eca7ae4f0da8faf67d8e27c49eae89691516932c63805258e85b080e28
+EBUILD bumblebee-3.2.1_p20190421-r1.ebuild 2317 BLAKE2B 5189a2f0ab287b44c2fd72f5f4f06734e4db53db95ff2b98cf093a01202f1764275483f03a7383f82e0799135976a7d8b039870d626f9959ecf8072fcf623d3d SHA512 75ecf2b663e7f72ddc38a55a56783e218d9f6f2ac6e8bb91ddda91e902f0841c1c1b655679e9316981a4398f84df6baf4630e6102dfc17e7f5534c120d896acd
 EBUILD bumblebee-9999.ebuild 2215 BLAKE2B f9f61a4183cc43c2c1442101b433fec6a3477d6062da340d8421e0e63398927c5767177ea4d3c98ef87bd261de39b821d003d7a67e209de21b47c57c5e7aed21 SHA512 7da89e2bf3ee757b29fde2757dba5e63c157ff0b15b59d244df8ec43ce9a25adcd00b6f149b694488a916eb7d293b6a59d48e40c18eb94b4be1e9fa35c26a69d
 MISC metadata.xml 1111 BLAKE2B 9f9bcd089280889ccb6990617f6b470c0c69a8b77b2af849d5bde7ff45ec94e121569d2c217a87d7375e19503bf0d90de775c514e7b400c0dd2a6fbc897c21b4 SHA512 dc2f37b1def7e302fc3d82325d3179b0c64c96b2fa609f6cf5196cb97b89854fade361005327ee2f8ccc5927e0aefe1c997cf5e6f9862cc18ef09deb3a2aa814
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20170130.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20170130-r1.ebuild
index 1099ff0e4161..1099ff0e4161 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20170130.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20170130-r1.ebuild
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421-r1.ebuild
index b45b50e5519a..b45b50e5519a 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421-r1.ebuild
diff --git a/x11-misc/bumblebee/files/bumblebee.initd b/x11-misc/bumblebee/files/bumblebee.initd
index 219f71010d84..b9296538a80b 100644
--- a/x11-misc/bumblebee/files/bumblebee.initd
+++ b/x11-misc/bumblebee/files/bumblebee.initd
@@ -1,9 +1,10 @@
 #!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
-	need xdm vgl
+	need xdm
+	want vgl
 }
 
 PIDFILE="${PIDFILE:-/var/run/bumblebee.pid}"
diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest
index 87de4a63ef15..f3a3bfad91e9 100644
--- a/x11-misc/grsync/Manifest
+++ b/x11-misc/grsync/Manifest
@@ -2,5 +2,5 @@ AUX grsync-1.2.6-gcc-10.patch 1497 BLAKE2B 7b75cb46e4f1fa4df69724441e1a67742469a
 DIST grsync-1.2.6.tar.gz 333540 BLAKE2B 20719580309aba5737b74e85629b21b9715ceb8d97bd00d1840a5eda0e04316439d90999b7b787cdf8b368fff90ba489dcfc3b91992dd599f7ae05f4a565f1e7 SHA512 a7aac0cf264c968d50896156730dc0b925045def6e513adf1f2783e19fd1cdd423aa69480963479b95927fb4e863f110f3fc0439661ef7cfcacc7376fe95ff1d
 DIST grsync-1.2.8.tar.gz 352885 BLAKE2B fc63db9b2739bc7a253b64cb1820a7c51c7408ebbe5bb950672b6ab08942726467a4966eea3da67c7c7e21e0acc703a06183d58e2fbcd1ec38370257b57bad63 SHA512 7feee6c405b20f147641e9a9a114645a7132345fcfc33c656a190aba0d2b7fedcd40f98328dfb0b123f38d8648d041a2f53cabbae0b8d53a243d3a6029bf0963
 EBUILD grsync-1.2.6.ebuild 531 BLAKE2B 189975475dbb3ee82136f7abb13b9b0934ef550eede295136b3ec4d25bda3cf1494d5f24f9e9a715619f6227557ca88cc993f86083d898d9edeeda57077c9795 SHA512 9f2ab15a2ea536f07e4d12f65b7f1640ea791b54704654da9ec1a75bc0ca6178e0d2dbf777a593523f1d38dfc7a737cbd4c8f3c9aecce419ec8f456617fce448
-EBUILD grsync-1.2.8.ebuild 550 BLAKE2B 54f572a9ea7e015c7e0742dab8c128830e843db680d6009cf998f211fb45c1fbebe99bf2689ef9ef4a7a70ad65aa3f281cc1130f18483f8d49d9bd74a8fe2a60 SHA512 6ce7ec3ee784e43c5cc5174a7de722a0726d776ceaf5a051f60335802b476ff2bda1b8e740e4aa85e0732e624b8c2ba1b0a794e2279dc05708a55b4de2c819f3
+EBUILD grsync-1.2.8.ebuild 563 BLAKE2B 43169b43b94c3de0ccbd8c440415882b8c8942c88bf8d74c75ab4930d2c5b7f31a73e4c6500a80b60d7e44cb937f1604f83ae945226404eab833902c48c84a2b SHA512 dc3a99be2b068aa0023b51878de0fee836ed1306f945d62f465d235a722f898a298bc12de1e2f6abb7ff0a08125ddcb0f91bc9aff88e924909a5161d51fc1918
 MISC metadata.xml 258 BLAKE2B 46e283e28202f000bdb3b2b01ac3b3e4aa25a42715e1940135cdcef61181c745865042fe44a908a5d3e83308f7f98f0eff2b8519c0a4691e3bf5637799de420e SHA512 9909d39f5a2a4d3c92d1c105ea5250603f505e9fbb0ff433c25290ac5c2b53f00d96fe8dc0a98bec2240298b3b7060503f59caf04cb47484a63e4057bcce82c6
diff --git a/x11-misc/grsync/grsync-1.2.8.ebuild b/x11-misc/grsync/grsync-1.2.8.ebuild
index 9a17e6b5c3f0..d866f840856b 100644
--- a/x11-misc/grsync/grsync-1.2.8.ebuild
+++ b/x11-misc/grsync/grsync-1.2.8.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit xdg
+
 DESCRIPTION="A gtk frontend to rsync"
 HOMEPAGE="http://www.opbyte.it/grsync/"
 LICENSE="GPL-2"
diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
index 72d2cde0c5e1..acffb9603571 100644
--- a/x11-misc/gtkdialog/Manifest
+++ b/x11-misc/gtkdialog/Manifest
@@ -1,9 +1,10 @@
+AUX gtkdialog-0.8.3-do_variables_count_widgets.patch 214 BLAKE2B 7e8975b55ac8432ceeaa412b01c2a8362c1394575aadeb471ad93f6bb91e185f412c94c4c1e4122055b939723fce15efc8353587f1adc5f01d746b9143f7a5ef SHA512 befcd5644d268b734a15e8ce0d58fc410d61fca9b825cd97f14ba5000355d81684f42d6bbb65cdc84ec7fa01c3112901adb0ffabd6af0df4875f2441aa0a7235
 AUX gtkdialog-0.8.3-fno-common.patch 1535 BLAKE2B 1a881d8827c0ac815791b5bd482d1160158bbbce8a2b5a57235e1ba3131d8cb4c591f10b67fff35c5f1a632f097fa751749702b32696f1b86469629a4b4238f4 SHA512 5812ee6272bc7ffa85ea506bce9b64451c5d9a716c87272b7c5e0c166b85ac7ba7f1a8cf9c687df194b20fe0db942084b2d199cbf51093b05d204c217ea6e65c
 AUX gtkdialog-0.8.3-optdeps.patch 1573 BLAKE2B 1db31db450da622f91920611c93bd4d8cec0378ab2baab27dbb0f3ea750a6ca83ac6e0bb14ba6f4b4043ab80205d140d4b5fad6e9a120445499a4c0984577956 SHA512 a26d46716b46a909c4346c3fc3d9999991c98649ce4fc97cb6f0010dd768c81c62fec6561210dad89ef3911d2fe751c1cf321df60d5e6321647b818f8ed91475
 DIST gtkdialog-0.8.3.tar.gz 571974 BLAKE2B cfd5062ec6c255ade5467b9d6435d7529c5a55f911db8e549b19c26032aebcd1b83f2cf4ac7e2bcc9c71f9f37725c9285bbb22505ec021e7eded28ab7d382113 SHA512 fd8a93d576917efd650e38e31f261065c0a0c3f9213338ed4bd457d310993d8efbe8deabb2c1451f491d14c8d38cbcd5d4cb0c9f289c6fd462f7a06754b89da7
 DIST gtkdialog-0.8.3_p20200202.tar.xz 356312 BLAKE2B 77358e0b04ddb484e3e3a093084776a2c799fa52b90849bdde3bce56a7c042c2cbe28d699f0c4dcc14cc69872d496b89fc5c8aa7140669560e01448d9c57c15d SHA512 9120ac515eace168e4a3987b6cf3a1b3aa0e7617e837ade21d5ffea25cc3f3abbff598bb4c33914fb800416ea687f0ec7dea2b24c8acc0c71734aa6b2b385bfe
 EBUILD gtkdialog-0.8.3-r2.ebuild 897 BLAKE2B 6d445aefb7cc5825df30d4ba7e9157710bbd2266fc047efe47e8525a2899eb75879b878f9f122f067f9c4f974922c340b22e5ba6c952c5dd91d2981a030e41d6 SHA512 294e88293061c8cae807fcb95529a46b54e3a3357b28de2f67cfaaa17af8b237946871ed9fdc10f334a23fe0944190a5c7981e7e001ee104b9c6e0b6f1c57b2b
 EBUILD gtkdialog-0.8.3-r3.ebuild 994 BLAKE2B 53e7ad93fa84c2776552f11365411cf64d19a9329986501717dc4a824af23072f7acb39d1e8003eaaca714087ab39a028ee09213fe3d2792d67e551150e6c9b2 SHA512 aff4969b5d95b6a0a3a19cd37f41c8f7dd554a83fb3a0522fbedece6f1fdcfb37363f6887d2dfabb6ed3c239a72d2f7e152cf87827c9bbdebb3aba22facc1a82
-EBUILD gtkdialog-0.8.3_p20200202.ebuild 1020 BLAKE2B 4aa2b78907c9fa0c09174c279da06d3a029cb17a0de7eeefecb04665850a05a505b1e5136640ea8b8442f76d903efcf4e4aba0646254905b4cce528d1d2875cd SHA512 81ea7caabf698da80587b5814c2ad908c35636d1291d97f281ef1adb9fcd74d56663553c4e2011d5d8b065a8bfe7dbf65ce06916233128cc0214842bab45a2d4
-EBUILD gtkdialog-99999.ebuild 1015 BLAKE2B f1573ba5e470253ef5bdd2b279d9aacbbf63d3e45e96410f9370eecdb35ebeb412b817ef4be6dc494dfda2e6f60963150e0b8c366e54b7e2980fc46d010cdc2a SHA512 5d31e2026a186436166cf0eee9a322dec5b71e05807db275d7d736f03780c6df45f77af28d40ea12d89ce87e4bb3ca975f4e4186f72d13e0627a8879e513400f
+EBUILD gtkdialog-0.8.3_p20200202.ebuild 1080 BLAKE2B 1985d73e8711b8e7c68fd26db6a277fa99e2e65c910c3c0264b56ac843ae5fb54b04902af6f3fa944c42a9f5e7af09b9540ec9e7b0d5d97ae7d9e61ed53fe756 SHA512 bc7594710c9b1bc958f663d83170b93422bafad7e01dcfa135734b77d9d7f53f7eba125456ff94a191e5f10b8d676d77ba364f9fde3f36f5449e51faabef8f4a
+EBUILD gtkdialog-99999.ebuild 1075 BLAKE2B 6c9be3e8b4ed1685a87064c09eeb807cde325619b894301bfce4bc597c8ff796d0c4e5e63a157dc8edcdb89e4ae11e25848c7e98496ab2388b17279fbc822bfe SHA512 c50630ef940040e3dc766615a19c9ac5c9cb04924d5baea9679ce152f0913ae883845841d580b8183abf619aeff7bc24af1fff17a855d4d67d5abf0a3413696e
 MISC metadata.xml 1061 BLAKE2B 0befbe35090efdcd6567b30df2263e2e9de09921b98e78ac829705d5dd667c02074b0e45816be46919cd0a4fa7e97f8b16dd619f0449257b9038daed4a10dc56 SHA512 d58b989f9601950b77e9711ba86e127c7bbe7e770322fb02cf9db26742f43d6e7f80b40cf1f59f086a7c26d1453c78a5c4143e5bb99213819167b1c602f4c11c
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch
new file mode 100644
index 000000000000..21697cfc78f7
--- /dev/null
+++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch
@@ -0,0 +1,11 @@
+--- a/src/variables.c
++++ b/src/variables.c
+@@ -1113,7 +1113,7 @@
+ 		actual = root;
+ 
+ 	if (actual == NULL)
+-		return;
++		return 0;
+ 
+ 	if (actual->left != NULL)
+ 		n = do_variables_count_widgets(actual->left, n);
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
index 5c51b9d790bf..aaa806d08243 100644
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+	"${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
index 131519d09a46..bea5590a20b3 100644
--- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+	"${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index e2a402f8dfb8..e4b3a4fb5ec4 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,7 +1,9 @@
 AUX picom-7.5-no_opengl.patch 680 BLAKE2B d0d0e9cf752ac003bc312b736dd64388924b6a0371180da0aac7578a85b988c554c7d30a4e419b930775020b99480fed2c1fbd95868989c94ad9997727fdacfc SHA512 b15c5a471bf343667d3fbc14d16d04789eaadcb2cb906668f6235a085c3a91c2bf0e1f0822a5dc5bab5272ca7b1dd3de97087faa6916526ca49e703ae69772d1
 DIST picom-7.5.tar.gz 219456 BLAKE2B 54113547b575ad6aa1329e92ae331b7d49207fdcdc6b49d31d8ab125f7335730a7e53b260c6a6c33d5350bec1e9e6357fd34023dc7837de165289446f8f492b8 SHA512 6535e5eab1a243bbee62448bc48830b7ea3566f94b2c45d9ca76fd8b8056e1f00e55f0e4b58110364d2c4f56652cc005622d644c1db1db41d2811ecc19e6d44a
+DIST picom-8.1.tar.gz 242262 BLAKE2B 69583a7a188f62387f0784e33acfc3d84e6b7b1987f44f7634b1bd2244ae8e8763c2131a824f8ddd748558002a876cb359c656a93fcb55ad33a24cca2b7dc56e SHA512 d1d0428e5761db6820c775c07b966b5fec6a9e9d049ba9f555eb49721f855a018df7242ef61e29c0ea003644b20e1bb733ddf668053a8d4040240e98707fa4d3
 DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
 EBUILD picom-7.5-r1.ebuild 1335 BLAKE2B 09bd5c512559e6767258c7729d0756a5654f4eed20adb0d81d768a7ab546a828becbc73c861385cc15063658cb934614a57f12bc6ae1c5851aed2e1a2c0a8e87 SHA512 589200086b027dc00a743f8d30bba2d48e20480c8c2c2f7462aeb88668fef202211e891e7967d8d6e7baea23c00ea0df863a5806e6b5280375958f935a5c08a2
+EBUILD picom-8.1.ebuild 1423 BLAKE2B 982c38dcfab72f6b6c97168e785f88c2a5c74ac69909abb4d40beeec3442cadf8525b4279b026c5ec65a2e24b6cd796f38a0be279f2b814a174d6adc30f9a62b SHA512 ee99faa95b5510d6c3d6726eb8c07b2a7156b6a52d361e1796909ec3def0fb81578ae8b87acc4a277043b4e6d25c518a49582af9010007ffb81b345ad4e71994
 EBUILD picom-8.ebuild 1419 BLAKE2B a991549fde6f0bec57766fe29e7a0c15fe9277ec4c178b6697789bbb0d1f923e3e9c307161e2fc2557b4d8bcdc58d705325c018cf19f7518165fcddf21fede18 SHA512 3611ee43a9782ff7df23edab1a509450573daea133ff32c01c8149dbedf70a3ff6f3b49c73931a69aba2cd401ab1daf5217b603b4b9c8351ca01342f5c42af65
-EBUILD picom-9999.ebuild 1057 BLAKE2B e5d700777b0e76cbec5967e0149f61842c79de34372f861fe9ea0256d079aa20004a6f77eeba74655f9e63de8b24e9548816dae5a12648bf7fa0a8410da086fe SHA512 9e60499fcb059bbc8a846ca532daf07ba0cc02e7b56fbf956a5f52a3b84cd75e1049349be779f5ba31f87275ca6010a9df8f3f5fdbc0b45df4df0aef76613e4d
+EBUILD picom-9999.ebuild 1056 BLAKE2B 658917c293650ee1b6a44c61fe5ee5704221c8bd36881c289dbd503a13c2b4b6b70c6324b88027b486b2cdd9f4d6414558e1825fc2e3c45a7312669c9b724d72 SHA512 88b6b3d7fabd2baaef316d301663bfb61a7b8ba0d131fb6235d6bd294c3bed28fa61178d32b829e38d9faec09e7984b73e02952c2d9c4aed9f31248299f80cde
 MISC metadata.xml 677 BLAKE2B 3d9d1ca23a81c30ac451c45ecad35c3cfbc63ea0a1d5c2cfed587990b33158ca8b3c188fe611aa51b77d2c66a270f8cc95ea5f38cb6270bd1ebf92411cb8ba8f SHA512 9a77cc79578426ae9e1e89e471d4368ef662f3bff757015d4cb48f08e2cbec446753ad16233bafde8ae1c61da0ec1bbd8539534c6097c7525c5905532c8cc9a5
diff --git a/x11-misc/picom/picom-8.1.ebuild b/x11-misc/picom/picom-8.1.ebuild
new file mode 100644
index 000000000000..993b85a8ab0f
--- /dev/null
+++ b/x11-misc/picom/picom-8.1.ebuild
@@ -0,0 +1,60 @@
+# 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 meson python-any-r1 virtualx xdg
+
+DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
+HOMEPAGE="https://github.com/yshui/picom"
+SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+config-file dbus +doc +drm opengl pcre test"
+
+REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
+RESTRICT="test" # but tests require dbus_next
+
+RDEPEND="
+	dev-libs/libev
+	dev-libs/uthash
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/pixman
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-renderutil
+	config-file? (
+		dev-libs/libconfig
+		dev-libs/libxdg-basedir
+	)
+	dbus? ( sys-apps/dbus )
+	drm? ( x11-libs/libdrm )
+	opengl? ( virtual/opengl )
+	pcre? ( dev-libs/libpcre )
+	!x11-misc/compton"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-text/asciidoc )
+	test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use config-file config_file)
+		$(meson_use dbus)
+		$(meson_use doc with_docs)
+		$(meson_use opengl)
+		$(meson_use pcre regex)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	virtx "${S}/tests/run_tests.sh" "${BUILD_DIR}/src/${PN}"
+}
diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
index 34d4a6e2fb59..8d71941fd1a6 100644
--- a/x11-misc/picom/picom-9999.ebuild
+++ b/x11-misc/picom/picom-9999.ebuild
@@ -46,5 +46,4 @@ src_configure() {
 	)
 
 	meson_src_configure
-
 }
diff --git a/x11-misc/qcomicbook/Manifest b/x11-misc/qcomicbook/Manifest
index 5dfec98f729f..d1fe86a715c5 100644
--- a/x11-misc/qcomicbook/Manifest
+++ b/x11-misc/qcomicbook/Manifest
@@ -1,3 +1,3 @@
 DIST qcomicbook-0.9.1.tar.gz 739887 BLAKE2B c4072e849f173bc6014e1765adc18ac359e5508b5c6bb110782bb92c81fe7683911a68910976cba16263950d9ac9b9ad53de44c4cd692d0bd24374c38012ebbe SHA512 87bd983c4442e220f1bc463e54e0ea583cddbc6becd9eec64801dc5e7e061cdac5805cba83167685ab454e41fcce329fa399d622d7f588940bf057ce4b1f423d
-EBUILD qcomicbook-0.9.1.ebuild 1622 BLAKE2B f01a5f9074f03a7f054ff41cbdbe20ecef2e5c9ef4e944ca866ed5691abdfa61fdafd947a060d8c3e74899e5a142e8be26823a25d1a78ade001ce14d8f3f15ab SHA512 70d53b1c9b18a11be6ad20441a6354d124986abe24b273bfd1cae5202d57727fe39c6b96e328338a3b980f1a5c75f92f015e35a8c5cce7849ec26c12098d5bdc
+EBUILD qcomicbook-0.9.1.ebuild 1644 BLAKE2B a1bae2b0284d9268c625c1911d7cd3dc57a27af8b1cf0829591d5a8979fd5d986e649649ac846237bcbb177a9d0ffbe5b38c14c3086ef4958699d2f9292f3e5e SHA512 2681ca210738433495d5d0934aaa7b80d532e5e5093b66ec8a7ddc092fc794b94164948cbe66f5bd912ccf355d2e9c5f8808faaaa1d2a24373bb70a22d8134be
 MISC metadata.xml 469 BLAKE2B 09213bed780c0d2f966fb7ba16c052ad397999be2e6e238c8e915ebbbb938f3210409e2d7961c629ae0d8abb20efa99b2b833d2cd268e7239ead845294b8fc68 SHA512 4c8f85cb1afed375e4b2c19e873c2c70ca7c11f139305af70a2b8556230ddd17f52753b1302c8d5547b4922e35c1922fdc001e62b420645f1c36097ebf5e855b
diff --git a/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild b/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
index aaa44f685145..ec3dbfe2f756 100644
--- a/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
+++ b/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="QComicBook"
 CMAKE_IN_SOURCE_BUILD=1
 PLOCALES="cs_CZ de_DE es_ES fi_FI fr_CA fr_FR it_IT ko_KR nl_NL pl_PL pt_BR ru_RU uk_UA zh_CN"
-inherit cmake-utils flag-o-matic l10n
+inherit cmake-utils flag-o-matic l10n xdg
 
 DESCRIPTION="A viewer for comic book archives containing jpeg/png images"
 HOMEPAGE="https://github.com/stolowski/QComicBook"
@@ -55,6 +55,7 @@ src_configure() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
 	elog "For using QComicBook with compressed archives you may want to install:"
 	elog "    app-arch/p7zip"
 	elog "    app-arch/unace"
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 5c1327893442..bd2924284733 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,5 +1,3 @@
-DIST qt5ct-1.0.tar.bz2 73360 BLAKE2B a2a37534434102f08d0f225017c5b835bc22ac2d86592505d4dcc8823a8ed34fd54085a581e86e83ecaec04141e90f4c6e87b9aaed027b68e29ed9a773108263 SHA512 f650362c90782128e1b3ddb61e73d0295bc5b108a75c8a10d085ce9df7dc0926ac40baf80705136b39cc779212fc97e121757c440f2728aab12b761caace78b2
 DIST qt5ct-1.1.tar.bz2 79890 BLAKE2B e816d76ea35b2133891ccf63be47a227d95dc9783b6f2ac18ee7a7c67bae545fbdc7109103e63c18f093458942ae0b9bab3d1847c40abea9761ab0c314de6357 SHA512 0df00c0680aefb0eada1ddb70886fd63641c403ab42843f8d209413a56895dce0a88eb88a98d09d23a30df3b15ca1d595237592958769a1be86719f2a16cbdf7
-EBUILD qt5ct-1.0.ebuild 1043 BLAKE2B f204afa68a682ca0ccb96d938dedc9f3bfe80a5f6d362411d356aff92db2b6e378cbae79c8c8597cad07e7916b9fdac1d0081e7d1524fce7018cf813ddc70ac3 SHA512 dcdbe854ab9834d3019cae1a640a4cb43aa1112c4c91bca9135e541983a1d737bf65cbc235f7089fe037e86d31b953ef3f70bc2d6804a5d6b8d009000d15e0c2
-EBUILD qt5ct-1.1.ebuild 1045 BLAKE2B 655e8453f4c44b92801ef5733f5e674477cc3ac0628bf60b81e4cfeca0da693db938cf48721f1fd8a73f4047b57d92762bb55cbed4cd0e5bb804b2f2ce59878d SHA512 5d0b741947b904423f126d9752c999cf6c9683a82360b10c8cc3cc0ec79ec4b2c49ae4c4531bff378952932973bf835aaa41abe0d17d946d9e5c4e564b8a2e86
+EBUILD qt5ct-1.1.ebuild 1043 BLAKE2B f204afa68a682ca0ccb96d938dedc9f3bfe80a5f6d362411d356aff92db2b6e378cbae79c8c8597cad07e7916b9fdac1d0081e7d1524fce7018cf813ddc70ac3 SHA512 dcdbe854ab9834d3019cae1a640a4cb43aa1112c4c91bca9135e541983a1d737bf65cbc235f7089fe037e86d31b953ef3f70bc2d6804a5d6b8d009000d15e0c2
 MISC metadata.xml 566 BLAKE2B dbb30222ccd1079489ce54e50d5d4ce9a3b9e9acf38d4cc30a402f81418685a3cf86f1adae23d85a409f9866ca11ec1321e543e14bd37ed13a45d02a32accc15 SHA512 d40c24dd0cc2d0b2c79251cf1fb2540dbec484653817469198f4ad7e41164a8c518442c5d11764f0c8aa53bd7ae9758629acc7ba4a4c9f2a374af13cbdaf67c1
diff --git a/x11-misc/qt5ct/qt5ct-1.0.ebuild b/x11-misc/qt5ct/qt5ct-1.0.ebuild
deleted file mode 100644
index 5ec0690f1e18..000000000000
--- a/x11-misc/qt5ct/qt5ct-1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
-HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
-SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+dbus"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5[dbus]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	eqmake5 DISABLE_DBUS=$(usex dbus 0 1)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		ewarn "qt5ct configuration won't be applied to the currently running sessions."
-		ewarn "Please relogin."
-	fi
-	if ! has_version 'dev-qt/qtsvg:5'; then
-		elog
-		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
-		elog
-	fi
-}
diff --git a/x11-misc/qt5ct/qt5ct-1.1.ebuild b/x11-misc/qt5ct/qt5ct-1.1.ebuild
index 976ddce58235..5ec0690f1e18 100644
--- a/x11-misc/qt5ct/qt5ct-1.1.ebuild
+++ b/x11-misc/qt5ct/qt5ct-1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+dbus"
 
 RDEPEND="
diff --git a/x11-misc/svkbd/Manifest b/x11-misc/svkbd/Manifest
index b694f1dacf19..bb7ca68ab8a8 100644
--- a/x11-misc/svkbd/Manifest
+++ b/x11-misc/svkbd/Manifest
@@ -1,3 +1,5 @@
+DIST svkbd-0.2.1.tar.gz 19476 BLAKE2B 8bb33195f82e0ce6c348d0526d8c07d75bbb44f96c133b44020037e312b04197b449cb2dbe586d0e7cd0dca022da1847cc472122a16b764787b46f4d14419b0d SHA512 c6b6f8e4cff4c8aa4ab5cc9369bacbfa226bee3cf7008351d9873a33a59751106b8cd21242c9d13ce463e68968a920459162bbd73173928acf68c067ac81e736
 DIST svkbd-0.2.tar.gz 19470 BLAKE2B 3b97cfe37439474a31f382f86706b47effab82a1ef5ba0a278e0e7241b304b2cd096c01d88a60fc8ed2c25fb4c019b3fbe18645378b4508f339e69739381f22f SHA512 320f212c21163bd143e468bc541f79bc290e695704db1f7912112b07e673b6cde9766768c1e153a88962a8385ff9ac6cb78c2da5ca8ffb1b57be5eac26d46553
+EBUILD svkbd-0.2.1.ebuild 886 BLAKE2B 0dc2d2e8165b9eeed559e01c33996583a5761c925e509f4566845c409c26bd06a605989fa6ee304787a8ce49419414e47a241601444bff649343d27c3cc30ffd SHA512 6cddd2d5278cd22f520bc5a390dd155ac5ef5f9e67cfd4d20b88f41246bf833068853d6d4b1198594eefae82e864e3a101440bd50f4af89b81ed2641d4069d7e
 EBUILD svkbd-0.2.ebuild 870 BLAKE2B 87e2cbf849bd5a8b2ed5a3c77e7303486747e475f87541cbb5990685b6f1be4250de473cc50210ab97d15496d90baf7f685455b28ef06ba36f45b6f0fbb31fb2 SHA512 5659c665a88fe7ea5aa72cc81470516e3ba3b3322cd36597a1a520ead73d5e7f794500643fb7491b3fb603a237af0af9787dd0f58795ec858faf0ed250169de3
 MISC metadata.xml 220 BLAKE2B 11299b6e9582bb55f5decff226d1917da6e8d665c1ff3f95a035963a51f1ab529c28963908fda5a64b9ba0e0b608b354a36d605ef5826cf1698937316c8b4932 SHA512 8e96ee3f78ee96ef4b61c89b6c82a43f03d0a96dcd3af136fbabd1cd2635a27d98d9ffdbe9a87d9fda9b0feca21c7d223cdbd89d35b1a096e7fe3655a9621607
diff --git a/x11-misc/svkbd/svkbd-0.2.1.ebuild b/x11-misc/svkbd/svkbd-0.2.1.ebuild
new file mode 100644
index 000000000000..bf864ebe3875
--- /dev/null
+++ b/x11-misc/svkbd/svkbd-0.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Simple Virtual Keyboard"
+HOMEPAGE="https://tools.suckless.org/x/svkbd/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXtst
+"
+DEPEND="
+	${DEPEND}
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+
+	restore_config config.def.h
+
+	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
+}
+
+src_compile() {
+	for i in layout*.h; do
+		i=${i/layout.}; i=${i/.h}
+		emake \
+			CC="$(tc-getCC)" \
+			PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+			LAYOUT=${i}
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	dobin ${PN}-*
+
+	doman ${PN}.1
+
+	save_config config.def.h
+}
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
index 58cb19aeec19..af673de77904 100644
--- a/x11-misc/xfractint/Manifest
+++ b/x11-misc/xfractint/Manifest
@@ -4,5 +4,5 @@ AUX xfractint.envd 63 BLAKE2B 1622655f8b51034a4f3e7c9d7b11fd7628a33b30a17df15b6a
 DIST xfractint-20.04p14.tar.gz 1336285 BLAKE2B 946c34551acf131845f1ecf17d4fe82214535627e8ea68d704efcff4b93c525d82f004bde8ae1bac11df8c82caa3bcff4778b2f8dfed1bdb494ba036e62256c5 SHA512 7d13c719f4f4b0680455b9b7f86644928d8145606973d208e5bf0d26b4f7b04ddbf8d2080ea35c872b21e079f1a116f3ef94e9acb36a45d43c16403c473e2acd
 DIST xfractint-20.04p16.tar.gz 1356976 BLAKE2B 2cb05021c76d9761bf7020a2b9a0fbf7d682a620d931b7841ce75780c1a3aabb6bbbd1b2e378fba3e96b2cfdaf845ff9cdafcf3219ee756fe7d128a19b342132 SHA512 6696daf21c2927d87f58f7d7136c5d51bd8c60d78e901d537f1ef38f27b70c42a590b05c663363c49a8cb30d7013a969813e7bbe4a97f49b9c286497b440bdf1
 EBUILD xfractint-20.04_p14.ebuild 1046 BLAKE2B 41ae48fe45aeef7169d01d2ae52f5484655ec45ba8f7a284466b6cbacb96bff08322fe4c4f0669dbb888221866d6947f81b50c56a6f98175b3970db0e5930db3 SHA512 bbb5ecc9db4ef63e664aa99a7d6ab242ad74c3f0ae57d3e52efd7bf7232fbe9bef8b6aff43393cb3e5ff25e711950effc86c817da9d6b69e513a908d1cc343cb
-EBUILD xfractint-20.04_p16.ebuild 672 BLAKE2B 74f8934a09b6de29d961d240f07130923f881bef6acb23b37c344810b6d463a4b60ceeb47d5f3a5e482f542866451259a814769a007b9595327fd00ea5a5e868 SHA512 2015996be5d109eb6cafd9c64f3e5dbde8057be1bbcca104e4636a187e72e328c43766a037f07b822c214ca1ed573c1ab0d7aece95f15e618ecfad7d7c886948
+EBUILD xfractint-20.04_p16.ebuild 671 BLAKE2B 537cf58481f902508d41458a71295c1c0fc44e7ed4d9c81343c7201a9a22e5280105bc6b39d6e02b4addee97c52c3713baa9e1020957a52e351d23015126e196 SHA512 0327cd8a0e1983ba9a2b176455e7d52c2a49d727cba1cb065aaedf2fa8445c3f95946b30e7b71b965b7c939b29d5b9a8b303526ca10e8210349f0834c2ac4735
 MISC metadata.xml 366 BLAKE2B 5cfc7ce6a7f5e6d02ad5f78d0e9d177c346b498b679f5623cf7d2321021a3d0289fe30c1b2360cec5903409627898de04fec3d2a7c26ea875f8e891685158549 SHA512 d602f03153bd9f03c962a47d7b10c829e2bdbde64cb5e67bfb4fb7c8755eb87784139ae1e1b287d6dd5c99d2f7a96f7c04f67fede847095116385db7cced5f2e
diff --git a/x11-misc/xfractint/xfractint-20.04_p16.ebuild b/x11-misc/xfractint/xfractint-20.04_p16.ebuild
index 191369ee591a..0e7b98b42567 100644
--- a/x11-misc/xfractint/xfractint-20.04_p16.ebuild
+++ b/x11-misc/xfractint/xfractint-20.04_p16.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="free-noncomm HPND public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 36f19f72f94b..f8a497be6a62 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -8,10 +8,14 @@ DIST xlockmore-5.63.tar.xz 1944624 BLAKE2B 8ee27c5cc88a7088705b7a017563698fa4bf9
 DIST xlockmore-5.64.tar.xz 1944496 BLAKE2B 1b2c0337950bcf7ba094012c70c6c8578523b81a6af6dd68a0373425f87d7da28a770a8f7453019cc1527501a417390f013f43b3da2ddfc7d44380c512f9b4c9 SHA512 4946e8e9f895c0433c09e1cd639389d26020a764d62b08b329ce5d9e5de4bb6438f024639b2068c94f21cb0ebb5a6f94dffff6f606c6c3e2372a5102768e7f39
 DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
 DIST xlockmore-5.66ALPHA00.tar.xz 1944644 BLAKE2B 0b52cc3a5cb77645174084eec3e81838e96a4b5e849955e9090efabb62cb38f477ae3a23664b4dc27bb8b79af62d946b4702244bc3b601ede7097f60de6b0fbd SHA512 7216fc3b034c382ab02d06e22a9e572e3602e4745b2a055a8ee51f6a4c014776ea27b665fe7638719303b9bea3f957a27e1da47e15d5de44c3717136dae82ee2
+DIST xlockmore-5.66ALPHA04.tar.xz 1946880 BLAKE2B a02290052459df4424cca7205a932de603733176323331024514a61682e581706a66a5591f57e6a041eb0e725cbcf04d9641a9d59be4bfbea88d77605973a58b SHA512 2a2b59e733ade48810e85ac0fc58ae2433035db9bfc1653e73359d921a425d7d67156588ce1c428ef756b1604125a151221f64c719c4da20dc0de83fb4d2bc23
+DIST xlockmore-5.66ALPHA05.tar.xz 1945728 BLAKE2B df0d5a8b0122673204c30f416c4bb599476340f0a0a4a80e08efe42c77a5dfa2408d74375dfcf2d68740d0b2c0147faff8ee01fe96e106eeed14fc779bcb3344 SHA512 259a8b2b0e7f487e5bb025a8a6961c38933ae259b3544c66823e09ea2f0fc44e19155bd335870adca653c268dc4811d41570882b021977e4981f0ded36ce3909
 EBUILD xlockmore-5.50.ebuild 2231 BLAKE2B 3accf80283ec7705cfafe4531bc38c1694d9d27381c9aa375bb14a1d59e865dd1c2aa8c99d1cdd26a93fe929b3302ca4646fe93f740feb56c86b70ca9362ed6c SHA512 f0116108dcbae364e4a7c391054890fca090fc182b8bd11c613e84bc91ccb07904e5bd14c515b934e2895c9e6bd2f82762d09719de4e648f6077338e3f05ff97
 EBUILD xlockmore-5.62.ebuild 2290 BLAKE2B 684053c5ea68511e810fdddff942f61ad18ffcdffa32a1b6eb68ed4269def2d03b82a70b75c3e37500615c5816077a49944b93858a53b9e07b8eba27c68bcba0 SHA512 e7818da25a25f015a06aec1f8096a3394981bc4c68a73f7a6a178fff6e278a91f088b02423eaf937aea0d9e33b5115973f23e714e78b12ae5458977012efb22f
 EBUILD xlockmore-5.63.ebuild 2284 BLAKE2B 5dfca5003f797a6765b33f14a91664b40559441812611677f392b2291a7e29297c254fb29ec3ea895df6e903f98e5926215b74d2ea0b342527da35eb045cc2f0 SHA512 0ec91c240df64f0a3e6c3c0aa7fbf35bdb889cb4d4cc76825223802cf3dd807067f228980838e1d813214f20ba8269d1cc9df96548dc14d2dca4b2d8ee102671
 EBUILD xlockmore-5.64.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
 EBUILD xlockmore-5.65.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
 EBUILD xlockmore-5.66_alpha00.ebuild 2480 BLAKE2B db28c6af68b0fa419e001dc54dec91d6f5856c5cf2159c1764809f0780fee5a6155a06438880e4a20d2c457332295a7d0830c0e5792bd43f321d901c90b07eef SHA512 4e4bc7c9867f24c9066371c2838ce9e960394717a72fa9b532f4b98ee0e7ad40bd1902669cc1f76c3a5f16742d1b283d5cd0d0722ad6eda30c09aba7efb87b7b
+EBUILD xlockmore-5.66_alpha04.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
+EBUILD xlockmore-5.66_alpha05.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha04.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha04.ebuild
new file mode 100644
index 000000000000..2bb52c63b8ed
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha04.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( sys-libs/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+	"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/XLOCKLIBPATHS="-L/d' \
+		-e '/XMLOCKLIBPATHS="-L/d' \
+		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-cppflags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha05.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha05.ebuild
new file mode 100644
index 000000000000..2bb52c63b8ed
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha05.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( sys-libs/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+	"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/XLOCKLIBPATHS="-L/d' \
+		-e '/XMLOCKLIBPATHS="-L/d' \
+		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-cppflags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}
diff --git a/x11-misc/xsensors/Manifest b/x11-misc/xsensors/Manifest
index 250a5f509600..b2be46cf4261 100644
--- a/x11-misc/xsensors/Manifest
+++ b/x11-misc/xsensors/Manifest
@@ -4,5 +4,5 @@ AUX xsensors-0.80-gtk220.patch 1205 BLAKE2B ae7b2d77ae0083ec60971f2b56b5d0a67ed6
 DIST xsensors-0.70.tar.gz 115430 BLAKE2B af18fa723a9e6b84df62d0ea0397d7b30ab800816b84449f91357aa75d99944796ae8164171bd217118dd93ef713d286fe435354614baef7947f3f851b368df9 SHA512 34f038b192f3cecb2e7587e19c4837b795a2705e6d0e9ea2bd3ead6d3259a1dded364fcfc70fa5e37d64f32c879e1dd9c6e43dcf32fa9aeb73ee5cc49bf290a4
 DIST xsensors-0.80.tar.gz 214763 BLAKE2B 7be4c0ef0f59e7c8c8b32b7e132acb906c9ab64e6e0f63a3316691eef8dd2f8b659d4e40d2213cf580cc4874bcba2fefad4f6a759bf349e18ebef12a99c91128 SHA512 e1ac7107b978bf9b392b0ecb13e49f49c8efebb228a9c6781a519b128f467d0346d35632646f20a036fdc34ea3ee86440c7be5a3285d922f8afbf051e9cfdcc8
 EBUILD xsensors-0.70-r1.ebuild 696 BLAKE2B f8301d03329e2339b23679b11bd6a0752e1b30bb67da54b54caba8089893d07f3ff09081a455fbc9aca70734e62a0e76c0776cfb7dfde4079027ae2f41f3e3e0 SHA512 eeead03d0ca6b8216097301b7af41b655a2d081fc8e32c91d25c0d3fdaa6ef20db5e293b1ddc618f5ee4c474ae3f26087da6f420e431dadf7a5793fa44ef00f5
-EBUILD xsensors-0.80.ebuild 750 BLAKE2B 2d433a5fa6d4e4aaeaae36e7034425798c7b6cab9be1dc6809c796c3599a699c649935f96f0c53a4b7098859188866deb84fc41ed9dbcb14c84d47ee34b19d46 SHA512 b272acbd41d732f00fb7ca33d3660c471c0599ca531c7305b13ddce074909d1809dee7f0df17efddd8e742d25006097fba938d5053e8d6bb322af8f11922b0e2
+EBUILD xsensors-0.80.ebuild 754 BLAKE2B 7c879799e61d4f74161679eb8456e5aa78434c5f45f3971a659ca6cd99d8343b0e53d17c8c2377e8a8f89cc5342489d6d6021cb7c4801d51c05e89aee0ced33b SHA512 f86ddf38ec70b361a4a21c5ec3c0fec5cb24d272fd68b2cb2c53cafbbccdc6a77aee8e2932caf735031c791ab02dd1d62042b7ce0e80539b22ac5dfebface8ae
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsensors/xsensors-0.80.ebuild b/x11-misc/xsensors/xsensors-0.80.ebuild
index 43258aef8b99..6ae9a5fc3e68 100644
--- a/x11-misc/xsensors/xsensors-0.80.ebuild
+++ b/x11-misc/xsensors/xsensors-0.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools
+inherit autotools xdg
 
 DESCRIPTION="A hardware health information viewer, interface to lm-sensors"
 HOMEPAGE="https://github.com/Mystro256/xsensors/"