gentoo resync : 25.09.2019

7 files changed, 8 insertions, 8 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index c91c36c655b9..5d3dce1f3c12 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxlauncher/Manifest b/lxde-base/lxlauncher/Manifest
index 0afd50945afa..c57a76def68f 100644
--- a/lxde-base/lxlauncher/Manifest
+++ b/lxde-base/lxlauncher/Manifest
@@ -1,5 +1,5 @@
 DIST lxlauncher-0.2.2.tar.gz 236484 BLAKE2B cdb6e8413bbf38adfe1bcdb466fef32b95ac8fa4eec733a200237dbc9358427db563236864452dda1d296d5801fbb9570b0e2d2b46e1f17d34d3ac74b2f5f770 SHA512 f7249216b1b474945ee370f76433480d9e275c8b3375328183681083af10dc5a53d48606c00b948dc19f4c0b7d84573b65d52e122b472c69ff34becf953232a6
 DIST lxlauncher-0.2.5.tar.xz 131428 BLAKE2B fa12b7d49d0a95b6aa782c2bb338dc26677edf585b2b532e6d457771e450a8fba458c8c5638fd101edf079a3872a322418c44f01b4ccf6118c8a1377c6dd7a8a SHA512 3f57755ad6feeeb1daa61c29f142b997f8175ff0863d1749b3e28b83744d03e06a7f0bb373fdcd48364e307840dd05cd23b92109c75523e32d3eae8e183ed6cf
 EBUILD lxlauncher-0.2.2.ebuild 661 BLAKE2B e066aac2fbdf056147ce0545be5ad80794471457dedb4351104a5479593680790dde266048f4c13e7acfae056b83975ffd3d41c33835d1ab1f887ee9dda47724 SHA512 2d00793b12f654d5b406b8f1e66d79a21682f1d3b8544c6633a3865f63e264b69f2e38d45c977fc022498c1caef4fbb06d8961547f2f4abcd30ec82425553b57
-EBUILD lxlauncher-0.2.5.ebuild 680 BLAKE2B 83f3b9350835c2db32a4f17a6b7cfe687cbb6afce84d644f2eb085a32898432a0258226f58b8fa1d306b1d614479fd11a1cef5426d5148cff1a0e0515cd26021 SHA512 cd88afde266003b6ec29a967d6675851a9e1f0d21b68e907ea7c0313e0642825809f86366761e68994b401aee5c4f052a499547da582e4024a4f5329f9864d1d
+EBUILD lxlauncher-0.2.5.ebuild 674 BLAKE2B 07b729242ba3f233279ba2a429573cd62434d19848dcde7c8f54cc59dd79f5b66bf68995e7865a88fa27413fbc1b0274e300f3f732bcf504f98576e429d22cc0 SHA512 c02f47e78894ab730f0c6aebe3bc3ea0f92ec3d44049c6f8318fce537431680b5bf483be8a024a120b6dd1acf3880c4518d8dd7d8a1aeafe091446d3a53fff67
 MISC metadata.xml 335 BLAKE2B 8cda3e7dd4b3668ffc5c311b5f002afaaff19143f058eb873d5d917c63f6752fec6da156d869061939803ea0bacbed80ea0a56e92d53b6e06025ed9b3f3c9462 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7
diff --git a/lxde-base/lxlauncher/lxlauncher-0.2.5.ebuild b/lxde-base/lxlauncher/lxlauncher-0.2.5.ebuild
index 1c647a73c1d7..7a110e3350cc 100644
--- a/lxde-base/lxlauncher/lxlauncher-0.2.5.ebuild
+++ b/lxde-base/lxlauncher/lxlauncher-0.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index 3661a242809e..7dcda1cc155d 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,5 +1,5 @@
 DIST lxterminal-0.3.1.tar.xz 197628 BLAKE2B 9448855b6d1bfc3fc272ec40f7e5b4fde1dfcb861254db3ed35b73611fd2dc5ca5d760542251f297289a051913e6eb6d669b2c04b194e01862ff7e79305c2e14 SHA512 3063eb7bc7426293d35dc1d9c32d5841e4c3f0b417f3cfa3e5a7bf4d9b71df9c9d375d53d6dd6694b318085ba07167bd8403b2caea9c6e9197aef4b7802877fc
 DIST lxterminal-0.3.2.tar.xz 198348 BLAKE2B 7b24a138dd48bb6dc85a253b21e897e68d1a7e16a0d30aa45a87b4b97540c996b6a196d8f8be6fb37d9e506544878bd3eb65fe098d4d695be51e94b3ff15cd6b SHA512 0711d6eeed1f7e301fd24e0d5f750a48f29cc10c7cd40bcc1de57cceddfe4cb15718e9fb812da975faff24aed99cdd3978cb5f29838f47e276fce47f01577119
 EBUILD lxterminal-0.3.1.ebuild 1194 BLAKE2B 03216f78192a5966b8f30032be30c032983675883f68c479150d52ba8905a01e44b8e43a3d6c34a7859081ca06c7a73856db38224aeaad0e079bb2db412800ca SHA512 3a4971f6ebdb7f21dd30608196e400981feb4213ca5e0b0fa7d837c91151106a61ee7bca68b2d161be30885f2f1efda787eb425e94907d740e54f7e73d75c1fa
-EBUILD lxterminal-0.3.2.ebuild 1195 BLAKE2B c27a79f25f528586d242c9c0c100287d6edf39973144a292a4523d92fc2f7f00f289cd08469b3c461f42025a14ea7fabf34809173bb9ecf82883d9eec33bd8df SHA512 3e88dfe07e9e6d0355bd7b201d5b499ec827c0a9afba94e05d11c8eff4a96ebfe994fd53f86b4fca4eea7418f18ab487e73ac8e0b7114dae3348d66fc3b738a3
+EBUILD lxterminal-0.3.2.ebuild 1192 BLAKE2B a66ee6c158dff50327392d6fe820195b53acf0f9feac2b00ba6757ca6f277ee897a072fd6a445f28045a115561cc13bbea89611a253663ddfab11b8b5362bde3 SHA512 a3fd33a10fec614b7ed343f2fc39dd609de4c83141950fad849f5257f1219b4656dea424091ad8a465fe3615ec546df3a40c97a53df66b2dc4ca66532bef7754
 MISC metadata.xml 408 BLAKE2B 46853cfafd4a24907018aa2f99cf01f261d2ba37bdadd119e70493a6632e14b8dfec1dd0359c2192940c0c272d38e7c482a83590c7e775a06587b0bf4059e57b SHA512 2542f3365bcca18cfbb25bbe5a58b569bc7480ab42df1d86238e7dc1b52968387440f588394421b7b9ddcebb3c26709630a92ad3670684fa6b510d1cabc58907
diff --git a/lxde-base/lxterminal/lxterminal-0.3.2.ebuild b/lxde-base/lxterminal/lxterminal-0.3.2.ebuild
index a11e78007f3a..a8a5687ed8fb 100644
--- a/lxde-base/lxterminal/lxterminal-0.3.2.ebuild
+++ b/lxde-base/lxterminal/lxterminal-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 	KEYWORDS="amd64 arm ppc x86"
 else
 	SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/lxde-base/menu-cache/Manifest b/lxde-base/menu-cache/Manifest
index f9b409fd3603..307bb0a5ed1c 100644
--- a/lxde-base/menu-cache/Manifest
+++ b/lxde-base/menu-cache/Manifest
@@ -1,3 +1,3 @@
 DIST menu-cache-1.1.0.tar.xz 265524 BLAKE2B af7caea53a30be53836ccb7d75b0817aef610815009f22dc56fb6d412508ce27a6a5625c25f92faaafe8123dd73ddb2b3f83484e48c1b5deb635c9d630cc868c SHA512 e4c6619ade7b9a1b97c1366bb94dffb9975be5664b193cf0c69cf9470ef7ae19bda3390d04d98ee9a5b1658ec48aa5c83508c26c347af689161ee67c076b3c9e
-EBUILD menu-cache-1.1.0.ebuild 619 BLAKE2B 5d4aa0e75b05502c3db695e9a2c9f5eb82b47ad9f4ccb405f9f250155d1f4cc27533e10b0f2a84471e22946562c05b185689f6b1f92a7ac63792a2e8adee1705 SHA512 41630501f3029bde45f28c1405b3e913d47775ce0fa9169f70c10706bde04ab7493802718328b4f8d93d611932667eab9002e7e4eda63c645758e13a338fb49e
+EBUILD menu-cache-1.1.0.ebuild 586 BLAKE2B beb65b4dead00688fcb9be1bdbb13d1d9c1bef3490786286239dce8b28f4fb95fe5f30c973776a8bb7d25730ec1cec0e7ea6a86d85a07adc1c515c0392e46e54 SHA512 fac1fa9ea26ccb57a8f221ef239d84dc5858b70c0ca4c02be46427e208001a1599f4ca9dff7e3de533acde26f0486d54f5249c5460997af5a77b2803c2f0ded5
 MISC metadata.xml 438 BLAKE2B 22ac961e4ca76cf28e725a25d16767e5ec9c8d56cde16f3e613f5c1f56bce4eee38583f524796cb868301d2400cc3242fb466061edc140e28043a132bbb26b9d SHA512 406a5d2489fe96131ecbdcdb8570daa229a4360f393037b76b2d3bd4a7eaccb5dfae9b0d4c6915d0a09d2ef04d879c01b16bdf5c7af648eed87c53a09aa82bfc
diff --git a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
index 4b3ef71791c7..2c03125682e5 100644
--- a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
+++ b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
-	|| ( >=x11-libs/libfm-1.3.0.2  x11-libs/libfm-extra )"
+	x11-libs/libfm-extra"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"