gentoo resync : 28.04.2021

3 files changed, 0 insertions, 85 deletions

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
-}