gentoo resync : 18.11.2019

8 files changed, 2 insertions, 192 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 83f89bd238fc..59485ac16250 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxlauncher/Manifest b/lxde-base/lxlauncher/Manifest
index c57a76def68f..c6ba7c309eee 100644
--- a/lxde-base/lxlauncher/Manifest
+++ b/lxde-base/lxlauncher/Manifest
@@ -1,5 +1,3 @@
-DIST lxlauncher-0.2.2.tar.gz 236484 BLAKE2B cdb6e8413bbf38adfe1bcdb466fef32b95ac8fa4eec733a200237dbc9358427db563236864452dda1d296d5801fbb9570b0e2d2b46e1f17d34d3ac74b2f5f770 SHA512 f7249216b1b474945ee370f76433480d9e275c8b3375328183681083af10dc5a53d48606c00b948dc19f4c0b7d84573b65d52e122b472c69ff34becf953232a6
 DIST lxlauncher-0.2.5.tar.xz 131428 BLAKE2B fa12b7d49d0a95b6aa782c2bb338dc26677edf585b2b532e6d457771e450a8fba458c8c5638fd101edf079a3872a322418c44f01b4ccf6118c8a1377c6dd7a8a SHA512 3f57755ad6feeeb1daa61c29f142b997f8175ff0863d1749b3e28b83744d03e06a7f0bb373fdcd48364e307840dd05cd23b92109c75523e32d3eae8e183ed6cf
-EBUILD lxlauncher-0.2.2.ebuild 661 BLAKE2B e066aac2fbdf056147ce0545be5ad80794471457dedb4351104a5479593680790dde266048f4c13e7acfae056b83975ffd3d41c33835d1ab1f887ee9dda47724 SHA512 2d00793b12f654d5b406b8f1e66d79a21682f1d3b8544c6633a3865f63e264b69f2e38d45c977fc022498c1caef4fbb06d8961547f2f4abcd30ec82425553b57
 EBUILD lxlauncher-0.2.5.ebuild 674 BLAKE2B 07b729242ba3f233279ba2a429573cd62434d19848dcde7c8f54cc59dd79f5b66bf68995e7865a88fa27413fbc1b0274e300f3f732bcf504f98576e429d22cc0 SHA512 c02f47e78894ab730f0c6aebe3bc3ea0f92ec3d44049c6f8318fce537431680b5bf483be8a024a120b6dd1acf3880c4518d8dd7d8a1aeafe091446d3a53fff67
 MISC metadata.xml 335 BLAKE2B 8cda3e7dd4b3668ffc5c311b5f002afaaff19143f058eb873d5d917c63f6752fec6da156d869061939803ea0bacbed80ea0a56e92d53b6e06025ed9b3f3c9462 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7
diff --git a/lxde-base/lxlauncher/lxlauncher-0.2.2.ebuild b/lxde-base/lxlauncher/lxlauncher-0.2.2.ebuild
deleted file mode 100644
index 19ffce00e9b3..000000000000
--- a/lxde-base/lxlauncher/lxlauncher-0.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="An open source clone of the Asus launcher for EeePC"
-HOMEPAGE="http://lxde.sf.net/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-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/lxsession/Manifest b/lxde-base/lxsession/Manifest
index dcac857ec216..ef400b352d33 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -1,10 +1,6 @@
 AUX lxsession-0.5.2-fix-invalid-memcpy.patch 1010 BLAKE2B 6ce3b44341851babacda8b393979d8573def2295132a122fd25a5ded7862d32d7ed15e9073c691ce89dcc1ed7c4e0121bb9ad479f5e69df37ae51edac08a4926 SHA512 33a72b62b4fe82d1c7331d389333e24ee68fd1bc37fba96a7a73247cb4d63556429709361b9b6e35bd2e93db93f5571ef3a985b3dbcb9ea9b5f23a8e677a9932
-AUX lxsession-0.5.2-key2-null.patch 1051 BLAKE2B 9ebf6b30c49ab4f9dcd3506fc38019f7acc2931642a875deb087c831eaee41831cf75d1c611fc54ff86e4587369fb49d5aee9ab82ba3dbf0f3f530ea68377770 SHA512 87e5a264769bbb355e45875dfbf7bde46e355d2de28023000b1a69ff0a801da3e504d875ab5ae75c1c57c26050f40246a48e59f05430514f2deaf7a1ce90e324
 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.2.tar.xz 354092 BLAKE2B 3acbf1be74ed461d331ea8ed10e5c403057671d5f7f32c72951ba89681ad4b0b1a104c2962805738e5b414549e84db3e12327172ffe1b7c6f13a09e09c44fd0f SHA512 2e08e5263bb4ef9d8051e84997347a12d2f1ba75cf4e70f9e3ba783a509246f0d6efd672ac1cc1d0fffc8707710ddb148298449b5365deb6785623d596bc3da1
 DIST lxsession-0.5.4.tar.xz 422756 BLAKE2B a04c67dbbb9da6405e165a05eb43d82f9d7ecc943147a8c5ab4fb5edf50b40b408db102ea1e96e142f61fcc2d1ead023685c33e1c26c09a4183882cfe9c5c930 SHA512 5b92d6e703ef692e3788554a3a34eca7bb4b7bb23d735af838c35bfaab142238eaeee3095176e5e4a7464468ab5478a596c670b0e2488f8599091f3e2fc8482b
-EBUILD lxsession-0.5.2.ebuild 1757 BLAKE2B 47b9ba8b2df76bba57ac7d9f7703679dd12e403ea594af067834251425cc0ec3f310217612ab42f25ef0e6e7c5911ad3bd2828833f71026bc166a14eb1696f58 SHA512 2d9aecf337f2db774aad29ea4ef92d40e05b46d6a081ea784bb8a400f6d2d1445d409a381ae85be989551196cd1324d12fc87d50b48f2bd98d40bae8f0955775
-EBUILD lxsession-0.5.4-r1.ebuild 1289 BLAKE2B bd3f51039c25669f239f232727b91673500f473d0fdfba6aa62c76ff4cbdb9c51ae93075f85c224cb8e918814d424fd9c82acea36992284540431f88e1e1738f SHA512 68f59df986a8e7dae1b42591dc02bf3680392fbd1edcf0c14316958024e229242d2cdebe8715ab3a18abbf87ee1a08113b62a31896eea21f7ca36fb1685f4cd4
-EBUILD lxsession-0.5.4.ebuild 1311 BLAKE2B 01b9d7d65131918545a0290174e75ec1085b9d282c6a5c20897942dbe7b36474b3462849307044159f4d0d36c72c2b612bc6bf900b2a98979471fa212949d15f SHA512 be85604140af0e52cd71695bdab0b315322cbc8e69253181821227c33f3df3d58c9b386763749cb6d2056a54f014da05e87c14ffc11baf16f592fedd46a38f0b
+EBUILD lxsession-0.5.4-r1.ebuild 1288 BLAKE2B 6cde0410dbe2167fa0b5d8fd74ef4765e40a7e4510c85e09a46833ef0c1de746f81a0efc8957e51b89c0a8ec971c5207f6ec2b800a120b7393314ed314ce75ce SHA512 1682e1665b43ddfc2e0335264bc5ad8c89aeabf81a193427cbff2d58d7bf347e3cbfe357ea5dbd4f92bdf363e55191b35f0205854d7c03031883e159c48f1dcf
 MISC metadata.xml 335 BLAKE2B 8cda3e7dd4b3668ffc5c311b5f002afaaff19143f058eb873d5d917c63f6752fec6da156d869061939803ea0bacbed80ea0a56e92d53b6e06025ed9b3f3c9462 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7
diff --git a/lxde-base/lxsession/files/lxsession-0.5.2-key2-null.patch b/lxde-base/lxsession/files/lxsession-0.5.2-key2-null.patch
deleted file mode 100644
index 31c88a9caa66..000000000000
--- a/lxde-base/lxsession/files/lxsession-0.5.2-key2-null.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lxsession-0.5.2/lxsession/settings.vala.key2	2014-10-18 01:54:57.000000000 +0900
-+++ lxsession-0.5.2/lxsession/settings.vala	2015-07-13 14:56:00.830117779 +0900
-@@ -56,7 +56,7 @@ namespace Lxsession
-             return return_map;
-         }
- 
--        public void create_config_item (string categorie, string key1, string key2, string type, string? variable)
-+        public void create_config_item (string categorie, string key1, string? key2, string type, string? variable)
-         {
-             /* only support string for now */
-             string item_key = categorie + ";" + key1 + ";" + key2 + ";";
-@@ -71,7 +71,7 @@ namespace Lxsession
-             update_support_keys (categorie, key1, key2);
-         }
- 
--        public void delete_config_item (string categorie, string key1, string key2, string type)
-+        public void delete_config_item (string categorie, string key1, string? key2, string type)
-         {
-             /* only support string for now */
-             string item_key = categorie + ";" + key1 + ";" + key2 + ";";
diff --git a/lxde-base/lxsession/lxsession-0.5.2.ebuild b/lxde-base/lxsession/lxsession-0.5.2.ebuild
deleted file mode 100644
index 84ca13270d27..000000000000
--- a/lxde-base/lxsession/lxsession-0.5.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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/libgee:0
-	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}"/${P}-reload.patch
-	"${FILESDIR}"/${P}-key2-null.patch
-	"${FILESDIR}"/${P}-notify-daemon-default.patch
-	"${FILESDIR}"/${P}-fix-invalid-memcpy.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-
-	# Don't start in Xfce to avoid bugs like
-	# https://bugzilla.redhat.com/show_bug.cgi?id=616730
-	sed -i 's/^NotShowIn=GNOME;KDE;/NotShowIn=GNOME;KDE;XFCE;/g' data/lxpolkit.desktop.in.in || die
-
-	# fix icon in desktop file
-	# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxsession-edit;a=commit;h=3789a96691eadac9b8f3bf3034a97645860bd138
-	sed -i 's/^Icon=xfwm4/Icon=session-properties/g' data/lxsession-edit.desktop.in || die
-
-	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/lxsession/lxsession-0.5.4-r1.ebuild b/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild
index b6993e1a5b2a..5ff1187688f1 100644
--- a/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild
+++ b/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
 SLOT="0"
 
 # upower USE flag is enabled by default in the desktop profile
diff --git a/lxde-base/lxsession/lxsession-0.5.4.ebuild b/lxde-base/lxsession/lxsession-0.5.4.ebuild
deleted file mode 100644
index e9fb636e8f23..000000000000
--- a/lxde-base/lxsession/lxsession-0.5.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 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/libgee:0
-	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
-}