gentoo resync : 13.11.2021

4 files changed, 2 insertions, 76 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 2e62bb931c4c..fa5e183ce5b6 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index 030476483f6d..ba79d5329de2 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -2,6 +2,5 @@ AUX Xsession 1974 BLAKE2B 229ba66250e025cb207d9e22a50aab356bfa185cbc65ea87d62a2e
 AUX lxdm-0.5.3-pam.patch 470 BLAKE2B cf386ca0237f7bd4362867083e5c395cdd3e9187ab2c5bfbbcd4e9e405e7f9c9e2ed9e47e1c6ff8ce7cc6d9b04a19e7f03920892e97fa9b7f91b7f76cae2b890 SHA512 b64caec5b27f92ef2c2dc5fbaa0c067d6450bbaa23c057599c741b1f930bcbe47c07ff68f8ea6b35a610edff820aea7071bdde5edbecd47851a2d80f833f8ed2
 AUX lxdm-0.5.3-upstream-fixes.patch 5836 BLAKE2B 0e76a7c92a9b5c57dc85fa9659653b29ea449810ee4bf596e4691e91cc4ed1645b6b75e64bd7fe35f2488f469bad237633042b43e10d10afd0ce7f8fa29bdd9b SHA512 c67186af1f3288633e5a3b8a25167f92999209c99dac4257b330d9046eb0524eb766032dc6e2870a9843afa8ede88defcb1f0e1cff57ece5bc9d5d1121446070
 DIST lxdm-0.5.3.tar.xz 239132 BLAKE2B 9d27feb60452af49127972ce0ecdc25122f5f86961f65512fd6c185c5d6ca03e637fab703fa2df156dba8a3d0ef4e7cf9f55e20762ba49bb14dc4ee8a82b1fa3 SHA512 0e3539c595a71cb850c1756dd075b8d477a4e111a4167714057cac06650e9587f338f797f14122e7b2a2f4ad35b38cd7172b83e996758abeeaf0146d65bbc26f
-EBUILD lxdm-0.5.3-r2.ebuild 1714 BLAKE2B 1b50cf4ebf8198e2ef81e0bca116eb6114a2dca3370c2e2ce650c0b069c1d8afae04c5de31ef6801303a8f25be18c80874eaca394a150a6be9903a9b5e77f30c SHA512 6234f931007e04d0114d686b62ee026ad586e5bd2b722ac3714dd5e3a0436870550b88f777aade64ac7d908ab0b887a47a30c7a9e4453e71252b66bec20aa6c2
-EBUILD lxdm-0.5.3-r3.ebuild 2019 BLAKE2B 15104f348bd49ec0f9aeeca89c8c5f74700b1403a19f9ab4a016770aa76e9c3b3d2d005f8395d8d1b2a916cebd094ccad14cc8085a862790f9e1710603410528 SHA512 5bcd32a07970487a3d9bddf4ee5fa841587f26c693ae75c1e09f7a81099ea50969e7f784a838dfc71bd901351c9e441d02339f736479bca6efec38b8ed5e7bc9
+EBUILD lxdm-0.5.3-r3.ebuild 2015 BLAKE2B 900d2f46b76633cbca2e14bdcdde8fe0657912adeeebd5ee71872e66acc7087e7a09cf0ecfa5cabd749d0f3a3c2fe3af583dca67784339518a6f306003480fd2 SHA512 7c2612756e9d7bcb83b0d0ad93350ca79b06e4991f81d2225b0bc38e40fb21c91317859026fe651d02868984b354aa32fd832813133507aaa651a9214bc9e815
 MISC metadata.xml 321 BLAKE2B 9b47c35de91df4ace007c6d3864b2a06366e7f98053ef4751d851247f3f26d6853383db9a759cd48d5bba37c1874bf31dc3f7ced247e20b5848947142b1061b0 SHA512 783ed64627aa0725e726ade932dcfa204aa2b855dd6e28d2be3aea7c92164c5c7509f1dad861befafe040c04699f8aee297f5c193d2cae21589de2b9a28a5e5d
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
deleted file mode 100644
index a09eebe268f8..000000000000
--- a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools strip-linguas systemd
-
-DESCRIPTION="LXDE Display Manager"
-HOMEPAGE="https://wiki.lxde.org/en/LXDM"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv x86"
-
-IUSE="debug elogind nls pam systemd"
-
-DEPEND="
-	x11-libs/libxcb
-	x11-libs/gtk+:3
-	pam? ( sys-libs/pam )"
-# We only use the pam modules and not actually link to the code
-RDEPEND="${DEPEND}
-	elogind? ( sys-auth/elogind[pam] )
-	systemd? ( sys-apps/systemd[pam] )
-"
-BDEPEND=">=dev-util/intltool-0.40
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-DOCS=( AUTHORS README TODO )
-
-REQUIRED_USE="?? ( elogind systemd ) elogind? ( pam ) systemd? ( pam )"
-
-src_prepare() {
-	# Upstream bug, tarball contains pre-made lxdm.conf
-	rm "${S}"/data/lxdm.conf || die
-
-	# Fix consolekit and selinux
-	eapply "${FILESDIR}/${P}-pam.patch"
-	# Apply all upstream fixes in git until 2016-11-11
-	eapply "${FILESDIR}/lxdm-0.5.3-upstream-fixes.patch"
-	eapply_user
-
-	# this replaces the bootstrap/autogen script in most packages
-	eautoreconf
-
-	# process LINGUAS
-	if use nls; then
-		einfo "Running intltoolize ..."
-		intltoolize --force --copy --automake || die
-		strip-linguas -i "${S}/po" || die
-	fi
-}
-src_configure() {
-	econf	--enable-password \
-		--with-x \
-		--with-xconn=xcb \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		--disable-consolekit \
-		--enable-gtk3 \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_with pam)
-}
-
-src_install() {
-	default_src_install
-
-	#Use Gentoo specific Xsession startup file
-	exeinto /etc/${PN}
-	doexe "${FILESDIR}"/Xsession
-}
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r3.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r3.ebuild
index 0e23294b03a1..8c4862ccb812 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r3.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv x86"
 
 IUSE="debug elogind nls pam systemd"