Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

25 files changed, 70 insertions, 60 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 83d04c833270..5dcdb8b5a7de 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest
index ff2e714b2420..b7d92c87ea24 100644
--- a/x11-misc/grsync/Manifest
+++ b/x11-misc/grsync/Manifest
@@ -1,3 +1,3 @@
 DIST grsync-1.2.6.tar.gz 333540 BLAKE2B 20719580309aba5737b74e85629b21b9715ceb8d97bd00d1840a5eda0e04316439d90999b7b787cdf8b368fff90ba489dcfc3b91992dd599f7ae05f4a565f1e7 SHA512 a7aac0cf264c968d50896156730dc0b925045def6e513adf1f2783e19fd1cdd423aa69480963479b95927fb4e863f110f3fc0439661ef7cfcacc7376fe95ff1d
-EBUILD grsync-1.2.6.ebuild 496 BLAKE2B ce9eef255c3e3212ac54f12253264633b48a8f4b103dd35a14d3b94786e3ed7e3d708146a36127c95cc0a19422c083a15de6ad6109cd9600884a3f9119b6fc18 SHA512 de5e2c0f10f9ad3d812c6d2159bdc88f95c54c5edbb8b5988c73a2e617778d6c1bb22bb2adee79fa995485760a46a85f6710ca3d132875dfe2c097b0d7e45886
+EBUILD grsync-1.2.6.ebuild 498 BLAKE2B 3ed19359d70b48cdc85befe8569b7a1b1b4336131c3b6a2d18d9c6ad221d257a5c414117c58c75a99bebc1fc20dd9d8a244df5b2f516825e39836cee9b39a2c9 SHA512 df1a619c1722547c956fd79a4490f13cb4e6aaedea6e2ff054f22bc419ee93dc5bb05cd7d68b8328f8899758ac066a1f53fa2b50ebee8acd77246f111a1759b7
 MISC metadata.xml 258 BLAKE2B 46e283e28202f000bdb3b2b01ac3b3e4aa25a42715e1940135cdcef61181c745865042fe44a908a5d3e83308f7f98f0eff2b8519c0a4691e3bf5637799de420e SHA512 9909d39f5a2a4d3c92d1c105ea5250603f505e9fbb0ff433c25290ac5c2b53f00d96fe8dc0a98bec2240298b3b7060503f59caf04cb47484a63e4057bcce82c6
diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild
index a799b0ffda98..3476502ec396 100644
--- a/x11-misc/grsync/grsync-1.2.6.ebuild
+++ b/x11-misc/grsync/grsync-1.2.6.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A gtk frontend to rsync"
 HOMEPAGE="http://www.opbyte.it/grsync/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""
 SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
 
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index 4f839f50c625..03973465d30e 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-default-sysconfdir.patch 373 BLAKE2B 4483b6c4e838559997acff86c46a879206decc0e834bd92cf8573eab28f5ce3ec74f186ce53fe3e2a69f8e7006265ce956f677470828f8b3e1bc40b5ab925abe SHA512 db974877a1eadb1b37279dd4e4159b47947958f688aed94dd3e3c49457a94a0e5d803f221dc7a160ed2cfdc915399892d010a1083a49a7ba7a53d49572c16554
 DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578
-EBUILD i3blocks-1.4-r1.ebuild 772 BLAKE2B 20d48a2f984aade294280830ede7f6cdfe79b86b34cd269762896827648af0c5cc3e848ab9607bf140ba1600b5c5c324f4d50ffa4bbd931aebbaa67ea49480c0 SHA512 518be7c571700a5f1a10c7f19e79c66747adefa54535eb7a884a31a15cb61c41051fb9f7c9b31a327bfe05bb0817beabb837df6eead4bb71b1f22a3a73681a78
+EBUILD i3blocks-1.4-r1.ebuild 772 BLAKE2B 95b265f0688bfe391f387915d9c97a03e24108c43962927f7673ce517290b01217d96db7bf54d400956343cb552d188385b36e8116ed9d99d1288b3d3f4c3203 SHA512 b062e292ad61e9060bcf5255344ced864190f0c355580467e633baa47681766fedc967959ec68ddda8f83b8b111cd13543184c483d8ead2a558082752f220fe1
 MISC metadata.xml 331 BLAKE2B 4e906b5d485968ff9cc55dca82cbd704cc57a5ecf77c230bb7fd6e2a910c236bc0afa1d457f4b90b758ca5ecba0b2505512fc21f7dd12179d2b275d425430a14 SHA512 2191950260e909fd05a03d80a1f9ccde802e4e3ab890a2e05305f2e3e1c48e4c56200fddc9019b630a9efeaeac92509910e1f9b22f1a2ce85a8d005930cd05af
diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
index 165a389c483e..e481e6cfda3b 100644
--- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-3"
 
 RDEPEND="app-admin/sysstat
 	media-sound/playerctl
-	sys-apps/lm-sensors
+	sys-apps/lm_sensors
 	sys-power/acpi
 	|| ( x11-wm/i3 x11-wm/i3-gaps )"
 
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index c2576118db18..2a16542f3b47 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,3 +1,3 @@
 DIST obconf-qt-0.14.1.tar.xz 97032 BLAKE2B 8bfe93325d37bdcca40b38f99f635cddf39ad1781e694f002676f6ff6fd0d6c708908ca458a051f63509f572b247b4de5778a1451e763c4372038ef99a1594d7 SHA512 7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed
-EBUILD obconf-qt-0.14.1.ebuild 904 BLAKE2B 7e3123553f5345d7872a41d975a7dc1c2fb5135b93e925574427d65162ade6c0fc3d9492c7d661d8dec20230cb9ae0e7234b6f3cf492f95b8c8631cf51bc19bf SHA512 de4040bc6ba5e72d7ec639d35cc116d7d4376db8b6e33214a8ae9263131163bc0096404a991d864449568f9061c01ea48ca9659e9c524530acd615d5c9ea7e36
+EBUILD obconf-qt-0.14.1.ebuild 897 BLAKE2B abc3c5c4068221a95161ffe51178b32baece88769aa979cb719e966922e04089dd229b11afd48f9cd08a6a6a0b240c28ae25e66ed13048abb02178574fa796f0 SHA512 ff86b7a9f2e3f924961461c959d9532e036f95c3d496ea00689173c754286e01defc784186bf1cbaa77c08aace6925b67687bf345dae0f2dad472c45cbe951c3
 MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
index 11fa1f32bb9a..f67003d63b24 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index ab22c8845851..1da7b38d798e 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,3 +1,5 @@
+DIST obmenu-generator-0.66.tar.gz 19352 BLAKE2B e08591922c18b79f895f3080bd494287c227672603dcd224241c87295b3ace891f4e5419306d7065d7374d845ced06d109903382bd3a656348874c943d94b723 SHA512 75da0f62f591f9a9678d93560826829c0555ba5de3359be90c2cb16c4b8d07a9f10cbbd53f4a08cf93f75d6df8cb68381fb9a975cdb8500bed4ec7b51615e287
 DIST obmenu-generator-0.85.tar.gz 20558 BLAKE2B 526657eb9fc7ed0adc3681809d0f8b763f5faf7b2cb578962e1c2ab2e2bd488f386bcd6e7bf45e5752a2d339048af37f05bf31ef3947c2a9642f15e99db00eac SHA512 d6925ec8c2b75eec12bc23840799cedf4b882787b62a6b8814ca6c8b3bc5d22d2b8a4510fa6829d66541923caf3163a85eefc068a96ead631a3200467c563545
+EBUILD obmenu-generator-0.66.ebuild 577 BLAKE2B 306c1e1c5193bd2312ed88b8e3828b505aceee689e5a18231d3d5862bf9ab9a17c780d5fcf643dce119b82286bfc79c9bbb7e123a47071476b58f54c5d9111e5 SHA512 2548ce8d28ef16a95c257fb9a886affa9a3c0f067827d386263da831ec4c16818b0bc61717747946fdca08b4de9fcc35b7ba5128c872a6b82901c507b1bb3f6a
 EBUILD obmenu-generator-0.85.ebuild 559 BLAKE2B 94563f4460da98eb4bb7fcce5e2b79a6dca8567009dd965e34a168d913e593ce74f2483106c418c2529cee3ac2015f77de77287eefa0438ddb3c7f32c892b913 SHA512 d37cd81fa57d761a3481c445ec868f8286f9903f111cbac4ad72fe9cf9d6d554ae921761794bb5f95abeec9e60825f0780e4249c88b92fb19482f738ce875976
 MISC metadata.xml 366 BLAKE2B b86e2366a6df0199a2fc48e10a6aea3f0d2c12a60013adb4f1308b18a082e90f0b21a28fa539f36eb8fd575c7f645e5b53422c8d553810cdb82a626593dbbd5c SHA512 7bb0e3571b601e324a4634f33eae29592d3a76d9636d3dbfa6bf2e486386672d6c1cac041e95028b76ff107877fba18f66fbbeef8eb72ab9348de97d6e91853b
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.66.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.66.ebuild
new file mode 100644
index 000000000000..23597f915649
--- /dev/null
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.66.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
+HOMEPAGE="http://trizen.go.ro/"
+SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Data-Dump
+	>=dev-perl/Linux-DesktopFiles-0.90.0
+	x11-wm/openbox
+"
+
+src_install() {
+	dobin ${PN}
+	insinto /etc/xdg/obmenu-generator
+	doins schema.pl
+	newdoc README.md README
+}
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 9cca61b1f3ad..0c9a6e6585b1 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -9,5 +9,5 @@ AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f5
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
-EBUILD sddm-0.18.1-r1.ebuild 3115 BLAKE2B 28a915bba1937f1c58e11c3ab5e9e815a3a0a1b60d84b02def057a7c1fd391d3047f16223b7382386738d101abd7269758cb8dfb05375b5bf7089d46bd3be115 SHA512 5e2bb8279b1ff7ff392c6a0a10251beedb57f0ca204cc182fe6221452f7ff93e72ba26cd65664f2c91b8814aedb5746ade2a655c1a947214ff790e90fc3ff3d6
+EBUILD sddm-0.18.1-r1.ebuild 3108 BLAKE2B 61985293fae70ae9c621c4dd793180055ffdc7cc4aae72075e35ed01bb4ad8e8b4749c9ce870ba9570d0198d64f536feb86a898b440323e88a4db7c842ce75ec SHA512 a8a4b891dffa14bb276f46c724ffd74b422ced67becadbd7d1fbab5ab4d96f7b0caeb287fc81e9c0f35a7fa601906edbefb5a670285f369220a194fc34458c5a
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index 6aa05f682d1f..2f50d0f57a00 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="consolekit elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 79038e83bd07..e76a2209d4e6 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,4 +1,3 @@
 DIST vdpauinfo-1.0.tar.gz 88567 BLAKE2B 6f0834bf6a8fb83204b70858ac529010ab69c55de4b2c6b8b8864ea33aed385bb9125ad12a82a28086dac43f39f06c2b757718142d800b5de2263513e9c5f02e SHA512 54c177424bdae65374a13c0546ecda0e25e7357f9e779fb48dc018a9c11593039f87715ea18b320684dca22455df9b41a4eea6b0f977956efb6ab85b8b99297e
 EBUILD vdpauinfo-1.0.ebuild 468 BLAKE2B c05da34e957445e60eb712db339defb72093fd0ce39fcb56c93dee9d67002d9d57507da439e54aed3fb9b89db7f8555fb9e67e63e90aa940a6bbcb8ea84f0d88 SHA512 5e6c58eb2a50a1a7040ed6355016730443dcfddb3a76da8efb38e235974466fa31d8fcbfb12cfc9f9fff7fe175a7651cadc8df3a44a01aaf8cfe71ef936e5bdf
-EBUILD vdpauinfo-99999.ebuild 515 BLAKE2B c350d4c00d47de2ee887f1f2054afc61c3952740f08b6d8bbd366f61181868d462528c8e05120820232f12cb38a6336dcd622cbb59021aee22260e2664ad18bd SHA512 0f638788bf19f242501804988f27118cf49cd5aba4b219f01013f2f7d414a6031dc9079d524c6343421120de41c0ec406c0468dd599f9510ddf7d4beef2c14ba
-MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
+MISC metadata.xml 247 BLAKE2B ff88597c9ef60254f0818903a632dc7b1e85ca9193202e9001308c597430343283a13ba66f6b32e838bb904207e30d440f1bb95d65c0d663b58e1e6288e708d6 SHA512 e0b9dd88835de51f48aa42521b6540a1f2c7c7b4c419875eda099049cd0793352ced1717851e190a13fc10d2572963e10ccc3a8bae97a8b22190f9c3ab4401e6
diff --git a/x11-misc/vdpauinfo/metadata.xml b/x11-misc/vdpauinfo/metadata.xml
index fed47a353275..349b99bbb869 100644
--- a/x11-misc/vdpauinfo/metadata.xml
+++ b/x11-misc/vdpauinfo/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='person'>
-<email>jer@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>cardoe@gentoo.org</email>
+		<name>Doug Goldstein</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild b/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild
deleted file mode 100644
index 7f4ca7b3d7bb..000000000000
--- a/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools git-r3
-
-DESCRIPTION="Displays info about your card's VDPAU support"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
-EGIT_REPO_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	x11-libs/libX11
-	>=x11-libs/libvdpau-1.3
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index c589c69648b5..b0009b0cdd80 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,4 @@
 DIST xkeyboard-config-2.27.tar.bz2 1664454 BLAKE2B ac5e02903f46579a1df0423c01d2c07412642d00a5e73b05c0d112e4a65163c20c2df762438775afc52445eed47025c8e061fa0945140245679b693d740e904c SHA512 ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e
 EBUILD xkeyboard-config-2.27.ebuild 1255 BLAKE2B acba6a3442b60470401db9b898927172f7f32d0f2e625c85701bc47fb9e4cc806f1f51031b5375eb5b195d4b2f3ff53fb5e7af88cf1511f123813d6e07bd75b9 SHA512 b7e457f396689ee4653fbabe3a34025621026b14d1cb11638c20cc373d0931d379747cca2466dfb3b732d92e6a446c45a2bfe98fde0709b0c838157a286a2deb
 EBUILD xkeyboard-config-9999.ebuild 1266 BLAKE2B 16798865be0a1659f706780c07c79caabb51f1cb9b2079e595122ec9afc49dcce769e784fd0e7ff0ea8f3581c7a03aff30fe773cbe7803a2a9f7ef627994efa4 SHA512 ec7096942471274e3ac0b78e5bfe8fe569259d3571ce83a4dd92cf5de2f52999b3d05e11a6aa8f31f8c9994d8c8dc77829ce3b65863ebf2c8d1e7bdc26d4cac5
-MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
+MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml
index d3cbfbdb344e..e943b72b8a48 100644
--- a/x11-misc/xkeyboard-config/metadata.xml
+++ b/x11-misc/xkeyboard-config/metadata.xml
@@ -5,7 +5,4 @@
 	<email>x11@gentoo.org</email>
 	<name>X11</name>
 </maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:xkeyboard_config_project:xkeyboard-config</remote-id>
-</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index ba9a070d8631..a07439643cd9 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,13 +1,14 @@
 AUX xlockmore-5.46-freetype261.patch 587 BLAKE2B a5666fd2c06d23b388d20cc8fbb6b64b47e81c219a248f539e76fdaedafba8765a3f8786483d801f8f95703b1d6911c4d595bb904daf5a010faef7697ceb1226 SHA512 330d2120a0e3c9c6ffffe90e1fdde255325394fc03aa4f9d532086859e6bdcb3f80aeab4a0b4d7f5eae4bcaef69fcba924ec86014c3c8e13fe8c878f9ebc8077
 AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd176616c531aa71ff5d051169165f991dd8a586685b5a0b8e1a66b0da247a441fd7a56ecd24cc39bd58f2267e8b SHA512 4eef79a2b791401433ae0c6e55179975f88b74c4e57cd64ca81df48a232723e5edaccbd7045c9f67ba81ba159e70257d5e070ea59808f52430ac08539ea91087
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
+AUX xlockmore-5.56-soundpath.patch 501 BLAKE2B 1d0197fb2a16f47560033f2143a53e3c7f20863fa809a22989b458235c196ee0d85e0c391d6b61ec169795ca65b36d180f8a5683604f8fd14bb4caee90bd96d5 SHA512 1f0768647b965322210a0640144d56e40dd95912998a5b7004071139c1e305741cb10bdd27c0297e957b2a78264c867a579f0a7f2af389d473fcef897126df97
 DIST ax_pthread.m4.xz 6356 BLAKE2B 784bfa3fcae2499230acba588cea5591f62229d721cac357012c5d19b0a506c2d77201145eb90cdb15217190926cdad09cf5897e49dc3644be41ccac30e60ee2 SHA512 04dddd91a98a4f544d065de1b70340e6835657015385959d98c3c5eedea175f58657db73b60011af181a8cf2ff5d48d533cedfa6020943d8b41770bdc4aae329
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
+DIST xlockmore-5.56.tar.xz 1649808 BLAKE2B 82d56a3570bd1be52014503d7c0a36cf27f68aaf31fe4a7ed06159dc796dbd1410711a56fa8e72709499b1ceb3063b2acd9646ba38400669d3671d04e9fb5745 SHA512 1ae5cde5d0167897229e9cb8ebd15e26fdeadc9b0e2d221e6334980f23403385bf1adbd44a955b455e3ecdf8b02b18b0e06273d8dc566b17ac3692ee5ae44f4d
 DIST xlockmore-5.57.tar.xz 1835880 BLAKE2B b26a9792286ded7647c816b907107b9c524ddbf46afab94c5b6b5dc5d5c918f5715c914ce4246497018bd56fd11329bcd1afe07608e44a70d24dd2c4c3d97e38 SHA512 2107efc7e1e9c811b6f86e9bb048dae3861a4e2f421b3d963856a77746834c08c5d349dc15cb3bc9b9aaf21abdc8f0e4af9463a90359b575604f3393c325400f
-DIST xlockmore-5.58.tar.xz 1878452 BLAKE2B 90b19c7c7c99188b056e69d80c0e89a0030faba46f942bd5e278403cde00ba66fe626f457dcf03e049280c0eff1af0dd3e598dda8e2d8d7eee194e38e97124b5 SHA512 470107a9f00c94db8f1ce20c33d04a3b0cbd3d5616aeffa42f98d3a75053cfd8a05a63e38349a88cfc3056fb7bdf3beeaa4277dc83121c35bcff071955ed9511
-DIST xlockmore-5.59ALPHA4.tar.xz 1884644 BLAKE2B eb3c7ba4467d75daf9cd7a12a256cc2c7e5a81aa8635d46b4190a03d1e6c509dabed717976d7bba6de9e58aca35530347da059bb48f6d71bc16d0d6766a05479 SHA512 ea4f47196432013c52078b0c5af4172e7db7ff064b37dacd6890886b815c2b18d439109cf871428b80eb0654132c318e3b0231176ad3c45f58bd72c003ca66f9
+DIST xlockmore-5.58ALPHA.tar.xz 1849660 BLAKE2B 9b4be74fb1987bb1c946e63f8cf6ee596c0c0a7af4682cffe78c0341c5d444c111478f9849ff44db3f5d7dba317bcd464e0fc1bd070b5710250da56b392e36df SHA512 0457499376294d3aa295a24e7aa6d40f0da4e2b09aaf85bd0aaa32c9b7a5f52edefab69ec2815994e476f43719ced21f6cde30bcc42f6c0f2ad60884a405c80d
 EBUILD xlockmore-5.50.ebuild 2165 BLAKE2B feadf465ae112ad5d4b482a0a4fda8293eef90f2daf76076d37175182dfcd2491f7fde83af37298e35eedb65f7c27b3915e3f3ef60b4c3ec1ee6145dad125ee5 SHA512 982a26f33a14d5ccfee07f190cf4a4391c2f767b000e8ebdbe46a6f71650bb4beb9d1758fdf947f801b27bc3f331eac5c9e95d6cd779ebdb5d81e1cedf81c673
-EBUILD xlockmore-5.57.ebuild 2374 BLAKE2B 398a8458d84b479fde1a7b6b53fb232aec3a8b66a0430f62ea1896b9e69a9b34ae07acde840ee38b6aefe7a4405cdbd2b11f90d0576303bad76566e5f08607d6 SHA512 0a9e3410a71c8251439e15cb3c5695137de3149dab414e1b31b489c576021063240b21aac39e99e701546c8ca1404ae3d959d4d473b13bc7b7b09c51ec497eb9
-EBUILD xlockmore-5.58.ebuild 2374 BLAKE2B 398a8458d84b479fde1a7b6b53fb232aec3a8b66a0430f62ea1896b9e69a9b34ae07acde840ee38b6aefe7a4405cdbd2b11f90d0576303bad76566e5f08607d6 SHA512 0a9e3410a71c8251439e15cb3c5695137de3149dab414e1b31b489c576021063240b21aac39e99e701546c8ca1404ae3d959d4d473b13bc7b7b09c51ec497eb9
-EBUILD xlockmore-5.59_alpha4.ebuild 2374 BLAKE2B 398a8458d84b479fde1a7b6b53fb232aec3a8b66a0430f62ea1896b9e69a9b34ae07acde840ee38b6aefe7a4405cdbd2b11f90d0576303bad76566e5f08607d6 SHA512 0a9e3410a71c8251439e15cb3c5695137de3149dab414e1b31b489c576021063240b21aac39e99e701546c8ca1404ae3d959d4d473b13bc7b7b09c51ec497eb9
+EBUILD xlockmore-5.56.ebuild 2422 BLAKE2B 90a79533897d5e0cdab0d3b4fa4009894c50ee6b2f199078e38a9ff873da117dc9c0c5935435c5b640edf4d9c147512ab9e4a57fb70502b150782bc9ed3cfecc SHA512 6d88bf97b12a880203fe79d788db105685ab219c94ee5ccc33ff99d1120d39e3a8c7d5cd4cccddbfc507e13abe0710054e306c0442e5adee625bccf096526895
+EBUILD xlockmore-5.57.ebuild 2370 BLAKE2B f03ad7b49be9ca7967c40613573ca4d8559c670d7bbab6a68664467163d37dcfa9f8edd4fca6d695cebcd3c45d1fdaeb72806dddcb086cfecf8ed13972eef7bf SHA512 471580b4e69912f2977e5a7c0e6d6fce3fc5462d031aae67ca8f19aaa7c8df4a96e338d98a7f3ca881466de3e6bd2c890d165048090c24f54a9bc0e78ea6beba
+EBUILD xlockmore-5.58_alpha.ebuild 2370 BLAKE2B f03ad7b49be9ca7967c40613573ca4d8559c670d7bbab6a68664467163d37dcfa9f8edd4fca6d695cebcd3c45d1fdaeb72806dddcb086cfecf8ed13972eef7bf SHA512 471580b4e69912f2977e5a7c0e6d6fce3fc5462d031aae67ca8f19aaa7c8df4a96e338d98a7f3ca881466de3e6bd2c890d165048090c24f54a9bc0e78ea6beba
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch b/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch
new file mode 100644
index 000000000000..a5c9079e3aeb
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch
@@ -0,0 +1,11 @@
+--- a/modes/Makefile.in
++++ b/modes/Makefile.in
+@@ -624,7 +624,7 @@
+ install-sound :
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	@NOPLAY@$(INSTALL_SCRIPT) $(ETCDIR)play.sh $(DESTDIR)$(bindir)
+-	$(top_srcdir)/mkinstalldirs $(SOUNDPATH)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(SOUNDPATH)
+ 	$(INSTALL_DATA) $(SOUNDDIR)complete.au $(DESTDIR)$(SOUNDPATH)
+ 	$(INSTALL_DATA) $(SOUNDDIR)identify-please.au $(DESTDIR)$(SOUNDPATH)
+ 	$(INSTALL_DATA) $(SOUNDDIR)not-programmed.au $(DESTDIR)$(SOUNDPATH)
diff --git a/x11-misc/xlockmore/xlockmore-5.59_alpha4.ebuild b/x11-misc/xlockmore/xlockmore-5.56.ebuild
index ddeb507159c2..7679ed6cc890 100644
--- a/x11-misc/xlockmore/xlockmore-5.59_alpha4.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.56.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools flag-o-matic pam
+EAPI=6
+inherit autotools eutils flag-o-matic pam
 
 DESCRIPTION="Just another screensaver application for X"
 HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
@@ -50,12 +50,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.46-freetype261.patch
 	"${FILESDIR}"/${PN}-5.47-CXX.patch
 	"${FILESDIR}"/${PN}-5.47-strip.patch
+	"${FILESDIR}"/${PN}-5.56-soundpath.patch
 )
 S=${WORKDIR}/${P/_alpha/ALPHA}
 
 src_unpack() {
 	unpack ${P/_alpha/ALPHA}.tar.xz
-	xz -cd "${DISTDIR}"/ax_pthread.m4.xz > "${S}"/ax_pthread.m4 || die
+	xz -cd ${DISTDIR}/ax_pthread.m4.xz > ${S}/ax_pthread.m4 || die
 }
 
 src_prepare() {
diff --git a/x11-misc/xlockmore/xlockmore-5.57.ebuild b/x11-misc/xlockmore/xlockmore-5.57.ebuild
index ddeb507159c2..360f6c9070f1 100644
--- a/x11-misc/xlockmore/xlockmore-5.57.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.57.ebuild
@@ -55,7 +55,7 @@ S=${WORKDIR}/${P/_alpha/ALPHA}
 
 src_unpack() {
 	unpack ${P/_alpha/ALPHA}.tar.xz
-	xz -cd "${DISTDIR}"/ax_pthread.m4.xz > "${S}"/ax_pthread.m4 || die
+	xz -cd ${DISTDIR}/ax_pthread.m4.xz > ${S}/ax_pthread.m4 || die
 }
 
 src_prepare() {
diff --git a/x11-misc/xlockmore/xlockmore-5.58.ebuild b/x11-misc/xlockmore/xlockmore-5.58_alpha.ebuild
index ddeb507159c2..360f6c9070f1 100644
--- a/x11-misc/xlockmore/xlockmore-5.58.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.58_alpha.ebuild
@@ -55,7 +55,7 @@ S=${WORKDIR}/${P/_alpha/ALPHA}
 
 src_unpack() {
 	unpack ${P/_alpha/ALPHA}.tar.xz
-	xz -cd "${DISTDIR}"/ax_pthread.m4.xz > "${S}"/ax_pthread.m4 || die
+	xz -cd ${DISTDIR}/ax_pthread.m4.xz > ${S}/ax_pthread.m4 || die
 }
 
 src_prepare() {
diff --git a/x11-misc/xsensors/Manifest b/x11-misc/xsensors/Manifest
index 5e535bc30a28..96e07c186a36 100644
--- a/x11-misc/xsensors/Manifest
+++ b/x11-misc/xsensors/Manifest
@@ -1,4 +1,4 @@
 AUX xsensors-0.70-gtk220.patch 1566 BLAKE2B a36a31d4a7810d77d5ee3d451936a111204570863c253d7a6afdd7d058b87ea58efa494a048f32b29cb152b30025a1f23d5bad18d0a14ee481ee909f373b692a SHA512 24196915ebde6264a5ec364539ede4827459a87e675dff3e187a556d4adb24ee0efb41db49fe2ae0c94e5ab467eb3caff205df28d30c15c8bca9f78641324199
 DIST xsensors-0.70.tar.gz 115430 BLAKE2B af18fa723a9e6b84df62d0ea0397d7b30ab800816b84449f91357aa75d99944796ae8164171bd217118dd93ef713d286fe435354614baef7947f3f851b368df9 SHA512 34f038b192f3cecb2e7587e19c4837b795a2705e6d0e9ea2bd3ead6d3259a1dded364fcfc70fa5e37d64f32c879e1dd9c6e43dcf32fa9aeb73ee5cc49bf290a4
-EBUILD xsensors-0.70-r1.ebuild 708 BLAKE2B d4f5951126d6dd67f0f93d5ef6bfaf1ddb508a1fc38769ffb4c1d99cd8bb72a1892834dada4a72adbf7ff278caa5f343a4313577ed0645f1c00aac36b73257bf SHA512 846d49b4ba76bb7a46f40068f1ea522d6590bdcc18b64796d9d54523a8d2694d55112030e3254a3d70b78286c69d8b2fcd713c7c5480967d836907261659a5f0
+EBUILD xsensors-0.70-r1.ebuild 708 BLAKE2B 2b860476bc1eb719bf062ab870b4a52c61271034f68cff358446fc1881a8903136c1f5e6d6306dc6706c5503cbc6e26e26f34b9b8e7c18dfcc84ea4f0c8a8f43 SHA512 d92bc077f023345ad6fc6af4b23b7d467cc2d5b420d21282efba043cf9717d05c89689801d6c9ab9e20a8aa531bd332a719da5ee0a39f0eabea111b3382dadea
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsensors/xsensors-0.70-r1.ebuild b/x11-misc/xsensors/xsensors-0.70-r1.ebuild
index bcca5da249e8..344c180cf8e6 100644
--- a/x11-misc/xsensors/xsensors-0.70-r1.ebuild
+++ b/x11-misc/xsensors/xsensors-0.70-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
-	>=sys-apps/lm-sensors-3"
+	>=sys-apps/lm_sensors-3"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 30628ccfcc5c..b950a277a107 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -3,6 +3,6 @@ DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5a
 DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
 DIST zim-0.72.0.tar.gz 2590406 BLAKE2B 0d77052e9eaa62b855be30eee64863197498ee54949f8610528ccd86cf32e7c9c55fb2faca719a4d92e0568941dc6b100299e76a33f8c49bddc5e367ec98d923 SHA512 60f59c2cf2ebb920515ecbc77e7fb1ddb9b0a6f6179503176b582b6b87ada759707ec4ccee929896a8a7d489f25ff13f7a6ff61fa637ecdb3d02640182cda0b9
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
-EBUILD zim-0.71.1.ebuild 1912 BLAKE2B 453cfa5a308a9e00622a508b27aae0f0511b241a8f1ca9f3555964defec514617430e3b88e92c10b2814e2ce727c8f975e273315dfbbcb8759fc4d85e593a1dd SHA512 a6b3845fb5a20895e96027221e2fdc4a23958e2ee9a7cd8e220037c30294288bc7bc5a353ce6b9a5e46cc8a2c6cb9c1221382b3fafe4ae7a3d38db175a4777ac
+EBUILD zim-0.71.1.ebuild 1913 BLAKE2B 0b8bd0e02d0882a56cca1e7717092b395a2c0f34dfce0f30366b7e6c8a97d5d7962a36ee8fd93c258436b384f0064ef7e11c8382135583cf57b27bdc7a57fb81 SHA512 8de22f9256a69d3452eeda7dfb801707011886c7d772c8acfabb64caa11c5fc34a16d505895b84a6be6f41b072e3c45e262f3f40fff0594c312456bbcf741564
 EBUILD zim-0.72.0.ebuild 1895 BLAKE2B 066acc255bb356c9841b4e7eae17b3baa632b4b9c7ad9dba8ec926ba1590484a87f0525ab8e73dadbb9bdf92c624da37e84ef117bbca2e03ed9449695799826e SHA512 8d05dbf1c1db89f4dbbc0de727b8be11a6c908bd08b11f9b4601af9feb78a6e80422bc8dd3a11869abdd73295ce48d4bc3bf9eb86238b48a55288ef786a8f5ae
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.71.1.ebuild b/x11-misc/zim/zim-0.71.1.ebuild
index 99b03d91550e..d8925b78f1d1 100644
--- a/x11-misc/zim/zim-0.71.1.ebuild
+++ b/x11-misc/zim/zim-0.71.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 x86"
 RESTRICT="test"
 
 RDEPEND="