gentoo (valentine's day) resync : 14.02.2021

6 files changed, 10 insertions, 92 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index d5465bc09594..0dcf22e5d8ff 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index 69d03959ac1e..bbc820a15365 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -1,8 +1,6 @@
 AUX Xsession 1974 BLAKE2B 229ba66250e025cb207d9e22a50aab356bfa185cbc65ea87d62a2ebe02c3d3b156c3d414674ca6ed2ab9e466f058ee91e9d3feabe17f9494b397b219ecd0c688 SHA512 497c420601e171ae3e753f2277119bd39eb0cb4e6968b5294c54ec1673d96553787f4e02c3a0bb1d0270048e721ee96aa4b3df0caed8ae40b12d726c6abf90da
 AUX lxdm-0.5.3-pam.patch 470 BLAKE2B cf386ca0237f7bd4362867083e5c395cdd3e9187ab2c5bfbbcd4e9e405e7f9c9e2ed9e47e1c6ff8ce7cc6d9b04a19e7f03920892e97fa9b7f91b7f76cae2b890 SHA512 b64caec5b27f92ef2c2dc5fbaa0c067d6450bbaa23c057599c741b1f930bcbe47c07ff68f8ea6b35a610edff820aea7071bdde5edbecd47851a2d80f833f8ed2
-AUX lxdm-0.5.3-pam_console-disable.patch 307 BLAKE2B 4bf6b05b5b803b582e441cd5b17c43fcde6da2ddafef92898d6bcb92897b274d6c5e76bf716fd1c8435f73094cc2ab3493b30b5c7ff32cb197207c4b2df09170 SHA512 a86c2f706ce0af21e33248cd488eb726033682fdedaa559cce23bb01fda51330d4293927145233c0b6cef3bb547042654ddcb00745d13f1cba2755f53a71a072
 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-r1.ebuild 1549 BLAKE2B 6a22f765f60efdaa11adc03b6da72f06d5351a4685af43b3e93a342de3fb655192508402a3abec366864873308f8f7e609277da174088bcb17dbbf9916ed7cab SHA512 9e55aca8efaab0d0566da17fbf3a1e2d9992ff54dce4dce728055b4cc705e4f84b59979af20ddfab832b342e3b528d8a8b02b09adb13624095ccdc40559f1e72
-EBUILD lxdm-0.5.3-r2.ebuild 1775 BLAKE2B 31fac516d653db6845b945d48e3dd60c9cd75491d884abbc640606ad7837a7e55963b820e2cb3213fe4136d6cdb9a907a83d62fb3c2c470cc8c17d772f59e1d3 SHA512 4c8b4a9c18e69a7841e91150e35b36727d23eb564ea157a2a3a6798389f3338add0b4f2e1e386c35904df9209045cf455d5b4930211bc52d214c7c5618f90832
-MISC metadata.xml 385 BLAKE2B 177f5546a968d34e0c4e91fffab0d4473da28ee5501ec59fad5d351ff6c3e1abdea5da1f5d2f27db1efa4b198363df715d8ed0ad86a9dfe893cefbd68dca6070 SHA512 744589fd0229e035f7b42be3744a9043413cdfb0c1d977fcb6aea67bf0e4c6cc09d4f27b1a33491b51fd9000df32ff7ac5e56c8ab892732fc29852d0dc247332
+EBUILD lxdm-0.5.3-r2.ebuild 1693 BLAKE2B 03932bc8a2bf70b72e81268d62eab781fb56ce55cd4994ab7e14172e52f2ce594893d05e3fc3e4fc3e32c1df61bf9ba3deab4dedea3babcb44eaa4d5758fd073 SHA512 0ce04544ab18346b210e9c2cbb71b4e2e5f83680a192e7e1aa81ef42d97b3ca5a50164469051f874202757bcbf6decd0d4af2b8b543eae4b0130f15e559eebc2
+MISC metadata.xml 320 BLAKE2B a8062bdfacafdfde6dea3070d5bca886cd63ba90b8bff178b82b1f00d297aa9a002b160e13673bd09ededd08ef6f140ec5167970bab6a520c0ec83597ac6b52f SHA512 96357b205f52d95923b471320e623e06ff35e5054eac0ce1e0da7b35181e59d181d8f62d46563a82b22f8e2219f52f337bd600293f5d4f729e7c21e56a4417f2
diff --git a/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch b/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch
deleted file mode 100644
index 8fb8cb4d3882..000000000000
--- a/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- lxdm-0.4.0.orig/pam/lxdm
-+++ lxdm-0.4.0/pam/lxdm
-@@ -5,4 +5,4 @@ account    include	system-auth
- session    optional	pam_keyinit.so force revoke
- session    include	system-auth
--session    optional	pam_console.so
-+#session    optional	pam_console.so
- session    optional	pam_gnome_keyring.so auto_start
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
deleted file mode 100644
index cc2c819ceecf..000000000000
--- a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Using strip-linguas in eutils
-inherit eutils autotools 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 ~ppc x86"
-
-IUSE="debug gtk3 nls pam"
-
-RDEPEND="
-	x11-libs/libxcb
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	# Upstream bug, tarball contains pre-made lxdm.conf
-	rm "${S}"/data/lxdm.conf || die
-
-	# Fix consolekit and selinux
-	eapply "${FILESDIR}/${P}-pam_console-disable.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 \
-		$(use_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-r2.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
index b15ace55d6d0..cbc776c32d78 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# Using strip-linguas in eutils
-inherit eutils autotools systemd
+inherit l10n autotools systemd
 
 DESCRIPTION="LXDE Display Manager"
 HOMEPAGE="https://wiki.lxde.org/en/LXDM"
@@ -14,13 +13,11 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 
-IUSE="debug elogind +gtk3 nls pam systemd"
+IUSE="debug elogind nls pam systemd"
 
 DEPEND="
 	x11-libs/libxcb
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	nls? ( sys-devel/gettext )
+	x11-libs/gtk+:3
 	pam? ( sys-libs/pam )"
 # We only use the pam modules and not actually link to the code
 RDEPEND="${DEPEND}
@@ -28,7 +25,9 @@ RDEPEND="${DEPEND}
 	systemd? ( sys-apps/systemd[pam] )
 "
 BDEPEND=">=dev-util/intltool-0.40
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
 DOCS=( AUTHORS README TODO )
 
 REQUIRED_USE="?? ( elogind systemd ) elogind? ( pam ) systemd? ( pam )"
@@ -59,7 +58,7 @@ src_configure() {
 		--with-xconn=xcb \
 		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
 		--disable-consolekit \
-		$(use_enable gtk3) \
+		--enable-gtk3 \
 		$(use_enable nls) \
 		$(use_enable debug) \
 		$(use_with pam)
diff --git a/lxde-base/lxdm/metadata.xml b/lxde-base/lxdm/metadata.xml
index f241db24df39..0d7fd1bc7375 100644
--- a/lxde-base/lxdm/metadata.xml
+++ b/lxde-base/lxdm/metadata.xml
@@ -5,9 +5,6 @@
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Use GTK+3 instead of 2</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">lxde</remote-id>
 	</upstream>