gentoo resync : 20.03.2021

37 files changed, 511 insertions, 260 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index cd70c2b83f9e..d7287fd26be8 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxappearance-obconf/Manifest b/lxde-base/lxappearance-obconf/Manifest
index 9537ec3004a0..2a1f90f7d4fe 100644
--- a/lxde-base/lxappearance-obconf/Manifest
+++ b/lxde-base/lxappearance-obconf/Manifest
@@ -1,5 +1,4 @@
-DIST lxappearance-obconf-0.2.1.tar.gz 418312 BLAKE2B 2bf9de28e478e7b91fec67c9d0a8577897d54a7dec978dbe315ee8dc050dc5b3ec5cb44c00bf5ad9b533b000a3a9820e5d5d14ae690667ee74dfa55da8156a4b SHA512 f37a981005ba7c4d1ba0a00ec189d6978cd521b9742d0356f1b29685646f9cf78953c449bdee48fabff21e98f676d22c9916d03b0256d59e159f2947e4a41c5e
 DIST lxappearance-obconf-0.2.3.tar.xz 290204 BLAKE2B 3f222419e147232eb805e8b86a29993fefbf80008cc3cd98d048a0b3b2799fb3672571f87666917136ad17c1b4b6bd649194599d684bb14a574ae40d0d127d99 SHA512 cec56238b2b8ea86ab310fdf3d9d43ef665aac7762018a296803ef7caccb6a5a7854c4b17e0028152b379a373602ede30edb02811a9a370ba369b62bb3caee09
-EBUILD lxappearance-obconf-0.2.1.ebuild 440 BLAKE2B 9f6bf8a9da541ebcc30e35aba691d551db4051ee0afd3c875b84a4e14adc7646f7ef575378b52ac05359447acd34357ad1d338c5abb0275a267eeba369a1be60 SHA512 61e90d815459ea36ae31632063d9c44188338182ce236808c1adebe99bc9057c4a7865a2d5ad3bbb8ce88dcb41971c0420af32576f7295b01f17b1580088bf37
+EBUILD lxappearance-obconf-0.2.3-r1.ebuild 880 BLAKE2B 9d8603bfd7a64e6cab88aba080e4eeeb4580816ff3b7475ec4b0522b648274c8636d07c212ca1829dc0e18439394e28e15a6f3bba122e11b88bf56d022e8a7cb SHA512 6fb944a854ad2a9bee6fb7d9531b01c810a03e56afdc6035285bc1c95c2216fc62b94454177f81d0754a7a5a27bc463885272534dcbdfa835765ad41f9492a15
 EBUILD lxappearance-obconf-0.2.3.ebuild 508 BLAKE2B 1395bc10582ce059c70721ec2c390476b7d0b72a8402badf044fb98d41dde2a0fbb50805e185a64e93c2aee31ec8faa326d1e7be6189d557dee604e3c56f0f50 SHA512 b926e31dcd7f7076755b1275257c5151084c1fedc72d270574b3cd80c1c9d892d718591a2b4b248b3d3604b8c32a5b5bf42fbf4def49a7c8be40520cc9a47009
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.1.ebuild b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.1.ebuild
deleted file mode 100644
index f5174e1d6d53..000000000000
--- a/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="LXAppearance plugin for configuring OpenBox"
-HOMEPAGE="https://lxde.org/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86"
-IUSE=""
-
-RDEPEND="lxde-base/lxappearance
-	x11-wm/openbox"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool "
diff --git a/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r1.ebuild b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..ab03ab7ac90f
--- /dev/null
+++ b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="LXAppearance plugin for configuring OpenBox"
+HOMEPAGE="https://lxde.org/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
+	>=lxde-base/lxappearance-0.6.3-r2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/harfbuzz:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/pango
+	x11-wm/openbox
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-gtk3
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/lxde-base/lxappearance/Manifest b/lxde-base/lxappearance/Manifest
index c9b97b51019d..d5900120558e 100644
--- a/lxde-base/lxappearance/Manifest
+++ b/lxde-base/lxappearance/Manifest
@@ -1,4 +1,4 @@
 DIST lxappearance-0.6.3.tar.xz 165656 BLAKE2B d76d3d9b270e18e46cad44d204d1d5e4faf20bd6c292bf8dd17c2d570fa0276f183489c39f115c189b525643dbd03d0a1b1681f7fa0f61171bc822d8250ef513 SHA512 035cc952a33ac25408a4158cb4e745b17af3f29b5ceedfbe6b37235d16c801658403e862cd35ad7c8ca20fe6186fab1dce74a6e8d3b2eec12a30d532fc21662c
 EBUILD lxappearance-0.6.3-r1.ebuild 887 BLAKE2B 996ce905d8bb6d5cd10eddc4bbf64fc8be6945b6b43481eda564bff5386f61bbda66f93ec710becf4a8700f6d1ac8c6e3200a4cc4064aa12c3f5f88b60e2ca7d SHA512 4572a766c97c791202da1029fa129073a532933fa025918e9c9574efe38a80969a891940889b0eec350c34b7ef8f0a083fa127738515e24dbdd087d6c4b38c39
-EBUILD lxappearance-0.6.3.ebuild 548 BLAKE2B c32288e4a082b562a794aa9ebacb672a1cdf29d3a073d3ffd08b2fbd4d35ffdb8aa22de013681842767f11c324034a9019bf8bb68dc3c2df63acd0f6c001a7c5 SHA512 0abd933d6b74d3e659de7f936f5c292a33a5b93580651fe80ff62b1b6b609b6bdd704a11b948f5b2e972834d86f2685aa407dfe9418fa4e03a1c14ccc0c9425e
+EBUILD lxappearance-0.6.3-r2.ebuild 646 BLAKE2B 00e63cb1790851a5823ae278ea7c621c45ff95406c15c23e6a73b0e4625b83458682dabe645585cc95a050004e5c612ffbaf4fea90fec6ba3be2a2a7eb60e111 SHA512 2f818d703347d4255d596afc9a0d854b604d62b2a95931235c96668d2521d01c2ed37e2b8effe36640c3a5bad8f6c2b01e89eec6472f336268f7b462a7d37a22
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxappearance/lxappearance-0.6.3.ebuild b/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild
index ed729a1760a7..7871a1c7b61b 100644
--- a/lxde-base/lxappearance/lxappearance-0.6.3.ebuild
+++ b/lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="LXDE GTK+ theme switcher"
 HOMEPAGE="https://wiki.lxde.org/en/LXAppearance"
@@ -9,17 +9,25 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="dbus"
 
-RDEPEND="x11-libs/gtk+:2
-	dbus? ( dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 
 src_configure() {
 	econf \
+		--enable-gtk3 \
 		$(use_enable dbus)
 }
diff --git a/lxde-base/lxde-common/Manifest b/lxde-base/lxde-common/Manifest
index 048945e67f13..659489450977 100644
--- a/lxde-base/lxde-common/Manifest
+++ b/lxde-base/lxde-common/Manifest
@@ -2,5 +2,5 @@ AUX lxde 1989 BLAKE2B 80163b00c1de0dbe9ea02692c93bf041fef792d75d976a086ce7d66fe2
 DIST lxde-common-0.99.1.tar.xz 889656 BLAKE2B 21c0ca21adb6c37d27bf39ee474a0e1d80c62d2ffb7ddadea3abb839163a307c81b8a6fa6ea6def00a0e8bf22ca9953bf145840371de65195e7036ee891bb0b5 SHA512 f5a14c44d827ba2355efd10c78732157f5645392ebbeb8e2a8126340a36eeba2842eff0c5338bb36623e5fe2da894c89d60a45c0b177704e2260413d63232b05
 DIST lxde-common-0.99.2.tar.xz 889948 BLAKE2B c01b3af5499ed4efe3004c922563c752999921cadab36a7fd5fec56762334c93d22ca7a28e9a8e8ce3462e128bea493740d5aa9931c4bf26cdf8a8dcd1bfb9e6 SHA512 9eb939ad411ed15c6bae880541b5c021ce5f3dd66df8662865e2f7219159110d8bf6059a707e55863d04617b17a15ea517317c44f88982344369aa85b7128b6e
 EBUILD lxde-common-0.99.1.ebuild 705 BLAKE2B 0b7aceb84956852da07a19dcb03d8fa6f939cf2cc59d1f2d376bf06708bc904e2bcf72402b9eedd5142279268611d0019f2aecb468f00c62f04db741ddc35ab3 SHA512 0504b8762ce3b7ce34d99e96bce5ddf057a7d0ed57ed85a5cbde45f383bec955431a3130d26740514fd595fb0b8ab666fc03d21b7324cc950501f740662ab213
-EBUILD lxde-common-0.99.2.ebuild 692 BLAKE2B 3b5326f2b9cec3f0810d1b0867e7f057a9ce473bdf3b79e5c3469e9e1e3fe13caa7106e15a597cbd05e74a551ebe503746eb2b02be4ebe12b3739cc29bbb6f02 SHA512 169e791ab1748ec2918ccefaad625ec7e826c93509c4aa48d0f546836d54a8f8b3fdc5a4890cc95dc17d816e350aa6df158727f72445a0ee5ea6d3c4957d41e8
+EBUILD lxde-common-0.99.2-r1.ebuild 658 BLAKE2B b8969991e2c09a6c6063f30316ad8aa7cb0b494b8c8a1ab59e8374fabd99b56ee8c14a538998fa09bdcb97fc9e439e6c9e4aa18a941b9aac6ff4d143f665273d SHA512 640854b2cd21b882974c003a3aa0d101eb4815c9a78211fa43616b89fb00e0565f6c83dedf722fe621e198926483846329d2776a93dedbb93d47b32a190d4c98
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxde-common/lxde-common-0.99.2.ebuild b/lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild
index 10fbab6dc927..764cf19a11d1 100644
--- a/lxde-base/lxde-common/lxde-common-0.99.2.ebuild
+++ b/lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="LXDE Session default configuration files and nuoveXT2 iconset"
 HOMEPAGE="https://wiki.lxde.org/en/LXDE_Common"
@@ -12,10 +12,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
 IUSE=""
 
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+BDEPEND="
+	sys-devel/gettext
 	virtual/pkgconfig
-	sys-devel/gettext"
+"
 PDEPEND="lxde-base/lxde-icon-theme"
 
 src_install() {
diff --git a/lxde-base/lxde-icon-theme/Manifest b/lxde-base/lxde-icon-theme/Manifest
index cde835397fb7..ea63021477b8 100644
--- a/lxde-base/lxde-icon-theme/Manifest
+++ b/lxde-base/lxde-icon-theme/Manifest
@@ -1,5 +1,4 @@
-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-r1.ebuild 402 BLAKE2B cef96c6bd7483bcd9355a2984a0ec3e0efa7c9ec02a99a23c58e9f742acb5d64b7a7390986576677001e821504990182c591dd35d92fb8be14f3935030cf5859 SHA512 de132271c8bc0b2a35770a64babbbe3954975ef30b6911d883f4fcef5b55ed7c8b7e6f9878181e240bb4ffbc5639838ba53019d634450f484776e9d94c7482b4
 EBUILD lxde-icon-theme-0.5.1.ebuild 604 BLAKE2B 21bfa9adebedf6534725d451795c9a51ca3efda7d44c5f26b40ba3ff8ac0232334aefc86db42e211cb2ebcf719b4daf05507229280050d05bfcf89bfbc839f8c SHA512 1062b9c13986c3e3cae14b678d52d753c1c6b07267c6d12414ca595f9d893458fb72e0feb06a4e1fc203b878a7e1d25fe23fac8ea588058f63995f1105319cef
 MISC metadata.xml 241 BLAKE2B 98bfae51c09ce98581df5fe14356401f4bd8dc35ea5589a8c4665239d63d5576d97de1786790c399c5d5c0df7c705e3817078cd231951f912653d536296572d9 SHA512 5ff3ff6f88249ad29e84c55fd91cdff0999f9c6c9d9cce1f5ce52d7ca0214668ebe6d9111640f5666e6688c6126d52d62dcd69c0a4949593926c2073f428eef7
diff --git a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0-r1.ebuild b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0-r1.ebuild
deleted file mode 100644
index c14a0f35afbd..000000000000
--- a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit gnome2-utils
-
-DESCRIPTION="nuoveXT2 iconset"
-HOMEPAGE="https://lxde.sf.net/"
-SRC_URI="mirror://sourceforge/lxde/LXDE%20Icon%20Theme/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	!<lxde-base/lxde-common-0.5.0"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1-r1.ebuild b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..911b666ab3da
--- /dev/null
+++ b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="nuoveXT2 iconset"
+HOMEPAGE="https://lxde.org/"
+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"
+IUSE=""
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/lxde-base/lxde-meta/Manifest b/lxde-base/lxde-meta/Manifest
index 10132099674f..88486e886f2a 100644
--- a/lxde-base/lxde-meta/Manifest
+++ b/lxde-base/lxde-meta/Manifest
@@ -1,2 +1,3 @@
 EBUILD lxde-meta-0.5.5-r6.ebuild 946 BLAKE2B a38b9765a9f93bb327d1ceee3238ee52b6f0856b99d6ccd3f7237c29f4df713ec75726f7ac613556c6219cf928390d939566fa9c00e174c532e3df26a40dca1f SHA512 38aae97a243b8b69252b06cc941b3ecb7803c2ad164c6df56241d4817fd82102694db6a623cb2f4eec1b1a2054771c8d6a31f6854e48924bb6bbebfd06ea3956
+EBUILD lxde-meta-0.5.5-r7.ebuild 985 BLAKE2B fc9c360f4a7385eb2e50361133dced87839f215eca52074ba8400a90ce01f42e1bd2d28be6349e43f278e9684763ae208a3258f4d9f90170a3a0ecd9798d4aeb SHA512 b16410ffb6bb813784f3e73191fa9c15f27213792c0b82c97fb6cec3fae834dd7442309e90e80de698d63b7691bbe7d80eb0b884435c6ea5869f0415e247adb4
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.5-r7.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r7.ebuild
new file mode 100644
index 000000000000..be2acbb50c58
--- /dev/null
+++ b/lxde-base/lxde-meta/lxde-meta-0.5.5-r7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Meta ebuild for LXDE, the Lightweight X11 Desktop Environment"
+HOMEPAGE="https://wiki.lxde.org/en/Status_of_LXDE_components"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=lxde-base/menu-cache-1.1.0-r1
+	>=lxde-base/lxappearance-0.6.3-r2
+	>=lxde-base/lxde-icon-theme-0.5.1-r1
+	>=lxde-base/lxde-common-0.99.2-r1
+	>=lxde-base/lxmenu-data-0.1.5
+	>=lxde-base/lxinput-0.3.5-r2
+	>=lxde-base/lxpanel-0.10.1
+	>=lxde-base/lxrandr-0.3.2-r1
+	>=lxde-base/lxsession-0.5.5
+	>=lxde-base/lxtask-0.1.10
+	>=lxde-base/lxterminal-0.3.2-r1
+	media-gfx/gpicview
+	>=x11-libs/libfm-1.3.2
+	>=x11-misc/obconf-2.0.4
+	>=x11-misc/pcmanfm-1.3.2
+	>=x11-wm/openbox-3.6.1-r3
+"
+
+pkg_postinst() {
+	elog "For your convenience you can review the LXDE Configuration HOWTO at"
+	elog "https://www.gentoo.org/proj/en/desktop/lxde/lxde-howto.xml"
+}
diff --git a/lxde-base/lxinput/Manifest b/lxde-base/lxinput/Manifest
index 8faad2e8d087..9881d259d0be 100644
--- a/lxde-base/lxinput/Manifest
+++ b/lxde-base/lxinput/Manifest
@@ -1,4 +1,4 @@
 DIST lxinput-0.3.5.tar.xz 145356 BLAKE2B e3c96a1232329afa5030adffc17af4adf9afc3eb1049f860fe6ed115eb35d580c24a69a21a9a858790b9213b7d4dc716ab9e30becf42b4f9645f2ec642de538c SHA512 d5233f03c4314ac16fb548db56ae2d17651b29d8a59bfef3e6e6805f6b9bc8100b0711bbc72e31a6bc458eccc6fe1b4a38cf097dbf6a1b04f600bba58ff03f35
 EBUILD lxinput-0.3.5-r1.ebuild 847 BLAKE2B 870cf45c0a23c0aa33a593a2c83f46e2d694fe770dacc8bbe9eef6f2b65c48d4761bc09f734d38f6578cc1e47e3327bb927812affdd89327b40cacd8740bff65 SHA512 b9c98cbb3d826c07c61617f88b7a12b8a035363bcf719b1e9c6bd3b8997f242b1f19d467846eee50f177f6e18a82ab30548609533b0fcafc4b2f7e2b825dbed4
-EBUILD lxinput-0.3.5.ebuild 470 BLAKE2B 83d22dc446152ba2fb7a5f2ab2bfa082b8391729f3df3855a682dc50ca9f09318c94455607cf62fa97353c2f38225615f3c85eb1af5f2979a86f39be1fb0b2c9 SHA512 d7cd19bdea6ad60c4a7aced11a8dad42f038308eca252b808d47a33ade32c7973fdcb46ade29c657b22985f348edf90bf484af9811207bd1909188f0af4cc36b
+EBUILD lxinput-0.3.5-r2.ebuild 547 BLAKE2B 016c724d0f442739bd5ad0a5c34fe3fc87176f4f0963309a5c135c84c02f55a2f1a00666ee5caa214cb3226fcbba264ee60ccd0edbb0fe6b0354ad353d5bbb61 SHA512 53603aed96375b121d2575090c5d4cce4af6b58c3f1b93e6362a7fc124480086b2408f7f9adf60c1f4ac264a5b2c8c71479144ec7d3e681000b30e3f02112453
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxinput/lxinput-0.3.5.ebuild b/lxde-base/lxinput/lxinput-0.3.5-r2.ebuild
index 259073e29dc4..414ef3254f96 100644
--- a/lxde-base/lxinput/lxinput-0.3.5.ebuild
+++ b/lxde-base/lxinput/lxinput-0.3.5-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 DESCRIPTION="LXDE keyboard and mouse configuration tool"
 HOMEPAGE="https://lxde.org/"
@@ -9,12 +9,22 @@ SRC_URI="mirror://sourceforge/lxde/${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="dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.40.0
 	sys-devel/gettext
 	virtual/pkgconfig
-	>=dev-util/intltool-0.40.0"
+"
+
+src_configure() {
+	econf \
+		--enable-gtk3
+}
diff --git a/lxde-base/lxlauncher/Manifest b/lxde-base/lxlauncher/Manifest
index 2502b71ba29c..7ce0fbf41e9b 100644
--- a/lxde-base/lxlauncher/Manifest
+++ b/lxde-base/lxlauncher/Manifest
@@ -1,3 +1,4 @@
 DIST lxlauncher-0.2.5.tar.xz 131428 BLAKE2B fa12b7d49d0a95b6aa782c2bb338dc26677edf585b2b532e6d457771e450a8fba458c8c5638fd101edf079a3872a322418c44f01b4ccf6118c8a1377c6dd7a8a SHA512 3f57755ad6feeeb1daa61c29f142b997f8175ff0863d1749b3e28b83744d03e06a7f0bb373fdcd48364e307840dd05cd23b92109c75523e32d3eae8e183ed6cf
+EBUILD lxlauncher-0.2.5-r1.ebuild 760 BLAKE2B 7b121e6a7d0e44a53383eb86387873d9402cc8e02308b402807dd4369cfa85a749ce1ab5ec5a5d1a1255c05714de0617a9c21464783a25f038f43288b5f68e7f SHA512 70a08d74367db6e12413bf9f2dd1e981887871b5c0dc047654a342c45d8c601713e763bfe9c21bbc7956d09af9f4394d6db1c27e2f423745495f880180fc6878
 EBUILD lxlauncher-0.2.5.ebuild 674 BLAKE2B 07b729242ba3f233279ba2a429573cd62434d19848dcde7c8f54cc59dd79f5b66bf68995e7865a88fa27413fbc1b0274e300f3f732bcf504f98576e429d22cc0 SHA512 c02f47e78894ab730f0c6aebe3bc3ea0f92ec3d44049c6f8318fce537431680b5bf483be8a024a120b6dd1acf3880c4518d8dd7d8a1aeafe091446d3a53fff67
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxlauncher/lxlauncher-0.2.5-r1.ebuild b/lxde-base/lxlauncher/lxlauncher-0.2.5-r1.ebuild
new file mode 100644
index 000000000000..e472c53f384c
--- /dev/null
+++ b/lxde-base/lxlauncher/lxlauncher-0.2.5-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open source clone of the Asus launcher for EeePC"
+HOMEPAGE="https://wiki.lxde.org/en/LXLauncher"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/gnome-menus
+	lxde-base/menu-cache
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/startup-notification
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--enable-gtk3
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/lxde-base/lxmenu-data/Manifest b/lxde-base/lxmenu-data/Manifest
index 5b7311e659a6..6dfdbf12f562 100644
--- a/lxde-base/lxmenu-data/Manifest
+++ b/lxde-base/lxmenu-data/Manifest
@@ -1,3 +1,3 @@
 DIST lxmenu-data-0.1.5.tar.xz 199192 BLAKE2B 2aeec1e350a06c0fbdc74136590ce132944503f5e411df2c22a0db61cf9ccd02303b28326dde9d0b0ad5098327e9cc35c4a9abccb9ccec0c05370128e68d12ba SHA512 ea1a1ad511d9e56c7692a8d96feb52c53aa7bd7595f2312d4f41fc15a12a056551c70d6a2c55a30f849e2ac2fd1a06436751573472ae70e0158e069736578b40
-EBUILD lxmenu-data-0.1.5.ebuild 519 BLAKE2B 5ed8028dbe5ffac347c8f2d7e8841ad7007b1a62df7f3b59bf0a4c732499b39331b0ee3c17dd78fe3482dfbf6bd18f3b1563c181a8a63f2cec187cf097ab23e5 SHA512 12a18399ddabc568777ead2458ce5cff4a87971e416facfc38c390d07a0baaefcb84306fea2fe2e6b9df2444433244d81f41f133850e8fe58db4874785333ecc
+EBUILD lxmenu-data-0.1.5.ebuild 510 BLAKE2B 5a290a085beef9fab34cce8cc9aac8bf8bb4e71907cce41d524f8a942984016b432774eae9534baa63301bdad1781f6a7b2643d36f058ad1fa6c07b3ac152bc4 SHA512 9f6d9d6b979c91480d50020173dd0f3a8575cc5079e1cec1c4974e5117826545dbf63ddcab996af8f2f05c176e41afb6395af5c34fc9bb352557f5a6e9643f75
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild b/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
index a7b67eecbaf8..d6ecc4fb38fe 100644
--- a/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
+++ b/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 DESCRIPTION="Provides files needed for LXDE application menus"
 HOMEPAGE="https://lxde.org/"
@@ -12,10 +12,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=""
-DEPEND="sys-devel/gettext
+BDEPEND="
 	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig"
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 
 src_install() {
 	emake DESTDIR="${D}" install
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index de9793fce87d..57c24b3b9d06 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -1,4 +1,7 @@
+AUX lxpanel-0.10.1-fix-pager-panel-width.patch 1123 BLAKE2B cc4e0063e92b0cad0a9477635dff3f013aee4e71626b61c5f5a1e45d5c1bc374c47eb5448cf69086215b8c1a1a901cd78629acdd5d2b1a065ca3cb8853a7e792 SHA512 ffd529b5facb9394cc5ab6501688aa20e32a74da198e6e7004325dd9fa6ca0ee01697d17913ba1115aa7a4267cfcaac855deb8b7a8e98a6de5b330e39efaeabf
 AUX lxpanel-remove-gdk-pixbuf-xlib.patch 845 BLAKE2B 8dc597f7538134a5e7b04f61d415f90808dd7f9d19cc6cd2cef998d452a828158032e05041eb038643650de07fd3c89ea680e0f9f6d3e9bb427d9ad2717264d9 SHA512 73316023668d65286433297e7ebf82a21973af398177a4abcb755d09c8aa201c2c70932fe24b642092d3157a3fdf97a1c9746a47d719aeb0f2324751c4fd5220
 DIST lxpanel-0.10.0.tar.xz 1544700 BLAKE2B ea210feee23b2da1c9f6199bfc274c46e1142d6397ca0d1d8359329068ed6e46eaebff90fb220ce14121ed19cb5c60014230c7a7e42867318317845751418a7b SHA512 3e664eef3cf0f37cf4609f53f1f40f5d50e94ae088c497be0439851ea8f1426ef6ec1373d146e2e0ef1b9f51f557ae19eb5fb1059b0e5fcd5b1c49fd76207a59
+DIST lxpanel-0.10.1.tar.xz 1548276 BLAKE2B 2ea8628c9c4c7a77d65e58cae0b5656209db63b455299fcda00fe79aae1b139860ed8993ade7db68bbc65f61b8911f40879f1ef9993dc12f15f7480d3ea72cfa SHA512 0478ca1322a6645c5120e0fdb2b6d6409799f3296d971456670eb8b23b8457ae93a966ddcb5b5e5bdbcd694442ade2252d6a3931d36296e19e5339b2d689cfef
 EBUILD lxpanel-0.10.0-r1.ebuild 1931 BLAKE2B b1fdbb2c6dfc9d868bfefd35734ba4891d5e628583a04ae4edc7758127656da075f8a5417171a9b8672a7d10ecfa6030e61df627bc8a7f8e957df84a890838bc SHA512 f665ad7a88b9988474af4f550cb9f883dc78f2d118cb87578fb80053cf9c0e0b1b767979f575e9efd6a5d282c8781d77cd5e92e8353344f61ca982603802b811
+EBUILD lxpanel-0.10.1.ebuild 1634 BLAKE2B 4ca15ec4e011e39cd496e7d8d3c70e933ef8dc157a18ff997807e42b1a971a5f2cb7424d797b49799872480c7a6a91a6d4a85bfe3bab57efe491885ae7e4fddd SHA512 92e6e2c2d1d247d22c3ac3d3e1a190c107b2ed0c0fcc25f9a06bcb947a0417a344d96d57d74b9bbebcce14de05c3adf5e749ca148a64a911dfd63a9ba184b55e
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxpanel/files/lxpanel-0.10.1-fix-pager-panel-width.patch b/lxde-base/lxpanel/files/lxpanel-0.10.1-fix-pager-panel-width.patch
new file mode 100644
index 000000000000..4d53fc8f783d
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.10.1-fix-pager-panel-width.patch
@@ -0,0 +1,37 @@
+From b46e3a39786a5be04bf9cc3844dd184308cd7495 Mon Sep 17 00:00:00 2001
+From: Ben Walsh <b@wumpster.com>
+Date: Sat, 6 Jun 2020 10:38:15 +0100
+Subject: [PATCH] Specify GTK_REQUEST_CONSTANT_SIZE. Fixes #773.
+
+---
+ src/panel.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/panel.c b/src/panel.c
+index da9e718b..b52fc796 100644
+--- a/src/panel.c
++++ b/src/panel.c
+@@ -293,6 +293,12 @@ lxpanel_get_preferred_height (GtkWidget *widget,
+   if (natural_height)
+       *natural_height = requisition.height;
+ }
++
++static GtkSizeRequestMode
++lxpanel_get_request_mode (GtkWidget *widget)
++{
++    return GTK_SIZE_REQUEST_CONSTANT_SIZE;
++}
+ #endif
+ 
+ static void lxpanel_size_allocate(GtkWidget *widget, GtkAllocation *a)
+@@ -413,6 +419,7 @@ static void lxpanel_class_init(PanelToplevelClass *klass)
+ #if GTK_CHECK_VERSION(3, 0, 0)
+     widget_class->get_preferred_width = lxpanel_get_preferred_width;
+     widget_class->get_preferred_height = lxpanel_get_preferred_height;
++    widget_class->get_request_mode = lxpanel_get_request_mode;
+ #else
+     widget_class->size_request = lxpanel_size_request;
+ #endif
+-- 
+2.27.0
+
diff --git a/lxde-base/lxpanel/lxpanel-0.10.1.ebuild b/lxde-base/lxpanel/lxpanel-0.10.1.ebuild
new file mode 100644
index 000000000000..f8edfb798dc0
--- /dev/null
+++ b/lxde-base/lxpanel/lxpanel-0.10.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 xdg
+
+DESCRIPTION="Lightweight X11 desktop panel for LXDE"
+HOMEPAGE="https://wiki.lxde.org/en/LXPanel"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+alsa wifi"
+
+RDEPEND="
+	dev-libs/keybinder:3
+	lxde-base/lxmenu-data
+	>=lxde-base/menu-cache-1.1.0-r1
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	>=x11-libs/libfm-1.3.2[gtk]
+	x11-libs/libwnck:3
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXpm
+	alsa? ( media-libs/alsa-lib )
+	wifi? ( net-wireless/wireless-tools )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
+you will have to configure panel settings via its menu.
+This will not be an issue with first time installations."
+
+PATCHES=(
+	# https://sourceforge.net/p/lxde/bugs/773/
+	"${FILESDIR}/${P}-fix-pager-panel-width.patch"
+)
+
+src_configure() {
+	local plugins="netstatus,volume,cpu,deskno,batt,kbled,xkb,thermal,cpufreq,monitors"
+
+	use wifi && plugins+=",netstat"
+	use alsa && plugins+=",volumealsa"
+	[[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
+
+	econf \
+		$(use_enable alsa) \
+		--enable-gtk3 \
+		--with-x \
+		--with-plugins="${plugins}"
+	# the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/lxde-base/lxrandr/Manifest b/lxde-base/lxrandr/Manifest
index 8060a1817810..508f5d6fb7d5 100644
--- a/lxde-base/lxrandr/Manifest
+++ b/lxde-base/lxrandr/Manifest
@@ -1,6 +1,4 @@
-DIST lxrandr-0.3.1.tar.xz 132468 BLAKE2B 04ea378eaa550a1610f4083524c48dab6e261301dc30262fc34049d89d3b29b02d8ad2c521fc3beab1be416b54560dcb87bb2fc27261e35cb27771fbc7bbe9ee SHA512 525cb8800045f26cb1ecae994e1663db4ce41fbfcf1eabd6c50de38988324cd50f51167fa0caa6872867955c0d18af115bed1d4ae896cb15871efd477eb01196
 DIST lxrandr-0.3.2.tar.xz 134072 BLAKE2B 8c8e7985b20c4b90d610b51ffbb7c6f02096f9b2550ea69f16bd0ae8840456a605d646d83cb2a70550a84aaca87deb6496b811fe79990cf36994b2b66aee7915 SHA512 9f00f885e4af3544d9bf8a7581d5b9e3049c1fac174c119dda8c85f2f94aa7be241b6e06e5fe86596a0fb65a38bfe1983ced91c064339a60b19f506ed337ee4f
-EBUILD lxrandr-0.3.1-r1.ebuild 892 BLAKE2B 082bd76098036a0d4c70d9bd2d3a1d3a5c97fe80e82a9e34d2f2d9ea0a2b58cf47dff94509303f2dc0a7bf96bb2e590991fee0f2ab3cc58c6a62375b1aad0cd0 SHA512 ba1350df87448ef6bed8d06d1d14b0499ee78c1130e28eb5e098ec8414dcd1cb655ec5f554cdf19e41cfbb740d34f638f1adc1bbd5a5f74177f1bcef1f3cef78
-EBUILD lxrandr-0.3.1.ebuild 582 BLAKE2B b1928c45e4cca0c55152720040f22768ac16e859607723784076e81dd72e32178454bd7d3cc061c69df08ab7ab2d0487a790f8e8e4955aa1633b6a40a0ff22b7 SHA512 a9fdf68eeac208a32f63f64cc8837a0e10c6eb9608cdbd16f6cdf499d8b3f86a4953273f400f3e6967fec61438748fc28c6b3148a53d8a1710910ef07ed5dc97
+EBUILD lxrandr-0.3.2-r1.ebuild 599 BLAKE2B e0c40758cdb9d1b71172e7a4e083bd10ac021e1253a6bf7088593036c318c8769734265497a28c52c01affc0f5ed309019f339e51c04a49d2d97e08b44f11ebd SHA512 2d361e3ace772fd7d4c4d70bf654312969c6f7e36520cab6833efa023f1d326ebddb8884d3de06ef38e178335b972c047c6803dcb3db829ec9345c2745fdf918
 EBUILD lxrandr-0.3.2.ebuild 888 BLAKE2B a5d7cd0161755d4fd3650b6ea369f43fde2d3b0d39c02d16cf0dc851301372615855784e9f1a509b710eddf872099f2650d39c99689f0deca9c0c79a31ff95cf SHA512 bc12a64f2dc5d75260281ff864053581a9f283db2aa4c59632ae7e3e9087d4fae4eece1bf8e38dd7fa0012910707b358110c1ba996023ab50a48a6d328eb53c3
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxrandr/lxrandr-0.3.1-r1.ebuild b/lxde-base/lxrandr/lxrandr-0.3.1-r1.ebuild
deleted file mode 100644
index 57b52d1c2d99..000000000000
--- a/lxde-base/lxrandr/lxrandr-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar ast be bg bn_IN bn ca cs da de el en_GB es et eu fa fi fo
-fr frp gl he hr hu id is ja kk ko lg lt ml ms nb nl nn pa pl ps pt_BR pt
-ro ru sk sl sr@latin sr sv te th tr tt_RU ug uk ur_PK ur vi zh_CN zh_TW"
-
-PLOCALE_BACKUP="en_GB"
-
-inherit l10n
-
-DESCRIPTION="LXDE GUI interface to RandR extention"
-HOMEPAGE="https://wiki.lxde.org/en/LXRandR"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libXrandr
-	x11-apps/xrandr"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
diff --git a/lxde-base/lxrandr/lxrandr-0.3.1.ebuild b/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild
index 3046d10ad579..dad80fd04fd8 100644
--- a/lxde-base/lxrandr/lxrandr-0.3.1.ebuild
+++ b/lxde-base/lxrandr/lxrandr-0.3.2-r1.ebuild
@@ -1,27 +1,33 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 DESCRIPTION="LXDE GUI interface to RandR extention"
 HOMEPAGE="https://wiki.lxde.org/en/LXRandR"
 SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
 IUSE=""
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	dev-libs/glib:2
+	x11-apps/xrandr
+	x11-libs/gtk+:3
 	x11-libs/libXrandr
-	x11-apps/xrandr"
+"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
 	>=dev-util/intltool-0.40.0
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-base/xorg-proto"
+"
 
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS
+src_configure() {
+	econf \
+		--enable-gtk3
 }
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index 59669182bbb2..adf58c1581c9 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -2,5 +2,7 @@ AUX lxsession-0.5.2-fix-invalid-memcpy.patch 1010 BLAKE2B 6ce3b44341851babacda8b
 AUX lxsession-0.5.2-notify-daemon-default.patch 709 BLAKE2B 7f2c75ce81e70abbe0c9621d6d5605a87925f2231d86644dadf93235349a90fa733b75b9a371833c4b8b482b43c644c617f041ac1f29df1d94550cc0d7abd7c8 SHA512 17ff701e90cd11f077ab538cf6e2507e49e01ab8037eb0e52f4e4eb02b6ca72e118bcad2158c3500364c74c6aaafc39c64f5bac411ec4d0115c011e8a6bc289c
 AUX lxsession-0.5.2-reload.patch 1324 BLAKE2B 9457c86d228db27eef0f32149af14acf75e264fd45b1861b05ece4085a3fc48be94ccc60011e496eba605410cf1d7f08289b49e1a62e6b7b562b0edeef1bff50 SHA512 b8eb606b915709172454bb610650dd358b492ab29608ea62c834356a707ddc70440e3215e8b639ec8ebcf459cb8753d6bb525ea8037064be1016201956b91cb1
 DIST lxsession-0.5.4.tar.xz 422756 BLAKE2B a04c67dbbb9da6405e165a05eb43d82f9d7ecc943147a8c5ab4fb5edf50b40b408db102ea1e96e142f61fcc2d1ead023685c33e1c26c09a4183882cfe9c5c930 SHA512 5b92d6e703ef692e3788554a3a34eca7bb4b7bb23d735af838c35bfaab142238eaeee3095176e5e4a7464468ab5478a596c670b0e2488f8599091f3e2fc8482b
+DIST lxsession-0.5.5.tar.xz 422564 BLAKE2B 27910f84ecd8df8af06649235d33604eb83e8203f6a485a7450a91887de691d161acf8f51d8c1786f8d073966ba88d20296275adc131b9fa1c670c0f9e3ecdef SHA512 12e25214485cf855b380a5aa91eb536f31536c98f5a50a1115cb4bf8ff884c7cdcd40c69a1502eeb9f4d3e6169e0607d6488ef3152ee184662fee39fe7a04d54
 EBUILD lxsession-0.5.4-r1.ebuild 1287 BLAKE2B 5d8ca8b941dcdf099549076f0b92fbe27c4596c6951f8c9c7fbaa612d401437cccc115813e6da5c102ffc6cf9a32405e53bdfe67aa3b8260a3eb5f2bc679f340 SHA512 2b9539f0f03181159a7b3d5caf80beaa83430183be10f98c89b39e658fde69c9280fe42d493371d59fa0ae7d4dd28823cd1a534541a0fa6dd4da5147d879968f
+EBUILD lxsession-0.5.5.ebuild 1154 BLAKE2B 9f07d02afb7cffe7338a7c30a9105de2ad094458d5bd20f96b2a02bec4790eaa197961cdb9e00ec70d35612457757b032eaf124f252243efd024ae90e87fc81a SHA512 5b6466bfad977d23d09aad2b3a447b944460ba27cc203835c34483306e86c840e68182f8e72db5a86e577ed15b434c8e59ae254d6d94a66592bcc8372f3d54d2
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxsession/lxsession-0.5.5.ebuild b/lxde-base/lxsession/lxsession-0.5.5.ebuild
new file mode 100644
index 000000000000..d932ca86b560
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.5.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vala autotools
+
+DESCRIPTION="LXDE session manager"
+HOMEPAGE="https://wiki.lxde.org/en/LXSession"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+IUSE="nls upower"
+
+COMMON_DEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	>=lxde-base/lxde-common-0.99.2-r1
+	sys-apps/dbus
+	sys-auth/polkit
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxsession-edit
+	sys-apps/lsb-release
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fedora patches
+	"${FILESDIR}"/${PN}-0.5.2-reload.patch
+	"${FILESDIR}"/${PN}-0.5.2-notify-daemon-default.patch
+)
+
+src_prepare() {
+	rm *.stamp || die
+	vala_src_prepare
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# dbus is used for restart/shutdown (logind), and suspend/hibernate (UPower)
+	econf \
+		$(use_enable nls) \
+		--enable-gtk3
+}
diff --git a/lxde-base/lxtask/Manifest b/lxde-base/lxtask/Manifest
index 5c9e32e652bd..4492adecfef8 100644
--- a/lxde-base/lxtask/Manifest
+++ b/lxde-base/lxtask/Manifest
@@ -1,7 +1,6 @@
 AUX lxtask-0.1.7-fix-no-common.patch 2102 BLAKE2B b0329dcdaf9b958b3376d3a641fd392980affedea52a432bfb7b88c5dbb6145ead473b4eb6ec52cd49f76469c706bc241b5b3b618d8d12f6fccea2bdc5e860c2 SHA512 74b8f187836a70e7c144b5e0f7b0fc06ac1bd2c8db5559360c709bb441293b0fa92ba41e9b02f7e455d231ddeb6d7822dd8e3859c20252e0bceab391cefb6d2e
-DIST lxtask-0.1.8.tar.xz 137288 BLAKE2B 05a69cfeb8d4801cc0ee7fa502f23d98992e3eff7c5d02ddac8c46942da366224a669704d174723c9857b13396a23aa2bbe4ac0e35afac6f6c65b0e9869bebbc SHA512 095904df6ecea699a2ea44ca6f1677d8882b1bb26926b716bd0d6a65ce5aece99e3ac833d5bf08dcadb42e269baa1d3bd7c6e974e58a64f6da147763e9a40c6a
+DIST lxtask-0.1.10.tar.xz 138116 BLAKE2B 38fc7e4192a04a3748d14148d7defe71e766f802b869468c25aca971d58072824377da374b72116c924310a5a001f65680d878a6bc0afd59609ede63a590fc49 SHA512 21f3a145939b53136be11892d183f3549b1a736070bb0c69e0932009d46abfd4956d1ec1d904e58bd6fca0a30fa0cca0cce897a83113c3fe1591300cfddae99a
 DIST lxtask-0.1.9.tar.xz 138000 BLAKE2B 1f26cf4c4ce0ab64cd6b3bf6b7539aead92da2a816f66f4dd53d170f48aee8d824993b26d316535dc23f8539c33f9b31c89a631f2bc8ed4778675a3c001ea470 SHA512 21a28a86180e2c0d11f591707fe4333cb78224316d6c33e581f5a38a36baf619e22c426f58a6e4eaaa5701119b909a956691fc00ef47dff140443148f2941f4d
-EBUILD lxtask-0.1.8-r1.ebuild 965 BLAKE2B 403261a84811f1f5ce3b5eba2c38a124c4ea144160c5ba18161aec57fc4986b42b073512f5819e1603178a7acff019494c1eff7bd0f87838baf370b75b729654 SHA512 2e42807ca81f0ec0d4fca2077b403a45301cdb791ec2b2217833903ba62a5f479aeb17b1fef7abba1ec4c3d15d676b5f06e79b0ebfd9f0f4b6d7de56a6fb48b2
-EBUILD lxtask-0.1.8.ebuild 582 BLAKE2B d1c44263e026b4797dba64945f4390af83de51fe59228b3aaf6e5b56a97d9f2297c3dc3cc2a65dbdbd460fb158330d45a31304abfcc84c16207b0de0d557d43a SHA512 913f9f5f9fe2e3f1c350ebeaaf6973da45c9caefe00dd4c1891cb0f57de76bd85619e2991880d010cba5edb9cb000417865993de477eef19d37208e3af836850
+EBUILD lxtask-0.1.10.ebuild 519 BLAKE2B 27abb40d47aba76ad5d6e69bac75e7043e2ccafbf4f93e5296e372db06ad4097b73998869d62012fa272fa1b782ed2762b63df870a0e884a830549287e8dfe87 SHA512 bcb4b0bbcea1f96dcecba98ab472be8938c79336c9828962837c0716540d04cfa8221c48e8b5f91cd9d23ec0a9915aa6887c5953d7e86818d9cd3c9d3b5f308b
 EBUILD lxtask-0.1.9.ebuild 961 BLAKE2B 8b1bb356b2cade617f539b2f33ef8e03b8cea77b64c3d7b56c0cd0b432921256eda8fa33087b9b2036e103c10040001d513f6412f337eef9e61bc4f62d27cf83 SHA512 fa9bff1720d91756246c6c0d01cd9444b35dca4b6339ffbff5ea8c2ab76800e53c36deeca25a81d2a547bb807686d66174b6fd11f8ab14ef5e5256cc3550fbea
 MISC metadata.xml 246 BLAKE2B 8d0aec200836314012b91ca33df85fa03b210405d0cb4dddaddc474851c85ecd2eea76bdaecb66be57377e5c1f0f2de84aba3cb544c375842964bc2c64259a78 SHA512 e8d4ac2166add3e6b5a69dfa0b4f71db2a7cc921024aa208644b377790adb14d48682ff5e0d80fd054c349d20f83554f46bdc5053b7b8e893f11e87dddba3d73
diff --git a/lxde-base/lxtask/lxtask-0.1.10.ebuild b/lxde-base/lxtask/lxtask-0.1.10.ebuild
new file mode 100644
index 000000000000..ea0221a2b864
--- /dev/null
+++ b/lxde-base/lxtask/lxtask-0.1.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="LXDE Task manager"
+HOMEPAGE="https://wiki.lxde.org/en/LXTask"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--enable-gtk3
+}
diff --git a/lxde-base/lxtask/lxtask-0.1.8-r1.ebuild b/lxde-base/lxtask/lxtask-0.1.8-r1.ebuild
deleted file mode 100644
index 59b4a81a99fe..000000000000
--- a/lxde-base/lxtask/lxtask-0.1.8-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ar ast be bg bn_IN bn ca cs da de el en_GB es et eu fa fi fo fr
-frp gl he hr hu id is it ja kk ko lg lt lv ml ms nb nl nn pa pl ps pt_BR pt
-ro ru sk sl sq sr@latin sr sv te th tr tt_RU ug uk ur_PK ur vi zh_CN zh_TW"
-
-PLOCALE_BACKUP="en_GB"
-
-inherit l10n
-
-DESCRIPTION="LXDE Task manager"
-HOMEPAGE="https://wiki.lxde.org/en/LXTask"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0"
-
-# Upstream report:
-# https://sourceforge.net/p/lxde/patches/535/
-PATCHES=( "${FILESDIR}/lxtask-0.1.7-fix-no-common.patch" )
-
-src_prepare() {
-	default
-
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
diff --git a/lxde-base/lxtask/lxtask-0.1.8.ebuild b/lxde-base/lxtask/lxtask-0.1.8.ebuild
deleted file mode 100644
index dcf6b6512c01..000000000000
--- a/lxde-base/lxtask/lxtask-0.1.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="LXDE Task manager"
-HOMEPAGE="https://wiki.lxde.org/en/LXTask"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0"
-
-# Upstream report:
-# https://sourceforge.net/p/lxde/patches/535/
-PATCHES=( "${FILESDIR}/lxtask-0.1.7-fix-no-common.patch" )
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index ff0c4cd0aeb1..35eab8e87455 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,6 +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 1161 BLAKE2B f3e6cfe7b16e9179c81ff214158b590f79a973f4ea12ae3df6362b8aee666001abedead640e3ed6850b3ad4794da89bd0eddbae41a75cfc1529f0f43db73953b SHA512 18f8e12479bed318421d45b72448475c4a3881b4218dc4c9ed52aa0ddbc38daef479020ced5031007b374870ccd9f61383815ab7e9768a107a0d5268f6d801ed
-EBUILD lxterminal-0.3.2-r1.ebuild 734 BLAKE2B b9274837b5a0f2b22fe23b6c20f9dbe792e4e5b2659ba31090b45140e093b8a80f96b6ac5d863302f19f76f38a1c3f0bf937197e78785dffd38534de77d90c2f SHA512 2797db75cef1f72cf75da51add8dbfaaefb8e621173f30337c98539414809e08d6960c6b9135fdd69c547317085d3d5eda35d4f8e63b1e3c778622b43c159b4c
+DIST lxterminal-0.4.0.tar.xz 201856 BLAKE2B 2fe72007e36c5324b868b9dfc54b04422f85f93f71265126f65eb0b6e0510e60eefb0a2a53acadee6f2c44adcd3c498117b709c9eaa1eb2241dd9016558b9e5c SHA512 d1462bf9739c5e9022cbabe9f9c8f70bbb882c0aba7a39d1f87d804f4002056151165d7555cace6f439c0acfbdcd3c959a420993379f646d066f5d30af71232e
 EBUILD lxterminal-0.3.2.ebuild 1160 BLAKE2B f0d3f51ec81a087fad85d7f5014442238c970072f1a6972e332058bf73b0452253bbe419ec06d23923164946a94c4aadad19a39c7937f8fd93349c1c000fe01b SHA512 8dc1d952d6b2abd05cd6a137ecfa389066147f3ffb8460cd6f5d6dac3c1ae55fbdbd70d405a861da9f40fe30146c7765c6ad2794f7cad4fb57805f9467da30f9
+EBUILD lxterminal-0.4.0.ebuild 735 BLAKE2B 089490e8a7da688bd2ab339ed7ff8556a092ac4e42fc2a77e735392f8a097b621aca1f8b2273d84858be577d1c55965afbb47eb7eed308537768fb8a3df649f1 SHA512 db3ba508e985adca466eae401d0473931a7a1aa334179a3721bb35f6d003dbaf20b715e354b27a4d9f6f6258b96b49667fa810c45d5442e9fb691cb4c13fc31d
 MISC metadata.xml 319 BLAKE2B 95e1ebe72dc9680bad73dc167bbe202f0d5a943da478ce2beb8c4bd0f15eeae7676598ecca89b0244cdf8292441b6de29a94738b33cc4ebe07783827c6b756e1 SHA512 096769b118aac41cbdfcb9e07eea65860556df150eef61fb2e21c3354c49db5f2eb4bca67c287b217ee42bb8bf643b21b27e02c0b754e7fbbb7d493cc237b805
diff --git a/lxde-base/lxterminal/lxterminal-0.3.1.ebuild b/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
deleted file mode 100644
index a20e5520b167..000000000000
--- a/lxde-base/lxterminal/lxterminal-0.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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
-else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-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/lxterminal/lxterminal-0.3.2-r1.ebuild b/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
index be9747b86519..50c4a08d1e48 100644
--- a/lxde-base/lxterminal/lxterminal-0.3.2-r1.ebuild
+++ b/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,25 +12,28 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="gtk3"
+IUSE=""
 
-DEPEND="dev-libs/glib:2
-	!gtk3? (
-		x11-libs/gtk+:2
-		x11-libs/vte:0 )
-	gtk3? (
-		x11-libs/gtk+:3
-		x11-libs/vte:2.91 )"
+DEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/vte:2.91
+"
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	>=dev-util/intltool-0.40.0
 	sys-devel/gettext
-	>=dev-util/intltool-0.40.0"
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	default
+	xdg_src_prepare
 	eautoreconf
 }
 
 src_configure() {
-	econf --enable-man $(use_enable gtk3)
+	econf --enable-man --enable-gtk3
 }
diff --git a/lxde-base/menu-cache/Manifest b/lxde-base/menu-cache/Manifest
index 855e27f616bc..5c0959a2483b 100644
--- a/lxde-base/menu-cache/Manifest
+++ b/lxde-base/menu-cache/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 320 BLAKE2B ff914db078fa5bfac7bc5184362f6a8c211945f0c1e0286fb3d7ba4da205c108678206272559fe5f5217380ed867a309c8e920c0d4a0cd5773e0b4d8ff9466c5 SHA512 b5a290c4ae3492e59e38159a1ad9aaae97abaad29ae07936db417f85b5a002f6d325d2b769a9222880b3235ed2bec0e3f59f930a9e2ea49fe4c2094549e84060
diff --git a/lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch b/lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch
new file mode 100644
index 000000000000..faa91fff3e92
--- /dev/null
+++ b/lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch
@@ -0,0 +1,37 @@
+From 97e5de8682c0c44fe4e6a2df864c5fdf76cd77cc Mon Sep 17 00:00:00 2001
+From: Palo Kisa <palo.kisa@gmail.com>
+Date: Thu, 30 Nov 2017 11:36:18 +0100
+Subject: [PATCH] libmenu-cache: Fix memory leaks
+
+---
+ libmenu-cache/menu-cache.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libmenu-cache/menu-cache.c b/libmenu-cache/menu-cache.c
+index 5025d72..273b503 100644
+--- a/libmenu-cache/menu-cache.c
++++ b/libmenu-cache/menu-cache.c
+@@ -379,11 +379,15 @@ static MenuCacheItem* read_item(GDataInputStream* f, MenuCache* cache,
+             else /* separator */
+             {
+                 item->type = MENU_CACHE_TYPE_SEP;
++                g_free(line);
+                 return item;
+             }
+         }
+         else
++        {
++            g_free(line);
+             return NULL;
++        }
+ 
+         item->id = g_strndup( line + 1, len - 1 );
+         g_free(line);
+@@ -923,6 +927,7 @@ gboolean menu_cache_item_unref(MenuCacheItem* item)
+         else
+         {
+             MenuCacheApp* app = MENU_CACHE_APP(item);
++            g_free(app->generic_name);
+             g_free( app->exec );
+             g_free(app->try_exec);
+             g_free(app->working_dir);
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
new file mode 100644
index 000000000000..a7684ccc41df
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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+"
+SLOT="0/2" # ABI is v2. See Makefile.am
+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}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.diff # upstream PR#19
+	"${FILESDIR}"/${P}-memleak.patch # git master
+)
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}