gentoo resync : 05.02.2020

6 files changed, 98 insertions, 5 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 59485ac16250..60aa5afcccd2 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxde-icon-theme/Manifest b/lxde-base/lxde-icon-theme/Manifest
index e24106a1aeee..4714cf74f846 100644
--- a/lxde-base/lxde-icon-theme/Manifest
+++ b/lxde-base/lxde-icon-theme/Manifest
@@ -1,5 +1,5 @@
 DIST lxde-icon-theme-0.5.0.tar.bz2 4545598 BLAKE2B cb09777b87cb65c62dfeac384b19b94506701112f4264c646567a8e7be446642eecc7c459caad17fa9af8c7ef0507d2b17417d11c56201511c305ce15d39430f SHA512 4ca3e94b5826f7fe87d840feddf0c130fa77e8f14f22a59d9749252a5106d54661237e3c9286f4880d0aaa50bd330cb4bfb9d663ca35d6ee4b9e3c2af30fe9ab
 DIST lxde-icon-theme-0.5.1.tar.xz 4469552 BLAKE2B 0c2b6cb3c60fc5260c2813db84977167b56898f1388bc034180c2efd6b7d3fe5baea6a18f9cadbf984d3680100bf2c5ebbc8f1130491c41b1223efff889ff4a8 SHA512 4ae0e7efd610bc68c4fec2fa00e83b4cc61a313fa4207c213d592f7c8f40bda79117e45dfe7df537baddc8834a55f8ab8864918655136d938a7201c7520597b5
 EBUILD lxde-icon-theme-0.5.0-r1.ebuild 612 BLAKE2B 9a1b49d2deee9eaa80c6f08429aafdf391740c7e17efad497d058a0b2391b01ab7c950f5c6a8dd0fc5c782635aa41d98e474aa6ce874c3786b8aeeb24d75bf7c SHA512 27c6ae7488c5d4d2df1833b5ad7e0760a19bb940b3ea8225d01a3daac3ba296dc8ea83345097e280afa1af9d07c21ba8b4815b9df2bade3102d23cee93dbc26b
-EBUILD lxde-icon-theme-0.5.1.ebuild 612 BLAKE2B 8944b899f45d59ebe358e9d0bd6bf8084a3dc247c60e9963050c554d8b2b582778ba306debc2699728cb5e4e0d2db533025164cdf20bf45cc1e58b0f2bf9b1c7 SHA512 24f7fa5f7cca88f4128664c84ab377d70e8d5a231cf1197086e38007d880d048f5e79ddbefd4e9e535ba143690f6b3a8ed4e9ab091a5a18f21818c18bd9c0f6b
+EBUILD lxde-icon-theme-0.5.1.ebuild 605 BLAKE2B ca66af43fdf6ec92d34dc94df46c4b0b668f5302dcf1652f77090b980583bb66de501754795d60013fe8c8bbd9c548805af6a6fa917a23e6b2c33185cd53ef62 SHA512 9f5506f47cb5698d5dab2049465adbfad0378dd18acaa5f09043f668bccf30fafe193d3539c5c4d2a4cd8caa2946f86c6659a1837ce905a8f7016cf124770442
 MISC metadata.xml 325 BLAKE2B 59a313a45ccf57784fa63848c5f7d788391a7a04e8669fcc1e6fd1656757e14a5be58a1dc1fe0e7bc0ba72ce5c9e005d1cb60a5a19e0c00d4ba4aae1d2150343 SHA512 fb4b0845fa21ce4983acfb7af5ed10f668b7a30e659407a515d98f3035249e93187d2618226d399f37c3c35a968dc5f31a4d64569082c3dc0f31568dd60a8f13
diff --git a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1.ebuild b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1.ebuild
index 5c834512cf03..ee5d90314ace 100644
--- a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1.ebuild
+++ b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/LXDE%20Icon%20Theme/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/lxde-base/menu-cache/Manifest b/lxde-base/menu-cache/Manifest
index 307bb0a5ed1c..854c22b0d361 100644
--- a/lxde-base/menu-cache/Manifest
+++ b/lxde-base/menu-cache/Manifest
@@ -1,3 +1,4 @@
+AUX menu-cache-1.1.0-fno-common.diff 2591 BLAKE2B 3e48e23596e1b633cd195700828848754ec1ea498099e3489614642110768d4805af0e53fdbc9c128376dec7f8b366b206fb0fc54656914684b824c245a44933 SHA512 cc740568441296da46cc3382f4e29ab50d677c3900127e4d13652491f6dc1f3473e945f2d05afe756ac0308e26d469c7bdb519040ad886b5bc467e6883f995f1
 DIST menu-cache-1.1.0.tar.xz 265524 BLAKE2B af7caea53a30be53836ccb7d75b0817aef610815009f22dc56fb6d412508ce27a6a5625c25f92faaafe8123dd73ddb2b3f83484e48c1b5deb635c9d630cc868c SHA512 e4c6619ade7b9a1b97c1366bb94dffb9975be5664b193cf0c69cf9470ef7ae19bda3390d04d98ee9a5b1658ec48aa5c83508c26c347af689161ee67c076b3c9e
-EBUILD menu-cache-1.1.0.ebuild 586 BLAKE2B beb65b4dead00688fcb9be1bdbb13d1d9c1bef3490786286239dce8b28f4fb95fe5f30c973776a8bb7d25730ec1cec0e7ea6a86d85a07adc1c515c0392e46e54 SHA512 fac1fa9ea26ccb57a8f221ef239d84dc5858b70c0ca4c02be46427e208001a1599f4ca9dff7e3de533acde26f0486d54f5249c5460997af5a77b2803c2f0ded5
+EBUILD menu-cache-1.1.0.ebuild 706 BLAKE2B 3b8bcb292e34bde443f4e2602fab99eb38fd20a89fa7d2676d3a62167542eda0e895166ad352250f7815e69a269903bdd9d2068bd9097599ea9c10e86e7c4d5b SHA512 54fcfc5d346edfc207b06f93f64cee593be18883da172a98d129dbf9ec0352438e8cdd6f4b50dbb0c23574de974068e3153710b88939285436ba05b9531bf0e2
 MISC metadata.xml 438 BLAKE2B 22ac961e4ca76cf28e725a25d16767e5ec9c8d56cde16f3e613f5c1f56bce4eee38583f524796cb868301d2400cc3242fb466061edc140e28043a132bbb26b9d SHA512 406a5d2489fe96131ecbdcdb8570daa229a4360f393037b76b2d3bd4a7eaccb5dfae9b0d4c6915d0a09d2ef04d879c01b16bdf5c7af648eed87c53a09aa82bfc
diff --git a/lxde-base/menu-cache/files/menu-cache-1.1.0-fno-common.diff b/lxde-base/menu-cache/files/menu-cache-1.1.0-fno-common.diff
new file mode 100644
index 000000000000..aa12997026c3
--- /dev/null
+++ b/lxde-base/menu-cache/files/menu-cache-1.1.0-fno-common.diff
@@ -0,0 +1,88 @@
+diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h
+index f3fd7d3..f71c0bc 100644
+--- a/menu-cache-gen/menu-tags.h
++++ b/menu-cache-gen/menu-tags.h
+@@ -22,38 +22,17 @@
+ #include <libfm/fm-extra.h>
+ #include <menu-cache.h>
+ 
+-FmXmlFileTag menuTag_Menu;
+-FmXmlFileTag menuTag_AppDir;
+-FmXmlFileTag menuTag_DefaultAppDirs;
+-FmXmlFileTag menuTag_DirectoryDir;
+-FmXmlFileTag menuTag_DefaultDirectoryDirs;
+-FmXmlFileTag menuTag_Include;
+-FmXmlFileTag menuTag_Exclude;
+-FmXmlFileTag menuTag_Filename;
+-FmXmlFileTag menuTag_Or;
+-FmXmlFileTag menuTag_And;
+-FmXmlFileTag menuTag_Not;
+-FmXmlFileTag menuTag_Category;
+-FmXmlFileTag menuTag_MergeFile;
+-FmXmlFileTag menuTag_MergeDir;
+-FmXmlFileTag menuTag_DefaultMergeDirs;
+-FmXmlFileTag menuTag_Directory;
+-FmXmlFileTag menuTag_Name;
+-FmXmlFileTag menuTag_Deleted;
+-FmXmlFileTag menuTag_NotDeleted;
+-FmXmlFileTag menuTag_OnlyUnallocated;
+-FmXmlFileTag menuTag_NotOnlyUnallocated;
+-FmXmlFileTag menuTag_All;
+-FmXmlFileTag menuTag_LegacyDir;
+-FmXmlFileTag menuTag_KDELegacyDirs;
+-FmXmlFileTag menuTag_Move;
+-FmXmlFileTag menuTag_Old;
+-FmXmlFileTag menuTag_New;
+-FmXmlFileTag menuTag_Layout;
+-FmXmlFileTag menuTag_DefaultLayout;
+-FmXmlFileTag menuTag_Menuname;
+-FmXmlFileTag menuTag_Separator;
+-FmXmlFileTag menuTag_Merge;
++extern FmXmlFileTag menuTag_AppDir;
++extern FmXmlFileTag menuTag_DirectoryDir;
++extern FmXmlFileTag menuTag_Include;
++extern FmXmlFileTag menuTag_Exclude;
++extern FmXmlFileTag menuTag_Filename;
++extern FmXmlFileTag menuTag_Or;
++extern FmXmlFileTag menuTag_And;
++extern FmXmlFileTag menuTag_Not;
++extern FmXmlFileTag menuTag_Category;
++extern FmXmlFileTag menuTag_All;
++extern FmXmlFileTag menuTag_LegacyDir;
+ 
+ typedef enum {
+     MERGE_NONE, /* starting value */
+@@ -152,19 +131,19 @@ typedef struct {
+ } MenuRule;
+ 
+ /* requested language(s) */
+-char **languages;
++extern char **languages;
+ 
+ /* list of menu files to monitor */
+-GSList *MenuFiles;
++extern GSList *MenuFiles;
+ 
+ /* list of menu dirs to monitor */
+-GSList *MenuDirs;
++extern GSList *MenuDirs;
+ 
+ /* list of available app dirs */
+-GSList *AppDirs;
++extern GSList *AppDirs;
+ 
+ /* list of available dir dirs */
+-GSList *DirDirs;
++extern GSList *DirDirs;
+ 
+ /* parse and merge menu files */
+ MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError **error);
+@@ -177,7 +156,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char *menuname, const char *fil
+ void _free_layout_items(GList *data);
+ 
+ /* verbosity level */
+-gint verbose;
++extern gint verbose;
+ 
+ #define DBG if (verbose) g_debug
+ #define VDBG if (verbose > 1) g_debug
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 2c03125682e5..17e172fb352f 100644
--- a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
+++ b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,10 @@ 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"
 }