gentoo resync : 09.03.2018

11 files changed, 227 insertions, 6 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index b2b3a59d84bc..9e707412cf83 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxde-common/Manifest b/lxde-base/lxde-common/Manifest
index 634e840f4abc..5e65bc92aa8d 100644
--- a/lxde-base/lxde-common/Manifest
+++ b/lxde-base/lxde-common/Manifest
@@ -3,5 +3,5 @@ AUX lxde-common-0.5.5-logout.patch 415 BLAKE2B 98d869d3dc10ac1d9a428141d22d433a0
 DIST lxde-common-0.5.5.tar.gz 899075 BLAKE2B 425de7d65ff7ef100c1c5d6cf6758b44121374ea27823e1ba565b43b32e35aeea9ff62cf0f5d7ad114f0c4d04fdbdff60f04dcd18542469b3aa9f6107619d78d SHA512 44848286ccf3aa269df1680e14a8d3c41be1c2af956bd5121fc05d97a892fdc13d1e74191a2a11a40e96a8f31f8be37b1cfb9afeac4474fcab88d07508647c7f
 DIST lxde-common-0.99.1.tar.xz 889656 BLAKE2B 21c0ca21adb6c37d27bf39ee474a0e1d80c62d2ffb7ddadea3abb839163a307c81b8a6fa6ea6def00a0e8bf22ca9953bf145840371de65195e7036ee891bb0b5 SHA512 f5a14c44d827ba2355efd10c78732157f5645392ebbeb8e2a8126340a36eeba2842eff0c5338bb36623e5fe2da894c89d60a45c0b177704e2260413d63232b05
 EBUILD lxde-common-0.5.5-r3.ebuild 1085 BLAKE2B 8d2b8622b9da8bb811b0e4a3cb4b5cb1b0d0a6f614fe1d9a2bc0cbb16b47d6de0ccf7c9bd635e7c5c2e98333a387a3410018955c1d253f3de347b25fac689cf4 SHA512 2f6fc9eaee15975ade75a2085f959bdb7356ca4696c4d42be7644524bd72e804f902e3dc35d3c006bc4e2195430d37a75900de40a195ee7edc867ef791c289cc
-EBUILD lxde-common-0.99.1.ebuild 722 BLAKE2B d3ee129a0219981fbbc0eac5ebb69f8a52f6616169ce6be5786353d5f2be31b9e6c1533f9e7cea7b24dc0b66b5e3772aba59d53942f16a5357d91dc7a7813ec5 SHA512 cedf54a029a323966a0d073facff57662a99658c406d9238f6125646d1f5949c0ed7d55a0f8193be38413e2872d6565200d16fac938ba2a32c40872f932da9ce
+EBUILD lxde-common-0.99.1.ebuild 721 BLAKE2B 900e327bb7ef52fba50d4f10ac0c6aad71e7b7521cd5fc97abf175fca3e4829982995f960be5b9002943139c5229523c8de1b45b93a4db88b046aca65444c1e6 SHA512 7cd4c93993074be08490bf1bf8c7c8db303a7996056eb236976c3d3227b481e95773288044dea4197debd72b1675c996e3b8315744aeb096bd86ded281c4219a
 MISC metadata.xml 335 BLAKE2B 8cda3e7dd4b3668ffc5c311b5f002afaaff19143f058eb873d5d917c63f6752fec6da156d869061939803ea0bacbed80ea0a56e92d53b6e06025ed9b3f3c9462 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7
diff --git a/lxde-base/lxde-common/lxde-common-0.99.1.ebuild b/lxde-base/lxde-common/lxde-common-0.99.1.ebuild
index d0be3feda6ca..342bea64e2c7 100644
--- a/lxde-base/lxde-common/lxde-common-0.99.1.ebuild
+++ b/lxde-base/lxde-common/lxde-common-0.99.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ppc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index b44ba6f09994..cbb69cb26ae2 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -14,6 +14,6 @@ AUX lxdm.service 277 BLAKE2B ec9204c869c2189fad0978e38de5d48ca7409d7ade3e3ca10a7
 DIST lxdm-0.4.1.tar.gz 296714 BLAKE2B bcc2122a5a9bd59e3d29b8e7932ebc5f399cf3bb6ae2bda02329f7b82ff54dfd4c2b7cf5675d917e9db1df354cfad43a39febefe3ef29284fa09c33a76bbb2d6 SHA512 8ed4a955a910def4db66958d1cb24976db178b8763199a024b6c2119894745e3646566c42d01472dffbbcbb7fd21784b01e74dc88038e01caebaa3b6d720ff27
 DIST lxdm-0.5.3.tar.xz 239132 BLAKE2B 9d27feb60452af49127972ce0ecdc25122f5f86961f65512fd6c185c5d6ca03e637fab703fa2df156dba8a3d0ef4e7cf9f55e20762ba49bb14dc4ee8a82b1fa3 SHA512 0e3539c595a71cb850c1756dd075b8d477a4e111a4167714057cac06650e9587f338f797f14122e7b2a2f4ad35b38cd7172b83e996758abeeaf0146d65bbc26f
 EBUILD lxdm-0.4.1-r9.ebuild 2118 BLAKE2B 9fa163b1770cda852f917a282c1cc2236b3eaea7cb2d79d3775cfb631b3fbb6d4eea31e5830d9ad29f3168110700bb4adacaf97a7cea0d5ccee1ea8e2f75d47c SHA512 405de3b534bd45d447ad537a967c776d2ff8d6e2a9e644d36a4949e84ccd9b9a91063d5e3dc468deae282212e89193006ab0fc89549c988b5c0de60153502f6f
-EBUILD lxdm-0.5.3-r1.ebuild 1589 BLAKE2B 870519856279665f8bc102ab665b2af419f069aac4e62736081d258c1cfddab64b75d6c3acd86a65dd51b460cdc6d050fc9795dba80a6c18fd0c0de9050506fe SHA512 883c14b2d2888a39e68af0e91b3c466adf752aac6179571dcedde655c9d78b145df70544ad67fd221c63739795e74cfe9619794af77eeee5792477d277e1de6f
+EBUILD lxdm-0.5.3-r1.ebuild 1588 BLAKE2B 2a0fecfe6b99c275c480e852f12ac6b20b67cfd03b0d0a622448e640f3ff9785e1a2f49ceb7b1ed549ecd2cc1a2b306a45a98cf7582e95ab3936aa1298623da4 SHA512 cc5c7380c6a2aa3eb17200cfb6096956ca4b655f9468e994d4d6a70f0e0af89f9547efacc7d62b4a396d23b565e675f636dcdd3c9b67cc0002e97ee73bca37a9
 EBUILD lxdm-0.5.3.ebuild 1452 BLAKE2B 565035879cdc1f1bb81df23c5cafc06890548c6287f248e23db4724bd0f6863ebf4931e1e58915ddc93c927174de12a8e47e0f2905d5e435d6ce2f8ed632b8f7 SHA512 1f163c3ad52bc6286f1ff51651567eec708f2998b6f7e6a01c96a44dfbcd91d8e123e0f766427b2107317d5c620d855b2c074dc59c45b658983bb016307600d8
 MISC metadata.xml 581 BLAKE2B 1fa67dfa056b08a3797120c83b23a11014a0b15a0c9ca6f6323c77ed80654c67cf1ffa7f4877af66286bf739f77ccbd7a997459abc85d7db7d240519bd60d496 SHA512 bfb1509cb2c43f2711a38c284a1a4152192b91c5a9f681fe063848cbeb39e8a2185d2bff084d08b0d9583cb2482101e23ce955aa9b81606a2bc270a657d7a2d1
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
index 720d8e8b2971..2f6a808f1525 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 
 IUSE="consolekit debug gtk3 nls pam"
 
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index a7218c03132d..c8cf28f72301 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,5 +1,7 @@
 DIST lxterminal-0.1.11.tar.gz 304025 BLAKE2B 88e0172bcfa5e310f9ac726fc2cb03d6300eed8876203f641721d3b3b81b05af143e6184abb45748b02ae100ab6e16494e7d42facdd1f28d8b45c6ace59676aa SHA512 4f929e9177775c78dcf4c440e1cff4f4824f56ff5bd165cb76ab42208db350feeb08d22449a482b3979160873b0120a78ace43069d910b5aeeec0736aa550139
 DIST lxterminal-0.2.0.tar.gz 248698 BLAKE2B ca65e08baf22410a4e93d18ecc05e27329b9aaa555a945d81dd4f0e74a88205ff3345c34524304ab216a81fe21cc266fee1dc74381d1b6c3d315f3e50efce2a2 SHA512 5bec0e16fa4d929203e4c206fb59fb0c88e02f29adbf527c31fa2a0007d3dddbdf12f2219e204360b5dd95a68a89410fcf937325f3a7eb1229b568c9c10c0e78
+DIST lxterminal-0.3.1.tar.xz 197628 BLAKE2B 9448855b6d1bfc3fc272ec40f7e5b4fde1dfcb861254db3ed35b73611fd2dc5ca5d760542251f297289a051913e6eb6d669b2c04b194e01862ff7e79305c2e14 SHA512 3063eb7bc7426293d35dc1d9c32d5841e4c3f0b417f3cfa3e5a7bf4d9b71df9c9d375d53d6dd6694b318085ba07167bd8403b2caea9c6e9197aef4b7802877fc
 EBUILD lxterminal-0.1.11.ebuild 603 BLAKE2B edb2eff40e44f3ca6603cbc6003c6dd61d6aadb346e8645923fc43a002510cb1f5e2cd5d01af25378447a6da270289346b84436281d52d1e2b7d5cfa7190893c SHA512 3987739c16c86f08e1ae7df3177934f2e290e215bf0044271af26a559944fb6c59ea935efb84b710d5e2af7d2cfd4c9fe71e84e2a552dcab993f1b6c411f83a5
 EBUILD lxterminal-0.2.0-r1.ebuild 658 BLAKE2B 17d722e0344c2bfbeb134ffbbefeaa18b7fa6b75f923229f962bfe53c0bd00da0d3bcc55f9eaca9d551a92f49b376ddbee3b10640c11a96a7427d05eb6b37f7f SHA512 d84e773bec3f05d8f07b3799cd76623d30cc4202bcaf3a61e840044a687acc5fff1bef795407ad8821c381e66bec6da17de1b93bb5cbe94d67c0cf6c635af8a8
+EBUILD lxterminal-0.3.1.ebuild 1192 BLAKE2B 927945918dbd0db4900ce74d512317ac80560476ca0150bc881253648af47440fcbf62fad5f8d2bb3bfdf031c2e6f73ab07ffca4bf216b74932bd658e6270546 SHA512 19e41554a48eef86f943a98553faf800f1397b5624f056f7e3c7f56ff0f8a515e528b9d07e0e885ed5709fa508a6746e59edfa12bbf3a08512bee0c05f32d134
 MISC metadata.xml 408 BLAKE2B 46853cfafd4a24907018aa2f99cf01f261d2ba37bdadd119e70493a6632e14b8dfec1dd0359c2192940c0c272d38e7c482a83590c7e775a06587b0bf4059e57b SHA512 2542f3365bcca18cfbb25bbe5a58b569bc7480ab42df1d86238e7dc1b52968387440f588394421b7b9ddcebb3c26709630a92ad3670684fa6b510d1cabc58907
diff --git a/lxde-base/lxterminal/lxterminal-0.3.1.ebuild b/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
new file mode 100644
index 000000000000..c6b5993d83cd
--- /dev/null
+++ b/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af ar be bg bn bn_IN ca cs da de el en_GB eo es et eu fa fi fo fr frp gl
+he hr hu id is it ja kk ko lg lt ml ms nb nl nn pa pl ps pt pt_BR ro ru sk sl sr
+sr@latin sv te th tr tt_RU ug uk ur ur_PK vi zh_CN zh_TW"
+PLOCALE_BACKUP="en_GB"
+
+inherit autotools l10n
+
+DESCRIPTION="Lightweight vte-based tabbed terminal emulator for LXDE"
+HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/lxde/${PN}"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gtk3"
+
+RDEPEND="dev-libs/glib:2
+	!gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 )
+	gtk3?  ( x11-libs/gtk+:3 x11-libs/vte:2.91 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
+	l10n_get_locales > po/LINGUAS || die
+}
+
+src_configure() {
+	econf --enable-man $(use_enable gtk3)
+}
diff --git a/lxde-base/menu-cache/Manifest b/lxde-base/menu-cache/Manifest
index ca1ca9566659..b4bd81305e55 100644
--- a/lxde-base/menu-cache/Manifest
+++ b/lxde-base/menu-cache/Manifest
@@ -1,11 +1,15 @@
+AUX menu-cache-1.0.2-CVE-2017-8933.patch 4631 BLAKE2B 86c7a0b99ed3e85f3793e7eabca1c56fd0dad8719d4384218e746913a94359c4f16e1c239cf64622e8583a860c457d3b50f9f2f5182cefb4f2ad08ebe71a3813 SHA512 54dcc28b9c2188e921096d22be9729c8bcc366bc78b8a2dae0146aecdf88e6ee3455d2ddeaafd760e6ba0e22e48fba3c6c11edf8e5edd40fd4650ca671baf6a2
 DIST menu-cache-0.3.3.tar.gz 392291 BLAKE2B baf9eb9013a1a208ca69d388cdf902ccb8303a3c44fd92ba475acd6ebf36a1fd802b50e74889c618ea37074f4834ce4167e497ff3fcfab6ffffe146f3d8a3e6e SHA512 1966b94989cdae0a1a3a48f19d337471a28acadecf7f03dac8c27d515324b8eb4d15102e2aa293c251e020f521f6e586aa13c8eca7ae7909b9ce5e67ef3ebafe
 DIST menu-cache-0.5.1.tar.gz 406329 BLAKE2B 14851fb55b15d2e5262e8ca6de55a4fb14bdc56741ad00979dcb5f8b4e57d9db71543700658ab8aeecd0a40d4eef91f18c9a854352c7c10816ec35cd0d34f9bb SHA512 44d55a01f5452804e77518c4a2ba400a5b65edbf4061e346a6c02356195867eaa0bb9eaa057fbf603ddf79759acb16632bf3b7ae543eebc1544e28517cd23066
 DIST menu-cache-1.0.0.tar.xz 261988 BLAKE2B 126aca354efff42ea51336b4cb0c8cb42240b1c95ba3de0862fb2a2ee31da04c85c5b4c0b442bf00c7a96311b8b6c5cf45a6299bad4c638559b8d8e69ac53a48 SHA512 b336cddb9c3d993aa605e6adf9ac3c40fe631eccfa06d1835897f6cb5ae82bed93bc323c12b7dff44b8785dfb646058d77cb697f3c275998a5483b2582926e22
 DIST menu-cache-1.0.1.tar.xz 262508 BLAKE2B 82019f7a6b596cb0f4da641cdd70c5b96fd75d2e63192391b556c6f1d40fdfb90047a7febef44f10fe9357c0682d8c0fa931b0ff45462ba1b6578e5c9c44656f SHA512 5de4bf99ab5a511da6781d54b03349cc0232b379a73f9f9c328fb9aed6ec03558a9adda85be1fbbe53d94669d07a5196929ab67cd3291de7aae59f587afda3a3
 DIST menu-cache-1.0.2.tar.xz 264540 BLAKE2B 500dd761cf2c5771a89fd0f1ed58f5f736be816a75af5209041dcabab0fe5d3cd04b14749ff1cde88bf0a536a6c13f3a32ecf1a55663c52ab379c65951dce3e1 SHA512 4a74d464778160052ca7c2abda8c899ce4a3bdf8ddf5fe9ca4cd7297a62340ad1b065162fc5ecb55c0af206175e50dacd4ad0c01a8ffac5690012e534dc3b4b7
+DIST menu-cache-1.1.0.tar.xz 265524 BLAKE2B af7caea53a30be53836ccb7d75b0817aef610815009f22dc56fb6d412508ce27a6a5625c25f92faaafe8123dd73ddb2b3f83484e48c1b5deb635c9d630cc868c SHA512 e4c6619ade7b9a1b97c1366bb94dffb9975be5664b193cf0c69cf9470ef7ae19bda3390d04d98ee9a5b1658ec48aa5c83508c26c347af689161ee67c076b3c9e
 EBUILD menu-cache-0.3.3.ebuild 478 BLAKE2B 6cc6cab53da51047e81d04e58a740a43c0517c428607a9994967301aec89f30ec74e0c7cd3d826845a54512fc01c135b3e6ac6d80d4250bc47fc4c0dbeae3107 SHA512 7dc179652dd996b711d5a8d1b893214861332b9877125e8319506a3f7cf8c9901e826de9a4d58ac39b933c117d40bad11eb0cb5213c533b04418c03e48d41693
 EBUILD menu-cache-0.5.1.ebuild 522 BLAKE2B 02da03184da61002d1e4fe4464a80d465419f825bd6605c6302f1d2cf923a19ec2805f1b20f53b3b3e812539db3e87deb03dec070c29101ad2c62cea3a8d6a93 SHA512 6f16123ff84c97f8efedde35611d4d6606672f722952189aa55c73bb0de06a6707c249de76a089664e32d33754e3de73082fb9f10c2ef35faf9f182704067972
 EBUILD menu-cache-1.0.0-r1.ebuild 544 BLAKE2B e39886c3cec6f5bc6e684dcb0976c5504062f7369ab60288463202256ad367eb30003aa5b120410c64f39cd46db593b204f864c261b0b6e6d73a95dffdd7eb88 SHA512 695a5c00b7641cbc0e4fc4276ed6d0e245c0a2e1ef396cf90429984100cd651bf7ff72757ae3802dba46f32eaa2f6e8c4a116f0815b92a286fc74240a5796606
 EBUILD menu-cache-1.0.1.ebuild 542 BLAKE2B 4db007b54508279e1cf8bed97a226d45b0ebee3e51d594798107b15d7b7a8e6143b6120a8819e79efddc415664db3341e5fef0385922866b940c2975c0ee08d2 SHA512 1811f33ea471c5a48b3db71a16900d56746e232654fc349280190ea767ecd5f2249c205287157fb15ced4ca9e2ec69182ba265ed0d165a3c877a8ee1aac5709f
+EBUILD menu-cache-1.0.2-r1.ebuild 609 BLAKE2B 172c61fb66b0782b1f567549b85beec1299a96cfa0c34bfc1ac460420428db698d0dee02ea7ffd50c6e3a81d1adcbceb682ace432f64403f362a5fb38cee587b SHA512 6f4b81e829b66f9b66e3a4e8038ea7f7b560b322ea4b941fd85fe04d1abb4eaf2efff09ea9dc62716505b9980d8c9c35350ef41bb7c6f6a517d2537c2cfeacc5
 EBUILD menu-cache-1.0.2.ebuild 542 BLAKE2B 62a7f01f87e8f1c6ef5742253ee1759e2669e0beab3639a77d89ff3ecde534492d4ad2b6c8334ad1731a58ae2bd449f2a13da9dd73056dddbc02ac4e0fe6bc51 SHA512 10902ab7ae5f3c133ba3f8383751e888751aeda4d0d2342ef25959c8031db146f7c80c668ae9457c46212612ddd49786c7547c8d0dd16198349def69905f3346
+EBUILD menu-cache-1.1.0.ebuild 597 BLAKE2B 2ba1294bdb1bbc301ff66a9c401269d7d9b69a25235d85199c284c1c3ba1efbcb84b20008f6e0c3e8b84aced15e03a6dcc19971fa6dce86e49b5c7a0e61cc589 SHA512 932f67b3f0f44d8e56746bc356b023da9050671ac420c68d7341bc86e22a70a4c34a866dfc2577493d41e9a0f8706a5a8942e487ae6ae46da01a631a940f06e3
 MISC metadata.xml 438 BLAKE2B 22ac961e4ca76cf28e725a25d16767e5ec9c8d56cde16f3e613f5c1f56bce4eee38583f524796cb868301d2400cc3242fb466061edc140e28043a132bbb26b9d SHA512 406a5d2489fe96131ecbdcdb8570daa229a4360f393037b76b2d3bd4a7eaccb5dfae9b0d4c6915d0a09d2ef04d879c01b16bdf5c7af648eed87c53a09aa82bfc
diff --git a/lxde-base/menu-cache/files/menu-cache-1.0.2-CVE-2017-8933.patch b/lxde-base/menu-cache/files/menu-cache-1.0.2-CVE-2017-8933.patch
new file mode 100644
index 000000000000..89ce5c501b0b
--- /dev/null
+++ b/lxde-base/menu-cache/files/menu-cache-1.0.2-CVE-2017-8933.patch
@@ -0,0 +1,122 @@
+diff --git a/NEWS b/NEWS
+index dcc572a..6177e9d 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,12 @@
++* Fixed crash with invalid <Name> tag in a menu.
++
++* Added new API menu_cache_app_get_generic_name() to get generic
++    name for application.
++
++* Fixed potential access violation, use runtime user dir instead of tmp dir.
++    It limits libmenu-cache compatibility to menu-cached >= 0.7.0.
++
++
+ Changes in 1.0.2 since 1.0.1:
+ 
+ * Fixed crash in menu-cached if cache regeneration fails.
+diff --git a/libmenu-cache/menu-cache.c b/libmenu-cache/menu-cache.c
+index 3bc9cfc..d914127 100644
+--- a/libmenu-cache/menu-cache.c
++++ b/libmenu-cache/menu-cache.c
+@@ -3,7 +3,7 @@
+  *
+  *      Copyright 2008 PCMan <pcman.tw@gmail.com>
+  *      Copyright 2009 Jürgen Hötzel <juergen@archlinux.org>
+- *      Copyright 2012-2015 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
++ *      Copyright 2012-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
+  *
+  *      This library is free software; you can redistribute it and/or
+  *      modify it under the terms of the GNU Lesser General Public
+@@ -1234,6 +1234,22 @@ gboolean menu_cache_dir_is_visible(MenuCacheDir *dir)
+ }
+ 
+ /**
++ * menu_cache_app_get_generic_name
++ * @app: a menu cache item
++ *
++ * Retrieves generic name for @app. Returned data are owned by menu
++ * cache and should not be freed by caller.
++ *
++ * Returns: (transfer none): app's generic name or %NULL.
++ *
++ * Since: 1.0.3
++ */
++const char* menu_cache_app_get_generic_name( MenuCacheApp* app )
++{
++	return app->generic_name;
++}
++
++/**
+  * menu_cache_app_get_exec
+  * @app: a menu cache item
+  *
+@@ -1522,8 +1538,13 @@ static void get_socket_name( char* buf, int len )
+         if(*p)
+             *p = '\0';
+     }
++#if GLIB_CHECK_VERSION(2, 28, 0)
++    g_snprintf( buf, len, "%s/menu-cached-%s", g_get_user_runtime_dir(),
++                dpy ? dpy : ":0" );
++#else
+     g_snprintf( buf, len, "%s/.menu-cached-%s-%s", g_get_tmp_dir(),
+                 dpy ? dpy : ":0", g_get_user_name() );
++#endif
+     g_free(dpy);
+ }
+ 
+diff --git a/libmenu-cache/menu-cache.h.in b/libmenu-cache/menu-cache.h.in
+index 76ea7b4..cded59d 100644
+--- a/libmenu-cache/menu-cache.h.in
++++ b/libmenu-cache/menu-cache.h.in
+@@ -151,6 +151,7 @@ MenuCacheItem *menu_cache_find_child_by_name(MenuCacheDir *dir, const char *name
+ 
+ char* menu_cache_dir_make_path( MenuCacheDir* dir );
+ 
++const char* menu_cache_app_get_generic_name( MenuCacheApp* app );
+ const char* menu_cache_app_get_exec( MenuCacheApp* app );
+ const char* menu_cache_app_get_working_dir( MenuCacheApp* app );
+ const char* const *menu_cache_app_get_categories(MenuCacheApp* app);
+diff --git a/menu-cache-daemon/menu-cached.c b/menu-cache-daemon/menu-cached.c
+index a6895ee..c100484 100644
+--- a/menu-cache-daemon/menu-cached.c
++++ b/menu-cache-daemon/menu-cached.c
+@@ -473,6 +473,9 @@ static void get_socket_name( char* buf, int len )
+         if(*p)
+             *p = '\0';
+     }
++    /* NOTE: this socket name is incompatible with versions > 1.0.2,
++            although this function is never used since 0.7.0 but
++            libmenu-cache always requests exact socket name instead */
+     g_snprintf( buf, len, "%s/.menu-cached-%s-%s", g_get_tmp_dir(),
+                 dpy ? dpy : ":0", g_get_user_name() );
+     g_free(dpy);
+diff --git a/menu-cache-gen/menu-merge.c b/menu-cache-gen/menu-merge.c
+index 816cf96..31f05b0 100644
+--- a/menu-cache-gen/menu-merge.c
++++ b/menu-cache-gen/menu-merge.c
+@@ -1,7 +1,7 @@
+ /*
+  *      menu-file.c : parses <name>.menu file and merges all XML tags.
+  *
+- *      Copyright 2013-2016 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
++ *      Copyright 2013-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
+  *
+  *      This file is a part of libmenu-cache package and created program
+  *      should be not used without the library.
+@@ -138,11 +138,13 @@ static gboolean _menu_xml_handler_Name(FmXmlFileItem *item, GList *children,
+                                        guint n_attributes, gint line, gint pos,
+                                        GError **error, gpointer user_data)
+ {
++    FmXmlFileItem *name_item;
+     const char *name;
+ 
+     RETURN_IF_IN_LAYOUT(item, error);
+-    item = fm_xml_file_item_find_child(item, FM_XML_FILE_TEXT);
+-    if (item == NULL || (name = fm_xml_file_item_get_data(item, NULL)) == NULL ||
++    name_item = fm_xml_file_item_find_child(item, FM_XML_FILE_TEXT);
++    if (name_item == NULL ||
++        (name = fm_xml_file_item_get_data(name_item, NULL)) == NULL ||
+         strchr(name, '/') != NULL) /* empty or invalid tag */
+     {
+         RETURN_TRUE_AND_DESTROY_IF_QUIET(item);
diff --git a/lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild b/lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..736a786ebeac
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="http://lxde.sourceforge.net/"
+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 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-CVE-2017-8933.patch )
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/libfm-extra"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
diff --git a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
new file mode 100644
index 000000000000..5592bfbcbd34
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="http://lxde.sourceforge.net/"
+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 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/libfm-extra"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf "--disable-static"
+}