gentoo resync : 05.04.2019

4 files changed, 88 insertions, 0 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 823192367cb5..518f5e54443f 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index e1c154ab6f11..f1d5f3118d60 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -1,6 +1,8 @@
 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 1601 BLAKE2B 9462ffa28e673e6d33bc8998ac5d87422af87e1ae659a6a749153f13e00f16028c6338036e4db30f17326b298d10dcba1f26150e3ecca0231e8b053166fa0657 SHA512 cfe4f814cea30c4ca305ec88266cfc3e4ec7048a13d62297f4dfa477a35aac73dcd57b108b09a5190f499e4ef12126ccb3c3c8e52c81f45a853ad4cdd16f4cd6
+EBUILD lxdm-0.5.3-r2.ebuild 1830 BLAKE2B cbe3d0b5b1e00e7a10fed92e32dac6c5ccea52193bbb031829d30925e439b04de13ba2d6a8f3150cf3cba0ec6ba81ef974132473e19ed4cdf1725d8f692250b4 SHA512 5d353b584fce136f90ccd3d3babd4083a5a0cc9f4a917ed758fcb10fb19d3eaf7f4f0f9a331a47c8371a729f59d7e3ce2d04ff61f605273058a0e5b03930d714
 MISC metadata.xml 581 BLAKE2B 1fa67dfa056b08a3797120c83b23a11014a0b15a0c9ca6f6323c77ed80654c67cf1ffa7f4877af66286bf739f77ccbd7a997459abc85d7db7d240519bd60d496 SHA512 bfb1509cb2c43f2711a38c284a1a4152192b91c5a9f681fe063848cbeb39e8a2185d2bff084d08b0d9583cb2482101e23ce955aa9b81606a2bc270a657d7a2d1
diff --git a/lxde-base/lxdm/files/lxdm-0.5.3-pam.patch b/lxde-base/lxdm/files/lxdm-0.5.3-pam.patch
new file mode 100644
index 000000000000..c13f4e7f14bc
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.5.3-pam.patch
@@ -0,0 +1,12 @@
+--- a/pam/lxdm
++++ b/pam/lxdm
+@@ -5,6 +5,8 @@ account    include	system-auth
+ auth       optional	pam_gnome_keyring.so
+ account    include	system-local-login
++-session   optional    pam_systemd.so class=greeter
++-session   optional    pam_elogind.so class=greeter
+ 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-r2.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
new file mode 100644
index 000000000000..543eded4fd2a
--- /dev/null
+++ b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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="consolekit debug elogind +gtk3 nls pam systemd"
+
+DEPEND="consolekit? ( sys-auth/consolekit )
+	x11-libs/libxcb
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	nls? ( sys-devel/gettext )
+	pam? ( virtual/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"
+DOCS=( AUTHORS README TODO )
+
+REQUIRED_USE="?? ( consolekit 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) \
+		$(use_enable 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
+}