gentoo resync : 23.12.2017

11 files changed, 46 insertions, 47 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 88cf58fc6af8..bb8b34a947e3 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index 240290fb747d..f41811fcc7e7 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -6,5 +6,5 @@ DIST mate-notification-daemon-1.18.0.tar.xz 340828 BLAKE2B 5f036f8f423b9af46662c
 EBUILD mate-notification-daemon-1.12.1.ebuild 1142 BLAKE2B dbf150b144dc157b083beceaeaf2228a6b5772be4edb8b64e4428a43e60208d1622f0f6ab7f313de69dab6cf3e1b54acd0ebec8c08cc5cfd557a4f7cb1ba9594 SHA512 a613fd6ca276038f53d29bf26aa0fa69e4f1de1d86b2e50f0a7b95352ef34a864997e298ca5bfb69324bc4613f12a4d265fc55fb05b2d815f08ab57d2c61d5ae
 EBUILD mate-notification-daemon-1.14.1.ebuild 1182 BLAKE2B 73103c6bf7704647238f440be8b8432e2b4352ec042322f7ca9991fcd41f7a08c39d2d668792d06704f0144e730574976e473ab71bd68b763f32350b503bb3e7 SHA512 c1675a178a05379c5c15533290ca4548731c81ac1577b753227742c74b6279641f21d387ad36daa1879dfa38af3e5f8bed1989fb33b7b2203ececc843d29401b
 EBUILD mate-notification-daemon-1.16.1.ebuild 1027 BLAKE2B e3060b0e84f47d6c1dfc66d98c2e8ad86c69d2d60ed7155698c34d07edacf38ed7396c3d33764174535595b8b4687322ba888bb6d2f3ee3a3958f9a6ea6ae414 SHA512 a98ea3dc08effc311f49b0b4fc5f28146829895f9e3cd9e5dcb0bb56934f54d2579f37eb38b0c547386278f7407848b61dc5929a0256326a5fd02b93351e54b1
-EBUILD mate-notification-daemon-1.18.0.ebuild 1027 BLAKE2B e3060b0e84f47d6c1dfc66d98c2e8ad86c69d2d60ed7155698c34d07edacf38ed7396c3d33764174535595b8b4687322ba888bb6d2f3ee3a3958f9a6ea6ae414 SHA512 a98ea3dc08effc311f49b0b4fc5f28146829895f9e3cd9e5dcb0bb56934f54d2579f37eb38b0c547386278f7407848b61dc5929a0256326a5fd02b93351e54b1
+EBUILD mate-notification-daemon-1.18.0.ebuild 1034 BLAKE2B 33b5aca810d972c98ade6136f0c5af4ea01cb5868151f24116f9b85e5d525da710076294508296269e5050bcad82039cccfcdea622131f9483151ae7ed6207a8 SHA512 219853e0274a2cefc5391a637a606145dc80286412ee0a4c5b274daa5377a057407a7ac070b7f9ef0356ad343e23eca366cd6c2bf5c53907e2d52bcfd31db65d
 MISC metadata.xml 429 BLAKE2B e6d7c9c85dee38c96c6160b31931e12284e62c507e35595203b8c8b0c187e9a3605c1b25df14f829f46203977c8a995251cb3b5ae09277c229ab997b99a4b87f SHA512 24f0a76380f18822df9024ebf95fddc8fb944ad6200f70a2f8952a6ab5028466793b3e26cbb4b6dffdbd685ee0ba6c1bbcd76d9d9bff87cac5c697a879ee93ed
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.18.0.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.18.0.ebuild
index d83471e84741..ceb5c370f98e 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.18.0.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.18.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="MATE Notification daemon"
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 438c1709054a..a99429072884 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -6,5 +6,5 @@ DIST mozo-1.18.0.tar.xz 173432 BLAKE2B 46c791b056c3fb8bb768599f4b474cd9434d6918d
 EBUILD mozo-1.12.0-r1.ebuild 1585 BLAKE2B 9a8efa5e5e5b8a3607b038b97a0fbc06e12a873c20afe7c795e91480aaa2606b420772e3692eb31169847ff47afb88680460eb3f538c508821a6a19937a4ace0 SHA512 d78543192113d0ee62d7b9942580a6bc9aab9b38fa4b822ed40b037062ed459c675ec3d2d222c2c8455b43bdec5404e192a5a72d5eb7d039d2d2b7dad4de7778
 EBUILD mozo-1.14.1.ebuild 1269 BLAKE2B 7b27dbfef7ba6f4cb6a5f5f22b6a5d962c502203dd69bf413a6db6f22c9fd4df5b78259c00006a805d8c197130dd7b4e6126521c54d5ad7d35e0be0f1223cc9b SHA512 82ca5080f8c219fc826cf2d54fb7563d9755d7a4a50ee1de370dd235c7b9a06e1d830749e177b40189a5d099572c9b7487e1d0724940644ef7ae47d06d2c4bee
 EBUILD mozo-1.16.0-r1.ebuild 1276 BLAKE2B f83da25567034b28429ad8d524d2bc1b8321de0b9e281a7cc9b2964507b68bc71d1a623159b92e7cd199c88faeaf5b17e4d64fa401d3c75ac5aed0dfef021881 SHA512 acbc78914cdb301b86b8cc002c5dee690c8ef24af612356e832e7fef98c69f9f4b41bda83f8d021bc35b13fa68b8e6dab2d300007533c6531973116ac1ce8ffa
-EBUILD mozo-1.18.0.ebuild 1239 BLAKE2B cf6be58a09551beda6ea47bb10a629e586eaa16df6e12d4afc31f822af2e1e5a5777512e58e6c37ad3bb7a26a6eb005a843075e1fb5b425d7697e38b4962d1fe SHA512 5b851d61f04a77712f733e6cfc1cb5d978860f18466f8c9e325a1ac32f38d98fa840d727c916f288810b12affa3e0f9fea05d06b020492001aef3c8b89925706
+EBUILD mozo-1.18.0.ebuild 1246 BLAKE2B c5ca45504ec03d40c14e139a1a92784cfeee0b25d3b43ebaf6e120c88601aaa928239d0e32552f867416f479a24c0913ea36d5a65902970d31a323a878675528 SHA512 d71654d083d77bb62a3a81cc17242eecfe1d5a327ef49934c50fefea7f76556b8a3538f9bbfe9edd8eabe9d78a387df6a0a77857a8f4ec1c07611034b0922672
 MISC metadata.xml 409 BLAKE2B 6f681539e5a6893c65760326ee1f6eecb3b3526da969e9398d36ec5e8bfe5ff540dd700be6b2b491bc8014ef1ba532ed2b0f3924efd80e7f2cbb656938779a95 SHA512 a99cda7183e71decfb25316fc3466140b701878a053a9375213760f0c1b6497b4d772731d60242b421e3283913884939911c561eb9116bb6972e7abcfeb2f1a8
diff --git a/x11-misc/mozo/mozo-1.18.0.ebuild b/x11-misc/mozo/mozo-1.18.0.ebuild
index 5d07223cc286..4a5605a517b3 100644
--- a/x11-misc/mozo/mozo-1.18.0.ebuild
+++ b/x11-misc/mozo/mozo-1.18.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit python-r1 mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Mozo menu editor for MATE"
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index 52367705fe0a..369ce539ffb3 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,5 +1,3 @@
-DIST qps-1.10.16.tar.bz2 218323 BLAKE2B b18689816c47ac2ede930d5e2089899bfd7c115d383c68f961c0768525528879f0712cccd4fdbb1d69a06effbc9beaaa3ff84088116e0567e3cf424658953eb7 SHA512 b1b7fa8840f0e50d9d0d3f22b59285e7a774d670f34245bf9eb04cfd0291373674216ba156cee6990e7fd2767d7e33bb8d3af55b4e52a5de9297f2f48eff33f5
 DIST qps-1.10.17.tar.xz 163212 BLAKE2B a6832212f338cf9ac41d3b6916a2a22a8728f8dbb1a0f16c44a0bde6e275f7c83a31bfd1c6d5eea40d738857f28e3b2993be2fa8a81f082841bc86537bcc2457 SHA512 81d4ef9cdd732edc6dd060998f10124663d26ec8250fc1de62eb020624111eb3ba595058bd74d5cee1bde84326f26579ab40c4ed7ef58f0aa44baca96921cfb5
-EBUILD qps-1.10.16-r1.ebuild 702 BLAKE2B 2d2b023a02e030640908480ac3d59aec20a4943da41b3a978e9321d5da7c71ce2c3751e29dd5498ad681eb14cc61d62e87a992c1e94a4bd082dc44709f00eb8a SHA512 29727124b8fc5390d432569b822679ae54e34dc6dafd30942b338891c6f23466f8624551b9d352c0f0a8377ad010b3544daac58f13d16dac2003abed0289506f
-EBUILD qps-1.10.17.ebuild 639 BLAKE2B ade1e0f9957318acbf80e0e6b13120869efaacd08c61871052f2309420a5319bd9a1df380c48b491642b41bc2c17a36e3b9b4107e901f1f8e1a37e8477085475 SHA512 27bca14ed93f0dadc1eb33406148fa105b30c60a4f909ced98d7cf2cb3ee82b89f6cd749cf0b62a59b38db14b4c453012e1c20f8bdc8e7d563ac6720a714c10c
-MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
+EBUILD qps-1.10.17.ebuild 638 BLAKE2B 7c3d7d6a1318b8eb0e838bd6270267256f3a1efbb25208631624a6301234d85c5bb5b25f6ceb79edf849fe8934d69f53b1b2bd21300d52ef159fc4ec001bd19d SHA512 89d67357e91e64f3624a1676ba9dad67850649010de4956e21f8730900a8015ddc8872a8ff1463b18751ce304989de195f18c63f43b7591124d921605c3d5fcf
+MISC metadata.xml 325 BLAKE2B 1088204e2b08361949c544969a80a5b66b10a7a731769cdc8d718e1834e4b19b37b66ffbf361826dad7b08b15f526be5c933320409937e262c9e46002bc120f3 SHA512 a58f8bf03d6da6152cd4ce86254d4e8314e8a6026a882884ebfc139e12cd8381f01626ab61deb21dcc19e443e312bc9fca1c98cb47aeaa06cc53bf4b27204346
diff --git a/x11-misc/qps/metadata.xml b/x11-misc/qps/metadata.xml
index 17237689dcfd..4eb2eb877d19 100644
--- a/x11-misc/qps/metadata.xml
+++ b/x11-misc/qps/metadata.xml
@@ -5,4 +5,7 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">QtDesktop/qps</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/qps/qps-1.10.16-r1.ebuild b/x11-misc/qps/qps-1.10.16-r1.ebuild
deleted file mode 100644
index 432a06c3a2ae..000000000000
--- a/x11-misc/qps/qps-1.10.16-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Visual process manager - Qt version of ps/top"
-HOMEPAGE="https://kldp.net/qps/"
-SRC_URI="http://kldp.net/frs/download.php/5963/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e '/strip/d' ${PN}.pro || die "sed failed"
-}
-
-src_configure() {
-	eqmake4 ${PN}.pro
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	einstalldocs
-
-	newicon icon/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} ${PN} ${PN} "System;"
-}
diff --git a/x11-misc/qps/qps-1.10.17.ebuild b/x11-misc/qps/qps-1.10.17.ebuild
index 3087e09c52df..f0a63360792a 100644
--- a/x11-misc/qps/qps-1.10.17.ebuild
+++ b/x11-misc/qps/qps-1.10.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/QtDesktop/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/x11-misc/qxkb/Manifest b/x11-misc/qxkb/Manifest
index c214eb150c43..fba522c0b069 100644
--- a/x11-misc/qxkb/Manifest
+++ b/x11-misc/qxkb/Manifest
@@ -1,3 +1,5 @@
 DIST qxkb-0.4.6.tar.gz 177857 BLAKE2B c0af941944f89920de4b8ffd903b06ab4762c0206e6678f857a6028579ca3c539507d08fe45bfa00b3a0ddefc67025057b3021fcc4194a2dca70ccdbe4111ada SHA512 8a6eae536291e0a0925d5b4ea47bdf74fb5809b892f3d204e7ec4ef6ce549f1f65693363dce0317d41e10739a1aa95aa200a706b40eb909c6e9baa96596e0da0
+DIST qxkb-0.5.1_pre20150305.tar.gz 176169 BLAKE2B 13b61c951b0cbbee025a78806afc4999e1d63dcc979f43d78218ff8ef6552a1f8057d704560dcf569863c0b2b46e8c3ce292e98fc77f7acfc3f92fc9fdc68a05 SHA512 bfb16af22e12977432a77814ad5d3e8f5ed91c46b885505bba242eb864795837ed09cdd97ac3161f9c82a142ed7fe1d4b37e8d3aa8990cedf956904da290ab44
 EBUILD qxkb-0.4.6.ebuild 595 BLAKE2B d386233552ef4dcb96e8ea85431ed3bef4eb954cab077b491b224a7425fa5f9a15aa4ec58eea71a8bc90ecb51d6c8b6d0644dc71f2be23e553cfd9a4324cd9fc SHA512 830c5116143ab8d83f05224e800d38cf02913d0ae3088587f14cb54857815033fa7116949138f0aafcc163fb9f109f3c96b2946633eaf81b8cbb2b35c473863b
+EBUILD qxkb-0.5.1_pre20150305.ebuild 739 BLAKE2B e80eb56a35df8dfaf173b15f2ac3a7ff273c85402608359a8fe1201d7c267338e242cdcfd905e7182485b26611d2b878b855600078476a4120638053d1f96456 SHA512 5b5da2f2de919bfe8318100060ba15c308565267685188b825aec8d1f6fae48863b88b215f4fb31025ec6a7b0a221cdfc7a7155adbf10ba99f63dc97c785a496
 MISC metadata.xml 323 BLAKE2B bafea289cd876df5467aacfe957ece4a4432d3d93bc8bd4b2bbb78f152fae1b661a0f8a8bc23fe6828a753f9a83c26c97b11378fbb75559cba0ae2417145e44a SHA512 57a0ffd3dd0fa5bfd23de1417c061bd7c2b21c7ded7ddedaf09cd807d9dac8708d3b868d20c0108aa94a228cf8296e45edd6562f7d520760cbf7ee0f25a93509
diff --git a/x11-misc/qxkb/qxkb-0.5.1_pre20150305.ebuild b/x11-misc/qxkb/qxkb-0.5.1_pre20150305.ebuild
new file mode 100644
index 000000000000..f800ec6daf1b
--- /dev/null
+++ b/x11-misc/qxkb/qxkb-0.5.1_pre20150305.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Qt-based keyboard layout switcher"
+HOMEPAGE="https://github.com/disels/qxkb"
+SRC_URI="https://github.com/disels/qxkb/archive/d7474a06055108c833bbb55b6cdef47e0edfb17d.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	x11-apps/setxkbmap"
+
+src_prepare() {
+	sed -i -e 's:../language:${CMAKE_SOURCE_DIR}/language:' \
+		CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}