gentoo resync : 25.12.2017

14 files changed, 55 insertions, 133 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index bb8b34a947e3..1952aa72dad4 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/fracplanet/Manifest b/x11-misc/fracplanet/Manifest
index 93edf1e86566..a4ace99bac69 100644
--- a/x11-misc/fracplanet/Manifest
+++ b/x11-misc/fracplanet/Manifest
@@ -1,7 +1,3 @@
-AUX fracplanet-0.4.0-gcc6.patch 1312 BLAKE2B ffb2a938992597cb7299eaa8795cb65b20df48d032a47b99c5c55e212aad661e16e575b5a5519c69e452565d90b3415736739c0798d1abda0cf3b89e3cb919ec SHA512 ebd684225f620cc5a02e7f407282a2f8e019cca3a473caf727babfc13478feafbd04af936064f8226ae6acf3c6e35ea72b222b825fbafb95420613a69131e733
-AUX fracplanet-0.4.0-gold.patch 464 BLAKE2B ae5383c199bd80e81e4cb96186c207835fbafefba36da8f36667e563051e77f2900f340ca7046547f7752039d1ab27215a425a3d21ecf61fd5988ae96e94f4ed SHA512 76983ed711ac72e8e9b5fd6aa913549cca6086375968e55ba9711532e018cf98f6e2791c6943062354486c09806ed57f0d8ee835d0ba01890c5fb5c8c325de20
-DIST fracplanet-0.4.0.tar.gz 101700 BLAKE2B d222e342d3238f84b03f9637a3d11af1f27a7935fbb769ff093dd54ff10cafb80f1180eebcca93e5920b8f3f86da56f74d0ca42e692a998f969a2a03c22c97db SHA512 09eed764df60929e5aa22b3f5c34defa11a91c4f6b588259fe0c3c7736fa03a9d138e05fd6ec4800e7943f36e73949804d8a7ed3e29bda6ffdc883ecadf9abf6
 DIST fracplanet-0.5.1.tar.gz 111911 BLAKE2B 81f5986bdf7a0ddc1a7ef8fd08bf07fbc23ae38ac1cdc452de6696354d291205cb1183d16c3a7fa8bfb250158229d84d94f3c24dafa09d20518fb5d19b31471f SHA512 40aeb6c33c2cb3403cc85193319a63bdc90637110c8bb40d9b0f4bd816a80018ca1cf81296337fc5a13fac583d7864adfde8d22dcc3a3cd65314c34ec63b508e
-EBUILD fracplanet-0.4.0-r1.ebuild 924 BLAKE2B 42c13da6bc09b972966b2655d3588e2afc1e237c89ad9651ad4905da659c9772f9c614421609782e5268ea3985114fb6f3e13fa294b1eb99728446281d3c2074 SHA512 52374c41729008cc0fa3db5ebd05e1d0981dee8ef3dd45a843d556691f6eddd37d6d02fd13cf54d11ac92c8d5ed6e9643d328fc331da24274cb843bdf6f24142
 EBUILD fracplanet-0.5.1.ebuild 900 BLAKE2B c573a2a41fcf96579c1db37161cf713f0d594ce81724b0e125d20a2040e9c1d6592ad0a14bc5c8e0935b1dbd559466a9d2675db58c8ee3798f12bcd162fca02f SHA512 3b280431b2d0edb3f4613bced41fd9d682c94c61a9d4c541a670e61185d0d26ae3fcae5da9064fa0538da1a48ef17b562453762a0edc72acd7be535c04f36d5f
 MISC metadata.xml 356 BLAKE2B b7514f3974a8e8f91ce709d90bd372dd73f61645ba8e55595570e8cd03aa2038e9b319a2d07b11b319bcd8bad91bb7fbcf87a35852451d6cfcdc30f33d9c9c1e SHA512 71282985fe89e25eaf0c84d2e3b0469317e2e2b1c3de5db8efc9557f8da2970e021e9aa18b625ef8a718feede1232a7c9687bc89615c12b4efd76325d4ad1561
diff --git a/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch b/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch
deleted file mode 100644
index 4d760d672f8d..000000000000
--- a/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Fix compilation with gcc-6
-Author: Gert Wollny <gw.fossdev@gmail.com>
-Last-Updated: 2016-07-09
-Forwarded: No
-Bug-Debian: https://bugs.debian.org/811642
-
---- fracplanet-0.4.0.orig/image.cpp
-+++ fracplanet-0.4.0/image.cpp
-@@ -85,7 +85,7 @@ template <> bool Raster<uchar>::write_pg
-       out.write(reinterpret_cast<const char*>(&(*(row->begin()))),row->size());
-     }
-   out.close();
--  return out;
-+  return out.good();
- }
- 
- template <> bool Raster<ushort>::write_pgmfile(const std::string& filename,Progress* target) const
-@@ -101,7 +101,7 @@ template <> bool Raster<ushort>::write_p
-       progress.step();
-       for (const ushort* it=row->begin();it!=row->end();++it)
- 	{
--	  const uchar p[2]={((*it)>>8),(*it)};
-+	  const uchar p[2]={static_cast<uchar>((*it)>>8),static_cast<uchar>((*it) & 0x00FF)};
- 	  if (m>=256)
- 	    {
- 	      // PGM spec is most significant byte first
-@@ -115,7 +115,7 @@ template <> bool Raster<ushort>::write_p
- 	}
-     }
-   out.close();
--  return out;
-+  return out.good();
- }
- 
- template <> bool Raster<ByteRGBA>::write_ppmfile(const std::string& filename,Progress* target) const
-@@ -132,7 +132,7 @@ template <> bool Raster<ByteRGBA>::write
- 	out.write(reinterpret_cast<const char*>(&((*it).r)),3);
-     }
-   out.close();
--  return out;
-+  return out.good();
- }
- 
- 
diff --git a/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch b/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch
deleted file mode 100644
index 4a52d1c44a62..000000000000
--- a/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/triangle_mesh_viewer.h
-+++ b/triangle_mesh_viewer.h
-@@ -24,6 +24,7 @@
- #ifndef _triangle_mesh_viewer_h_
- #define _triangle_mesh_viewer_h_
- 
-+#include <GL/glu.h>
- #include "parameters_render.h"
- #include "random.h"
- #include "triangle_mesh.h"
-
---- a/fracplanet.pro
-+++ b/fracplanet.pro
-@@ -8,7 +8,7 @@
- 
- HEADERS += $$system(ls *.h)
- SOURCES += $$system(ls *.cpp)
--LIBS += -lboost_program_options
-+LIBS += -lboost_program_options -lGLU
- 
- DEFINES += QT_DLL
- 
diff --git a/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild b/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild
deleted file mode 100644
index 798e453cef7c..000000000000
--- a/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qmake-utils
-
-DESCRIPTION="Fractal planet and terrain generator"
-HOMEPAGE="https://sourceforge.net/projects/fracplanet/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	virtual/glu
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}/${P}-gold.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
-)
-
-HTML_DOCS=( fracplanet.{htm,css} )
-
-src_configure() {
-	eqmake4 fracplanet.pro
-}
-
-src_compile() {
-	xsltproc -stringparam version ${PV} -html htm_to_qml.xsl fracplanet.htm \
-		| sed 's/"/\\"/g' | sed 's/^/"/g' | sed 's/$/\\n"/g'> usage_text.h || die
-	default
-}
-
-src_install() {
-	dobin ${PN}
-	doman man/man1/${PN}.1
-	einstalldocs
-}
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 96587cd259a3..7222d41653f9 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,8 +1,10 @@
 DIST libinput-gestures-2.15.tar.gz 11468 BLAKE2B cdcdea40a00eafc84f0a42a7f050c5f484c742c07ad008507881aca19296c93d9e486944d381e94240fd97e1f4740d2a2ba956e8152c1cbe2ab69c0685cf258e SHA512 b0449ce3355e700655cf450b62e239566f2a49127bb4afeda659e04026657d86f13dbfd101399428771b92323e6c55cf40f75bad79025ff80eb9003d85345c23
 DIST libinput-gestures-2.19.tar.gz 13031 BLAKE2B 0f34b0c66ea30cba789cad0f3e82cc9756d48ba6769c63a04d1983f49695e7953b8f60fed3c640e505458ed54e3fbca93be0b9c65fca746c52a13b17f63ed4a2 SHA512 d67e5180e89dd1032fc16be6c6bb8b17f413bc41ebf2d92735fa444b23b5001ae37e243d1089f96308ea22a015b38c066ad8ca2a8f33feea247a51d6bf049d10
 DIST libinput-gestures-2.26.tar.gz 15016 BLAKE2B a61404a6e09f24b6919e1af627eb18c8572195fa1b6a5316dc1e02cb8dcd9738e2663833ac5aa9a372100c1cd3a492205aad8d5e51e592f90db3debd8d79d957 SHA512 375c457c04f74d140693f6db0594b38f09c1a60eec89fa6e4b6da9b1d8d62abe42cf9e1a74214534f2b2f2a36d323521860bea722045b467d6bf2720a9c8c772
+DIST libinput-gestures-2.30.tar.gz 15462 BLAKE2B 35b0dac4c729beb3e10830f8344012f7ab181ad0af68eba65ab5d4c8543dc6c6b636be004ee7faf3138f651fae726d50d0052854b2fbda41cc7cb035deac7e4d SHA512 846e069835eda2c5a36aeafaed3f94d792a0227838622875014f2021531d9e08151900f3cf2188f8edf013d310e2444738d8deea525486349bea6589d09ccce2
 EBUILD libinput-gestures-2.15.ebuild 759 BLAKE2B b501b62c0e471b403ab713bc8c48599152347669f62df632192f41da6d8d307c6c95f60f25e8c561bd7e243964b35dbe64131d767dab1976c84f5ba32f020547 SHA512 120065e75ee119865923e4f1bd05d960c457971802100fdbb7e34ba755574ec5ebc1677649e8ef15a7989c46cef67956b860789fb5073372f41ba0f1d44ed451
 EBUILD libinput-gestures-2.19.ebuild 759 BLAKE2B bc1e7bcf80e47b317d80517008f18bc6ace0d0c1bd1badd5a6c7af4ed10fc28a181c22a8eab049293a6d003cb1c0383d2d064f91d42f07cf68f812061f566839 SHA512 351167d64286f3024fdd49eb4b96d587c588113ae7edbbc99c738d634ad87e49a9f6400db198dc3382f041711e02662edef81f12b3e0a3e57f9383fff1e92f93
 EBUILD libinput-gestures-2.26.ebuild 779 BLAKE2B c375406ce910a6f6a80ed73782cca048e9d1fde71dfe9e18eb1706573c6e2ca99d36dbb3084ae1d95718f48da666d9f5deba6c2b676db43fc7b00c1ce08bc807 SHA512 6213d21385271e59ca451702f9320503dfaafb090a7a3404131c4d4853856f0a551db966e48d7ccd520d9da64580c05d6d4a10a70dc5c35c79dd87dee47336fb
-EBUILD libinput-gestures-9999.ebuild 760 BLAKE2B 79bc83cead31f285acc5d7053e278a0e92755ed8fb07a0cf0eac4fa61a17ca6231d17477f54c2d4e75a611a8bb3a719a13750f19e628b9dab258a732623cae3e SHA512 1b0d306ff0530aad30c012211c226f16a23c02eab273c8751a96e352a2d11a2f2cdd7c3dedfc7743449f235bf557287aeb0315d751268a282a07c4c6696dfb75
+EBUILD libinput-gestures-2.30.ebuild 954 BLAKE2B 20fd5ee79ca54c7366d482009ccf737b19a3b6d46c81303e6aaa0ef478100ea1e4bd3195567e97882b4aea05a175af992a6675e1c8b024ca86741ae95abc2034 SHA512 ef17298b2629e7d05b9f7bc025349aa7149727b73410e963c416e926bf8a1c3a9218324dc7478eba6689322a61df9cf32a38829f54f567f3b24d01901a9ed3ca
+EBUILD libinput-gestures-9999.ebuild 935 BLAKE2B 7c5c1ef0b6bb7507763e2ec3590b16dd8ed3dcfc6fecaa25f0c326a651f4ec1b0542656ceb405dce3bc3bb22b3f0a26332195a2521e152e8b199c14b12783525 SHA512 8c66bd051444f600a202578e800f0a635dac5f8b5d8059ebd59e283e74843e302bd5e6c8ded1b7755fa9cd3f96496d9d3d933de8bb4114a642bffe39337da4b6
 MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.30.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.30.ebuild
new file mode 100644
index 000000000000..2bf4b9c25cda
--- /dev/null
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.30.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit python-single-r1
+
+DESCRIPTION="Actions gestures on your touchpad using libinput"
+HOMEPAGE="https://github.com/bulletmark/${PN}"
+SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/libinput-1.8.0
+	x11-misc/xdotool
+	x11-misc/wmctrl"
+DEPEND=">=dev-libs/libinput-1.8.0
+	dev-util/desktop-file-utils"
+
+pkg_postinst() {
+	elog "You must be in the input group to read the touchpad device."
+
+	if ! has_version x11-libs/gtk+:3 ; then
+		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
+	fi
+	if ! has_version kde-plasma/kde-cli-tools:5 ; then
+		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
+	fi
+}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
index fcb47f025982..f2516c9159bd 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
@@ -15,19 +15,23 @@ SRC_URI=""
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk kde"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/libinput-1.8.0
 	x11-misc/xdotool
 	x11-misc/wmctrl"
 DEPEND=">=dev-libs/libinput-1.8.0
-	dev-util/desktop-file-utils
-	gtk? ( x11-libs/gtk+:3 )
-	kde? ( kde-plasma/kde-cli-tools:5 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+	dev-util/desktop-file-utils"
 
 pkg_postinst() {
 	elog "You must be in the input group to read the touchpad device."
+
+	if ! has_version x11-libs/gtk+:3 ; then
+		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
+	fi
+	if ! has_version kde-plasma/kde-cli-tools:5 ; then
+		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
+	fi
 }
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 49e9667c37b9..517e3c14cc00 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -2,6 +2,6 @@ AUX rss-glx-0.9.1-asneeded.patch 263 BLAKE2B 281738a113dc81bd661f75982ef48d5b629
 AUX rss-glx-0.9.1-imagemagick-7.patch 5238 BLAKE2B fd3c02f9433d7d77dee0e4f6ec71afed34bcb09243ef0f8a60d46ea63fb2286e3b467e27165d2f7bbff7d2eb04849cbe10c889351f428b882b1e6d828fb45195 SHA512 706bc00bd5904c78bfc2858e7b6718b7288b401837ef9abf092ec7669eaf7f81def42e0684f28f3d9195abf00c5ec1ef0df617d2bcb0f55987f79e1914284b5d
 AUX rss-glx-0.9.1-quesoglc.patch 736 BLAKE2B 62ec14f17ee76b04f4589d71a646fc77d3521ba512d0888612cae701fedfbcb2d81fd1717210fb663c322b0088555fa0783faba91b68991f422e4962a3dd0b02 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a
 DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961
-EBUILD rss-glx-0.9.1-r1.ebuild 3730 BLAKE2B 92932dea3789c94c728232302fa71e41682da1b59e69eb2e2aedef7edee211cb8bea38c1b9525167cf2b2ac5c6f13c511daf6149a9c8033f581611f87b9be16a SHA512 a3fc2fdebc9fbd3713377c4aad6372f01d5709164d7b9e1d913db2a210d2bfa2d19a06e93e17f8f36f9d116e435cabdb27387f30991f8999e2ce644e568a6ad7
+EBUILD rss-glx-0.9.1-r1.ebuild 3729 BLAKE2B 0a7bb504c723327cb4b1c5f38957f5294bf78e53cb2925100e47cdd899bcc05632aea7aa12129875d73c7bd7f9f4ea160757ca7e449b13d5ce1d26643df4d220 SHA512 8dd54e03fdcba60c7ed425210ed1f16601350cefe8cb9c6ac73d51c20fe4f2d7bcca877314a542c1aa0ef58988df03cb03690f488115ac4a982961ea6fc9cf2d
 EBUILD rss-glx-0.9.1.ebuild 3690 BLAKE2B bb05b3c263d432177615ff555779e2c2574bb07a1cc2f0eef404d1cb220d32fbd1a135b3d0b2d6c0867c5c662c889fb3d94f4d5af252c5ada40eb3a806ffc3b4 SHA512 99a9d14a3c659ef635000df7cb67440a40ef6f5a73dbe1636c11a7bf1d3a23dcd0f637c09635c998d110fdaf07c3f5091e9fcc462f62e3dea33786459b389959
 MISC metadata.xml 444 BLAKE2B efed936fd7e5f9ec41b4944de689f03be14cc92c75759f91cb0f488599beb09b6fbed538df863a38909a674c4da4aebfc93b190765c9194280c62ee1b42bf9b8 SHA512 05849c2a8dbfed55c72261d2d977ece92058ddfe14565eeb22edb7d57ba2fab707bf8d97948fcbafe6f53a0880dcb651a6f8b4caf8fcc6935415c94de9443e8d
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
index 5e0687edb5f4..847bad7d7e11 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc ~x86"
 IUSE="+bzip2 openal quesoglc"
 
 RDEPEND="
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 86701d941fb5..d071d51dbded 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -3,5 +3,5 @@ DIST shared-mime-info-1.8.tar.xz 589444 BLAKE2B 35770d4c888188caf746d6fc40dc2bae
 DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491
 EBUILD shared-mime-info-1.4.ebuild 1456 BLAKE2B 120be0b566cd28cb5ed2bf3686008240589c070733a9a49443f0aaa27788fd7ebfb68cab1d608da70747fc13b750a77c7f0aa5bf58721469bc2b417956a8563b SHA512 67fba704d60ff0cb1a4e69be76e6d71075a920ea0823f25df8c90c8a90ffdfbd13e9158031dcaff7d03771c61a017d07cc123391847c95e4d089d34f4c202834
 EBUILD shared-mime-info-1.8.ebuild 1505 BLAKE2B 2630731362a57f0ccf546a12b7928b4c282ca6894afdf067cdc497571ad6b44d53e9ace3113c08985ab7f98c1eb713046e2276353cb56bc651d815247848f438 SHA512 b34cd63e350ce9ac08c79f3ef487e768580747c04c225fe3ec01c43ebe722221a21cf4c8ee9e044be825d93039f4ef2f273b6533645cde240b781907cf011775
-EBUILD shared-mime-info-1.9.ebuild 1479 BLAKE2B 95eaf97d046547057bd56b2221862737fc26a119f9040dcd80f62a3229e9a002ab99e1d971f9c2e3adf3ea3baffa40717c93a0b010b4f54b42f0a88951233e43 SHA512 71d1b2c2427350036513027ba09a50a956f4b63fa61d00ddeaca4ec5b78d1f637517b7162ff240b6292d62c74bd57ea927971efedf82d06556fd7000a7e794a5
+EBUILD shared-mime-info-1.9.ebuild 1476 BLAKE2B a6c21ee73465453f2ac3d514a2c1aeea8a565a468ea0649551c0e89b83b352b329350ce59bb00230b72076b3852d94a6e18826c4ce11d7ffd5f553e530a36d78 SHA512 f948856a1611e7d2fab0b599d4dfab6637ef4fc3243029a8320cd5d6fcabaa30399401d20863de722e6e29abe5572e70b420e639e9749ca4dfea11d2e0a39c38
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
index b23322582b93..ad41e079e8dc 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 2ba4c57443b0..7ddb1420bb40 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -2,5 +2,5 @@ AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12
 DIST xdg-user-dirs-0.15.tar.gz 243747 BLAKE2B 79ecef7689f5445b43d8f46fe9ddf735e6b699e74315619864f7049b22102fa25d38bfefdd6918a5680844fe9b7f13fc168032dac53334a166e80bc0bea1efc9 SHA512 2365003d4c116326357755dbeb462d5d7a4fd1391fe0b4ced5597db1017dff230676773aa8cd4bdd9dbb1bfb59c1c71d08ed860a047e0e9c2ab2487c814c7ca9
 DIST xdg-user-dirs-0.16.tar.gz 255933 BLAKE2B 827e1ec8265592cc2abe4861945fc0cb32ce777fc951df3a00e4f7e53f53f49e1c57ae242c6d3ff62eacd75ff7965fbb482aa4f8d2b4c2aece3b535e3a83ee47 SHA512 245513d1b16adc970b4a3c0b4a078cdeda62d36b39e4561754d8331e76ee0013a769d8c2e43c94f8b5c378619ee58bca534721a8675ceaeccbb3fdf69cf6f7ae
 EBUILD xdg-user-dirs-0.15.ebuild 946 BLAKE2B 574471c324d42839798a311ad3262beb2ccfdd5936e6c2fc7ee02b79a8a47158468524f77c3671d826a4e16c0684484485aabbcb7f9b7e8785d83546a557eb9a SHA512 371f7d7c2f5b56bf19cfba64a5c4e8b7bba2d36237887475cfdcefb5fb0283a050d03823f1c4afa557c9a36b88df852a758eb48e0d9c05447fc73915b2acbca6
-EBUILD xdg-user-dirs-0.16.ebuild 965 BLAKE2B f31fae2ba5b86af8a0bb71d624b8f3046892a8b1aea8d8110f330d3bf1977246cbbe6e7a07b3678b7d622e7cb75f20573406fd94dbeb2fe5a5a93b11571dfff4 SHA512 721085786c9ee7c0a2213391e12e47bfebee0709cea5081797981c15fa3e4b64da33b71f6cae6da4048d6e229ef55c239031ca5ff8233802e11d5857774f6db7
+EBUILD xdg-user-dirs-0.16.ebuild 962 BLAKE2B 487c8a007cab7720659cd91508edee315bc03d452c0eb4319c0039b816d76c76b73f33dc7d018509c0cc593345272ead54612a96c44354eb2f3a9f4ac12bdcdc SHA512 d8fe5f8576aff195e33ade3fe886b7ff22f191ff0d02f2f085df6284cd41e77f54a531f488b4d9a2fd6ed29fed556c110c7356b16a477f383f17e4aeb13c6396
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild
index 6fb97a10bc35..67ec057c474a 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="gtk"
 
 RDEPEND=""