gentoo resync : 28.04.2021

3 files changed, 2 insertions, 31 deletions

diff --git a/lxde-base/menu-cache/Manifest b/lxde-base/menu-cache/Manifest
index 5c0959a2483b..643bff37c0cf 100644
--- a/lxde-base/menu-cache/Manifest
+++ b/lxde-base/menu-cache/Manifest
@@ -1,6 +1,5 @@
 AUX menu-cache-1.1.0-fno-common.diff 2591 BLAKE2B 3e48e23596e1b633cd195700828848754ec1ea498099e3489614642110768d4805af0e53fdbc9c128376dec7f8b366b206fb0fc54656914684b824c245a44933 SHA512 cc740568441296da46cc3382f4e29ab50d677c3900127e4d13652491f6dc1f3473e945f2d05afe756ac0308e26d469c7bdb519040ad886b5bc467e6883f995f1
 AUX menu-cache-1.1.0-memleak.patch 1185 BLAKE2B af0ca2b3ece0bb765192295b561778d883a91500f74bbd6721fc2346a194bc4832e7120983a292879c493afb8822d219bbb22f96ed6f0912e4f631240999b89e SHA512 7c65382ac0c90e4eab452d8cf04967abec2da6a8fcceb34d77540d24ad3d70ff5c523210c2336b34c157faa44de90c5b4311b4b956759dca68dba2615d93e753
 DIST menu-cache-1.1.0.tar.xz 265524 BLAKE2B af7caea53a30be53836ccb7d75b0817aef610815009f22dc56fb6d412508ce27a6a5625c25f92faaafe8123dd73ddb2b3f83484e48c1b5deb635c9d630cc868c SHA512 e4c6619ade7b9a1b97c1366bb94dffb9975be5664b193cf0c69cf9470ef7ae19bda3390d04d98ee9a5b1658ec48aa5c83508c26c347af689161ee67c076b3c9e
-EBUILD menu-cache-1.1.0-r1.ebuild 786 BLAKE2B 4f3bb20e38bd8d8dd6c16b1c4730628dedfc22ff2032f17a7fdd73fb9ed605ba4b0120a1607c6317dc46c918d6454e0e445cd52c32a876ea0d3af5d72d998262 SHA512 88ca314e21d2268c2f073c74ad8a3237f55c114d2f90ada032802387ed472d5b0af8f7c2661a0f09b934bd8f8c12312a3e52c2d54828d8594607abb0c09c64b2
-EBUILD menu-cache-1.1.0.ebuild 705 BLAKE2B 7a853e20f267223f9a5f3c0ff8dbd0cec87bc578833620d0da8c67300f185d7512916286d7abca89ef0cda338fa8e845cd01ee844d8e9b08682df39a93f0e903 SHA512 9313c2765c7ebf260f3c1c3480f70718a3c4fae63bda870d433b3e63ad8d0991d44935796c11b7a8810335e31a3b67974610506f05649147d8b9093a538fc23a
+EBUILD menu-cache-1.1.0-r1.ebuild 781 BLAKE2B 2bcb201a6bdbf5171afea67e31e8cb2b5e418d1c3104a70f322d3b88a24c41d5afa7a00dcf9955c723c3cff3089ca3a27a6fe31f1654082ef3ea1502432d4d16 SHA512 6ae50c16c8d917d1499a1e540f58b19401ed9bc802559f4eb29e3ef3ab35d125fb79cb8937440430d84f623f7b133c451c306a676ff004c591054134dd5f4445
 MISC metadata.xml 320 BLAKE2B ff914db078fa5bfac7bc5184362f6a8c211945f0c1e0286fb3d7ba4da205c108678206272559fe5f5217380ed867a309c8e920c0d4a0cd5773e0b4d8ff9466c5 SHA512 b5a290c4ae3492e59e38159a1ad9aaae97abaad29ae07936db417f85b5a002f6d325d2b769a9222880b3235ed2bec0e3f59f930a9e2ea49fe4c2094549e84060
diff --git a/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
index a7684ccc41df..1958455b3b12 100644
--- a/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
+++ b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # ABI is v2. See Makefile.am
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
deleted file mode 100644
index 409d5823d80e..000000000000
--- a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus"
-HOMEPAGE="https://lxde.org/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-# ABI is v2. See Makefile.am
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/libfm-extra"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-# Fix for gcc 10 / -fno-common
-# https://github.com/lxde/menu-cache/pull/19
-PATCHES="${FILESDIR}/${P}-fno-common.diff"
-
-src_configure() {
-	econf "--disable-static"
-}