gentoo resync : 07.04.2018

7 files changed, 6 insertions, 9 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d741d120d190..d2108145118f 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/magick-rotation/Manifest b/x11-misc/magick-rotation/Manifest
index 1f966d8172a2..ba65e2a51b82 100644
--- a/x11-misc/magick-rotation/Manifest
+++ b/x11-misc/magick-rotation/Manifest
@@ -1,3 +1,3 @@
 DIST magick-rotation-1.6.2.tar.bz2 103389 BLAKE2B 9ff85d53d33b381b79fdcb725a663001e583fce46ba36efab561d16f6dcdd50fec7c9d54c1ad9284eae590c2c589622259a5814ffd295a02e6458994ff588c96 SHA512 40252c4b57d304244f8f7a8b08448cb498efd9044406235f2d728a89c8b4888009c4e7a9f50cbb61b5620336eedf1abb1591e68e94a57b051f4d823acbcdff5f
 EBUILD magick-rotation-1.6.2-r2.ebuild 2424 BLAKE2B a3a0d1db2df01840eb62a30e605e430229b45cb0260adb1e353ed35b5ae31f2fd996163ec55ff4dfd30a8bbe697ada641a3a502c8ff6babf60f2532d2f89ac38 SHA512 22187c36505f55c33d1e2cef0ea78b601c64b221fb4fc68988f96bc92457c7ca4b1fd17dc1d011000b67e2fb464f5cf3f2c5b94b3131f4830c9c573faa6f910e
-MISC metadata.xml 552 BLAKE2B 12b805115a70b0994af4076bc2a36c8441b89fc8b4f5fc89b35743610456e7a6213e0c3fb79eec3523482598abd025f37360d2b69344f498b98b90c12fa8b4b6 SHA512 4f655a208ca5e8ddd857abb077e91f506faa7445fc0e5d6156fa0b2a5a0dabf880a0355280282a1de2df85fba3ae71b47795790db9949536c66263a6346fe6c5
+MISC metadata.xml 444 BLAKE2B 9a22f781b09c79acfa976b54f3aeae01bbc6617fba6c95f6c859e60d3af720651c8a17b89de9c3c6a55b6c35b0d5e5639149818bf0b58910c1174e3f9904838e SHA512 8a6601959b4a32d8e8391d5696edb61bf3457a62ca5a47e25880319963e01b418c28f4994ebbe3864eaa8343cb7c6bc6544b6db1b5777b43c1ecc8dabf87864f
diff --git a/x11-misc/magick-rotation/metadata.xml b/x11-misc/magick-rotation/metadata.xml
index 1229d82cefa6..081d53a12fb9 100644
--- a/x11-misc/magick-rotation/metadata.xml
+++ b/x11-misc/magick-rotation/metadata.xml
@@ -5,10 +5,6 @@
 		<email>evadim@evadim.ru</email>
 		<name>Vadim Efimov</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index 87876481cad2..977d68de7c89 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,7 +1,7 @@
 DIST menulibre-2.1.3.tar.gz 231336 BLAKE2B f15f962b41071f40cebdaa3fbab082932f1acad30026b89bb2b4672a860b4f7cc3caa668eadee48195a091783b6a8d5558ca44ed05034640247cad02394d3b93 SHA512 0a9040bcb311fe993238e5d1fc459db2400466c538c729ecd5bf2ff20cf9c7300ef2543c56ae4ef7cfa44cd66768ee9a9001ab997fd2507d8d74a246b2029c7a
-DIST menulibre-2.1.4.tar.gz 414546 BLAKE2B 4c6420e6559415dd4be6aee37af43f820f85bb5d98ce4c3b475d977c1511d4ad30f1fb3db8aff94569a3dc0afa4d75887bed8247cd8d48c673bcb106cfa11b52 SHA512 48322d7187d77a63253ee5d8d269b473e36bab4d02f1442b8e4c66070d372e3eba4247b923932688640092e16d51ea41bef42571694980099c279a3526b9e56a
 DIST menulibre-2.1.5.tar.gz 443986 BLAKE2B 5397e1f9d4371c017c8d2358e65bdad58b0ac10765f00fa51b2b20d9e404f19229da00719c6cb209020e5894708882d42adb30f4668e82929e0d1904ca7d3cf5 SHA512 d1bcd055d7f5c77df02470b4b6362ea5af8a6f4dd41f217c73673b63f413c3edca0ae18ccb6cff179a514ee0218613c3201e7687ec36de34436556b8a60a0856
+DIST menulibre-2.2.0.tar.gz 430567 BLAKE2B 7910f9f8e23b2ca3254b5a83a7c16315620bec38ff458a2fe3f65328b8b08ba424d853abb1fdb7334fd2b38da54b632a8d5b178a7cf876873d52c1903adcdab2 SHA512 d08d61fee3c5a9716581716c116d5b82c3221dff24093c765f6ad72d9dc17fde40ebdd2f17bcee7952b22bc4c78bdf1057cbc57af3c4651dfa6dc01cbd3ecbeb
 EBUILD menulibre-2.1.3.ebuild 1726 BLAKE2B 25f6a035bb3a32ff4ec22a6c0147c0b4c6e23501d030a5620a9068f223d17d34f70a09b3b27fe68dbd9ada6a2183d0c57aac7261c065ac033ba1ca0d61cc50d6 SHA512 35b0a13f101aa205ce6fce26f345b46d5fae1131e4bce61caf8630bbc1109f7e4e353da300e83b921c5edf33421b9f6d3951de38bf6c38baeb3e546eb14551cb
-EBUILD menulibre-2.1.4.ebuild 1728 BLAKE2B 90daacc086f6f5f06721a9427b5426fd90c2ede7f5cab19dbfacb52ecc58998614ab68682548deb0ae924316a1088fc5c7d0c61b5a7c9867a875d9f647be7866 SHA512 ede22acec5b50f1f181430840ca679900c8dc23435a96768c6b07f340f807cf28e470b7ec777c0a49b624312563c4e8ab19078802a71d493a7ac6877d577bbe8
 EBUILD menulibre-2.1.5.ebuild 1728 BLAKE2B 90daacc086f6f5f06721a9427b5426fd90c2ede7f5cab19dbfacb52ecc58998614ab68682548deb0ae924316a1088fc5c7d0c61b5a7c9867a875d9f647be7866 SHA512 ede22acec5b50f1f181430840ca679900c8dc23435a96768c6b07f340f807cf28e470b7ec777c0a49b624312563c4e8ab19078802a71d493a7ac6877d577bbe8
+EBUILD menulibre-2.2.0.ebuild 1752 BLAKE2B 18cb81a49f89bc0f4565f5410c873a2755c816ae8f016ef8569c8237e6a22d54d46880ad15b068b5f6eea77631267ff7ea9ed3a8c35253c461cc7ae600ab66cd SHA512 dcbf585bd50f0f83db8d3aa0c3f8051fa757335acbf32809b88de1184bfca06744f965a5d231dd22b43818fcd4790cf299f34342aff36cdc0b6889ec4d722f59
 MISC metadata.xml 353 BLAKE2B 6064836036ff045dce0bc62fe8b822aefcd75b1cbb5746e12c2a2c5399802c1412b4f6bb9f9582785d5f8cff63d61f9f0c71505fd593e649e26c30f7c7019d6a SHA512 256e7ca3b20708caea270d07348c477b3d9e8300739092ad80468f4ab60e5e85b21246cf906d51a1929e627d27ed62bcf23136a3b8edc684c4ba1b53e3282454
diff --git a/x11-misc/menulibre/menulibre-2.1.4.ebuild b/x11-misc/menulibre/menulibre-2.2.0.ebuild
index f05ba92dfc02..b66386de4eb4 100644
--- a/x11-misc/menulibre/menulibre-2.1.4.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.0.ebuild
@@ -35,6 +35,7 @@ python_prepare_all() {
 	# too many categories
 	sed -i \
 		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
+		-e '/^OnlyShowIn/d' \
 		menulibre.desktop.in || die
 
 	local i
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 23a6af119d85..117f72d816bb 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,3 +1,3 @@
 DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491
-EBUILD shared-mime-info-1.9.ebuild 1472 BLAKE2B 8c6ab7f9d7e776e6ba3db6afded29906ca3fbbac555a0807cc5a9bbc8742db1bddf09fdc91ff1a865589cf931cbffcee8a41f0b4c41d79095d0b92cf00acf16c SHA512 54a8e5dae7e3324b1d116c62c7f5a6c1bd9918296fe905fc4c4c5fed68e26b61d5b63f74ccb7a08431208e38efa75ff01edc5779777d865f3ce12abe4118569d
+EBUILD shared-mime-info-1.9.ebuild 1471 BLAKE2B 56a16d41ea79d6205fc12f4267192f0d6139c3e43de5ede74bf154577d217baa687c3eed46201bbbb61b58a6a44fcddc484bbf48fdcdd1d1b134c9a7c52ae89b SHA512 4cad2957b70ba474ff6986ac4e9dfad8752f1acebd103df29825174e2c8152032b3c6ce84b94187816e2c4765657f396ca1da6c906452225358e856e8c612878
 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 71d4fed745fa..4d7eae0ed5e1 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