gentoo resync : 28.04.2021

32 files changed, 7 insertions, 666 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index d7287fd26be8..69129e9f2692 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 2a1f90f7d4fe..088298adf904 100644
--- a/lxde-base/lxappearance-obconf/Manifest
+++ b/lxde-base/lxappearance-obconf/Manifest
@@ -1,4 +1,3 @@
 DIST lxappearance-obconf-0.2.3.tar.xz 290204 BLAKE2B 3f222419e147232eb805e8b86a29993fefbf80008cc3cd98d048a0b3b2799fb3672571f87666917136ad17c1b4b6bd649194599d684bb14a574ae40d0d127d99 SHA512 cec56238b2b8ea86ab310fdf3d9d43ef665aac7762018a296803ef7caccb6a5a7854c4b17e0028152b379a373602ede30edb02811a9a370ba369b62bb3caee09
 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.3.ebuild b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3.ebuild
deleted file mode 100644
index 8e186a26beb8..000000000000
--- a/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-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="lxde-base/lxappearance
-	x11-wm/openbox"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool"
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/lxde-base/lxappearance/Manifest b/lxde-base/lxappearance/Manifest
index d5900120558e..b56140d9ca86 100644
--- a/lxde-base/lxappearance/Manifest
+++ b/lxde-base/lxappearance/Manifest
@@ -1,4 +1,3 @@
 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-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-r1.ebuild b/lxde-base/lxappearance/lxappearance-0.6.3-r1.ebuild
deleted file mode 100644
index 4e1ff41d5eff..000000000000
--- a/lxde-base/lxappearance/lxappearance-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar be bg ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id is
-it ja kk ko lg lt nl pa pl pt_BR pt ro ru sl sr@latin sr sv te tr tt_RU ug uk
-ur_PK ur vi zh_CN zh_TW"
-
-PLOCALE_BACKUP="en_GB"
-
-inherit l10n
-
-DESCRIPTION="LXDE GTK+ theme switcher"
-HOMEPAGE="https://wiki.lxde.org/en/LXAppearance"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-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
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_prepare() {
-	default
-
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable dbus)
-}
diff --git a/lxde-base/lxde-common/Manifest b/lxde-base/lxde-common/Manifest
index 659489450977..59efc07711a5 100644
--- a/lxde-base/lxde-common/Manifest
+++ b/lxde-base/lxde-common/Manifest
@@ -1,6 +1,4 @@
 AUX lxde 1989 BLAKE2B 80163b00c1de0dbe9ea02692c93bf041fef792d75d976a086ce7d66fe29cacf6cb583f481a51f14847db8fab912937f6a72073559b89057802f93a88afee250a SHA512 43eaaef1a5997f07281fc771d3b4a6cb3ba3515964b3e477679c28b06f21bb7dccac9fb2249dcb8ff6f08b21407fb26238f6cf66ea0a1d312a9566b5ca9d730c
-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-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.1.ebuild b/lxde-base/lxde-common/lxde-common-0.99.1.ebuild
deleted file mode 100644
index 134c655623b9..000000000000
--- a/lxde-base/lxde-common/lxde-common-0.99.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils
-
-DESCRIPTION="LXDE Session default configuration files and nuoveXT2 iconset"
-HOMEPAGE="https://wiki.lxde.org/en/LXDE_Common"
-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"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-PDEPEND="lxde-base/lxde-icon-theme"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	# install session file
-	insinto /etc/X11/Sessions/
-	doins "${FILESDIR}/lxde"
-	fperms 755 /etc/X11/Sessions/lxde
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/lxde-base/lxde-icon-theme/Manifest b/lxde-base/lxde-icon-theme/Manifest
index ea63021477b8..4086ed65ffba 100644
--- a/lxde-base/lxde-icon-theme/Manifest
+++ b/lxde-base/lxde-icon-theme/Manifest
@@ -1,4 +1,3 @@
 DIST lxde-icon-theme-0.5.1.tar.xz 4469552 BLAKE2B 0c2b6cb3c60fc5260c2813db84977167b56898f1388bc034180c2efd6b7d3fe5baea6a18f9cadbf984d3680100bf2c5ebbc8f1130491c41b1223efff889ff4a8 SHA512 4ae0e7efd610bc68c4fec2fa00e83b4cc61a313fa4207c213d592f7c8f40bda79117e45dfe7df537baddc8834a55f8ab8864918655136d938a7201c7520597b5
 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.1.ebuild b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1.ebuild
deleted file mode 100644
index 627504316272..000000000000
--- a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2-utils
-
-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=""
-
-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-meta/Manifest b/lxde-base/lxde-meta/Manifest
index 88486e886f2a..4b4aec6e8ab7 100644
--- a/lxde-base/lxde-meta/Manifest
+++ b/lxde-base/lxde-meta/Manifest
@@ -1,3 +1,2 @@
-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-r6.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r6.ebuild
deleted file mode 100644
index 80d42407b40f..000000000000
--- a/lxde-base/lxde-meta/lxde-meta-0.5.5-r6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-0.3.3
-	>=lxde-base/lxappearance-0.5.5
-	>=lxde-base/lxde-icon-theme-0.5.0
-	>=lxde-base/lxde-common-0.5.5
-	>=lxde-base/lxmenu-data-0.1.4
-	>=lxde-base/lxinput-0.3.2
-	>=lxde-base/lxpanel-0.5.10
-	>=lxde-base/lxrandr-0.1.2
-	>=lxde-base/lxsession-0.5.2
-	>=x11-libs/libfm-1.2.0
-	>=lxde-base/lxtask-0.1.6
-	>=lxde-base/lxterminal-0.1.11
-	media-gfx/gpicview
-	x11-misc/pcmanfm
-	x11-wm/openbox
-	>=x11-misc/obconf-2.0.3_p20111019"
-
-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 9881d259d0be..c241383518cf 100644
--- a/lxde-base/lxinput/Manifest
+++ b/lxde-base/lxinput/Manifest
@@ -1,4 +1,3 @@
 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-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-r1.ebuild b/lxde-base/lxinput/lxinput-0.3.5-r1.ebuild
deleted file mode 100644
index 507dbb059286..000000000000
--- a/lxde-base/lxinput/lxinput-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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 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_BR pt ro
-ru si 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 keyboard and mouse configuration tool"
-HOMEPAGE="https://lxde.org/"
-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+:2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.0"
-
-src_prepare() {
-	default
-
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
diff --git a/lxde-base/lxlauncher/Manifest b/lxde-base/lxlauncher/Manifest
index 7ce0fbf41e9b..e8ca810cf985 100644
--- a/lxde-base/lxlauncher/Manifest
+++ b/lxde-base/lxlauncher/Manifest
@@ -1,4 +1,3 @@
 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.ebuild b/lxde-base/lxlauncher/lxlauncher-0.2.5.ebuild
deleted file mode 100644
index 7a110e3350cc..000000000000
--- a/lxde-base/lxlauncher/lxlauncher-0.2.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="An 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
-	x11-libs/gtk+:2
-	gnome-base/gnome-menus
-	x11-libs/startup-notification"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext
-	lxde-base/menu-cache
-	!lxde-base/lxlauncher-gmenu"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index 57c24b3b9d06..b1369a7ecb60 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -1,7 +1,4 @@
 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-remove-gdk-pixbuf-xlib.patch b/lxde-base/lxpanel/files/lxpanel-remove-gdk-pixbuf-xlib.patch
deleted file mode 100644
index 7f52fb022e14..000000000000
--- a/lxde-base/lxpanel/files/lxpanel-remove-gdk-pixbuf-xlib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/753923
-
---- a/plugins/launchtaskbar.c	2019-01-13 16:35:07.000000000 -0500
-+++ b/plugins/launchtaskbar.c	2020-11-10 14:25:51.550180345 -0500
-@@ -69,5 +69,4 @@
- 
- #include <gdk-pixbuf/gdk-pixbuf.h>
--#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
- #include <gdk/gdk.h>
- #include <glib/gi18n.h>
---- a/plugins/task-button.c	2019-02-26 16:45:49.000000000 -0500
-+++ b/plugins/task-button.c	2020-11-10 14:25:44.858209009 -0500
-@@ -44,5 +44,4 @@
- 
- #include <gdk-pixbuf/gdk-pixbuf.h>
--#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
- #include <gdk/gdk.h>
- #include <glib/gi18n.h>
---- a/src/plugin.c	2019-01-13 16:35:07.000000000 -0500
-+++ b/src/plugin.c	2020-11-10 14:25:38.820234868 -0500
-@@ -30,5 +30,4 @@
- 
- #include <gdk-pixbuf/gdk-pixbuf.h>
--#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
- #include <gdk/gdk.h>
- #include <string.h>
diff --git a/lxde-base/lxpanel/lxpanel-0.10.0-r1.ebuild b/lxde-base/lxpanel/lxpanel-0.10.0-r1.ebuild
deleted file mode 100644
index eae2ae33ccf6..000000000000
--- a/lxde-base/lxpanel/lxpanel-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,78 +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_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 km ko lg lt lv 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_HK zh_TW"
-
-PLOCALE_BACKUP="en_GB"
-
-inherit l10n readme.gentoo-r1
-
-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:0=
-	x11-libs/gtk+:2
-	>=x11-libs/libfm-1.2.0[gtk]
-	x11-libs/libwnck:1
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/libX11
-	lxde-base/lxmenu-data
-	lxde-base/menu-cache
-	alsa? ( media-libs/alsa-lib )
-	wifi? ( net-wireless/wireless-tools )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-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=(
-	"${FILESDIR}"/${PN}-remove-gdk-pixbuf-xlib.patch
-)
-
-src_prepare() {
-	default
-
-	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
-	l10n_get_locales > po/LINGUAS || die
-}
-
-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) --with-x --with-plugins="${plugins}"
-	# the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
-}
-
-src_install() {
-	default
-
-	# Get rid of the .la files.
-	find "${D}" -name '*.la' -delete
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/lxde-base/lxrandr/Manifest b/lxde-base/lxrandr/Manifest
index 508f5d6fb7d5..f4f113a1990f 100644
--- a/lxde-base/lxrandr/Manifest
+++ b/lxde-base/lxrandr/Manifest
@@ -1,4 +1,3 @@
 DIST lxrandr-0.3.2.tar.xz 134072 BLAKE2B 8c8e7985b20c4b90d610b51ffbb7c6f02096f9b2550ea69f16bd0ae8840456a605d646d83cb2a70550a84aaca87deb6496b811fe79990cf36994b2b66aee7915 SHA512 9f00f885e4af3544d9bf8a7581d5b9e3049c1fac174c119dda8c85f2f94aa7be241b6e06e5fe86596a0fb65a38bfe1983ced91c064339a60b19f506ed337ee4f
 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.2.ebuild b/lxde-base/lxrandr/lxrandr-0.3.2.ebuild
deleted file mode 100644
index 897e0acce0fc..000000000000
--- a/lxde-base/lxrandr/lxrandr-0.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/lxsession/Manifest b/lxde-base/lxsession/Manifest
index adf58c1581c9..3b6185ea74c7 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -1,8 +1,5 @@
-AUX lxsession-0.5.2-fix-invalid-memcpy.patch 1010 BLAKE2B 6ce3b44341851babacda8b393979d8573def2295132a122fd25a5ded7862d32d7ed15e9073c691ce89dcc1ed7c4e0121bb9ad479f5e69df37ae51edac08a4926 SHA512 33a72b62b4fe82d1c7331d389333e24ee68fd1bc37fba96a7a73247cb4d63556429709361b9b6e35bd2e93db93f5571ef3a985b3dbcb9ea9b5f23a8e677a9932
 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/files/lxsession-0.5.2-fix-invalid-memcpy.patch b/lxde-base/lxsession/files/lxsession-0.5.2-fix-invalid-memcpy.patch
deleted file mode 100644
index 672889997688..000000000000
--- a/lxde-base/lxsession/files/lxsession-0.5.2-fix-invalid-memcpy.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lxsession-0.5.2/lxsession-edit/lxsession-edit-common.c.memmove	2014-10-05 08:49:49.000000000 +0900
-+++ lxsession-0.5.2/lxsession-edit/lxsession-edit-common.c	2016-02-15 19:21:23.780783021 +0900
-@@ -216,7 +216,7 @@ void update_enable_state(GKeyFile* kf, g
-                 if( strcmp(list[i], session_name) == 0 )
-                 {
-                     g_free(list[i]);
--                    memcpy( list + i, list + i + 1, (n-i) * sizeof(char*) );
-+                    memmove( list + i, list + i + 1, (n-i) * sizeof(char*) );
-                     --n;
-                     break;
-                 }
-@@ -259,7 +259,7 @@ void update_enable_state(GKeyFile* kf, g
-                 if( strcmp(list[i], session_name) == 0 )
-                 {
-                     g_free(list[i]);
--                    memcpy( list + i, list + i + 1, (n-i) * sizeof(char*) );
-+                    memmove( list + i, list + i + 1, (n-i) * sizeof(char*) );
-                     --n;
-                     break;
-                 }
diff --git a/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild b/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild
deleted file mode 100644
index 3d128e27cd91..000000000000
--- a/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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"
-KEYWORDS="~alpha amd64 arm arm64 ppc x86 ~x86-linux"
-SLOT="0"
-
-# upower USE flag is enabled by default in the desktop profile
-IUSE="nls upower"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/dbus-glib
-	dev-libs/libunique:1
-	lxde-base/lxde-common
-	sys-auth/polkit
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	sys-apps/dbus
-"
-RDEPEND="${COMMON_DEPEND}
-	!lxde-base/lxsession-edit
-	sys-apps/lsb-release
-	upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	# Fedora patches
-	"${FILESDIR}"/${PN}-0.5.2-reload.patch
-	"${FILESDIR}"/${PN}-0.5.2-notify-daemon-default.patch
-	"${FILESDIR}"/${PN}-0.5.2-fix-invalid-memcpy.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
-	# gtk3 looks to not be ready, follow what other distributions are
-	# doing
-	econf \
-		$(use_enable nls) \
-		--disable-gtk3
-}
diff --git a/lxde-base/lxtask/Manifest b/lxde-base/lxtask/Manifest
index 4492adecfef8..31b14a228b93 100644
--- a/lxde-base/lxtask/Manifest
+++ b/lxde-base/lxtask/Manifest
@@ -1,6 +1,3 @@
-AUX lxtask-0.1.7-fix-no-common.patch 2102 BLAKE2B b0329dcdaf9b958b3376d3a641fd392980affedea52a432bfb7b88c5dbb6145ead473b4eb6ec52cd49f76469c706bc241b5b3b618d8d12f6fccea2bdc5e860c2 SHA512 74b8f187836a70e7c144b5e0f7b0fc06ac1bd2c8db5559360c709bb441293b0fa92ba41e9b02f7e455d231ddeb6d7822dd8e3859c20252e0bceab391cefb6d2e
 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.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/files/lxtask-0.1.7-fix-no-common.patch b/lxde-base/lxtask/files/lxtask-0.1.7-fix-no-common.patch
deleted file mode 100644
index d986741b2111..000000000000
--- a/lxde-base/lxtask/files/lxtask-0.1.7-fix-no-common.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Naur a/src/interface.c b/src/interface.c
---- a/src/interface.c	2016-02-21 01:06:17.000000000 +0100
-+++ b/src/interface.c	2016-09-13 19:37:28.038350050 +0200
-@@ -26,6 +26,18 @@
- #include <glib/gi18n.h>
- #include "interface.h"
- 
-+GtkTreeStore *list_store;
-+GtkTreeSelection *selection;
-+GtkWidget *treeview;
-+GtkWidget *mainmenu;
-+GtkWidget *taskpopup;
-+GtkWidget *cpu_usage_progress_bar;
-+GtkWidget *mem_usage_progress_bar;
-+GtkWidget *cpu_usage_progress_bar_box;
-+GtkWidget *mem_usage_progress_bar_box;
-+
-+GtkTreeViewColumn *column;
-+
- #define GLADE_HOOKUP_OBJECT(component,widget,name) \
-   g_object_set_data_full (G_OBJECT (component), name, \
-     gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
-diff -Naur a/src/interface.h b/src/interface.h
---- a/src/interface.h	2014-09-16 14:27:52.000000000 +0200
-+++ b/src/interface.h	2016-09-13 19:32:22.816372893 +0200
-@@ -38,16 +38,15 @@
- #include "callbacks.h"
- #include "types.h"
- 
--GtkTreeStore *list_store;
--GtkTreeSelection *selection;
--GtkWidget *treeview;
--GtkWidget *mainmenu;
--GtkWidget *taskpopup;
--GtkWidget *priopopup;
--GtkWidget *cpu_usage_progress_bar;
--GtkWidget *mem_usage_progress_bar;
--GtkWidget *cpu_usage_progress_bar_box;
--GtkWidget *mem_usage_progress_bar_box;
-+extern GtkTreeStore *list_store;
-+extern GtkTreeSelection *selection;
-+extern GtkWidget *treeview;
-+extern GtkWidget *mainmenu;
-+extern GtkWidget *taskpopup;
-+extern GtkWidget *cpu_usage_progress_bar;
-+extern GtkWidget *mem_usage_progress_bar;
-+extern GtkWidget *cpu_usage_progress_bar_box;
-+extern GtkWidget *mem_usage_progress_bar_box;
- 
- enum {
-     COLUMN_NAME = 0,
-@@ -61,7 +60,7 @@
-     COLUMN_PPID
- };
- 
--GtkTreeViewColumn *column;
-+extern GtkTreeViewColumn *column;
- 
- void change_list_store_view(void);
- void create_list_store(void);
-diff -Naur a/src/types.h b/src/types.h
---- a/src/types.h	2014-09-16 14:27:52.000000000 +0200
-+++ b/src/types.h	2016-09-13 19:25:51.014402217 +0200
-@@ -77,9 +77,6 @@
- extern gint win_width;
- extern gint win_height;
- 
--const gchar *custom_signal_0;
--const gchar *custom_signal_1;
--
- extern int page_size;
- 
- #endif
diff --git a/lxde-base/lxtask/lxtask-0.1.9.ebuild b/lxde-base/lxtask/lxtask-0.1.9.ebuild
deleted file mode 100644
index e67ac2a1bf6c..000000000000
--- a/lxde-base/lxtask/lxtask-0.1.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index 35eab8e87455..4242e23af4fa 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,5 +1,3 @@
-DIST lxterminal-0.3.2.tar.xz 198348 BLAKE2B 7b24a138dd48bb6dc85a253b21e897e68d1a7e16a0d30aa45a87b4b97540c996b6a196d8f8be6fb37d9e506544878bd3eb65fe098d4d695be51e94b3ff15cd6b SHA512 0711d6eeed1f7e301fd24e0d5f750a48f29cc10c7cd40bcc1de57cceddfe4cb15718e9fb812da975faff24aed99cdd3978cb5f29838f47e276fce47f01577119
 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
+MISC metadata.xml 240 BLAKE2B 4ddbab8646b091795d596898ca5d6d13137c83c2a7fb889c33404340cc44e950df16574bdfce21ccb67f190b864c55103f31fa2996b9adb383db7a530b48d2de SHA512 a4bd8a67ce4ac3071173b23e2400e057bcbf9fb458bbb4a18d31b67216d4d66e6b8e540f003feb386a487f2a64eee066a0a83d0aa2629c5b99d5498d4289ec97
diff --git a/lxde-base/lxterminal/lxterminal-0.3.2.ebuild b/lxde-base/lxterminal/lxterminal-0.3.2.ebuild
deleted file mode 100644
index 24d1077202b1..000000000000
--- a/lxde-base/lxterminal/lxterminal-0.3.2.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/metadata.xml b/lxde-base/lxterminal/metadata.xml
index 9c5a30050fc2..0a329e3145a6 100644
--- a/lxde-base/lxterminal/metadata.xml
+++ b/lxde-base/lxterminal/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">lxde</remote-id>
-  </upstream>
+<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">lxde</remote-id>
+	</upstream>
 </pkgmetadata>
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"
-}