Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/, lxde-base/lxdm/files/
Date: Sun, 07 Feb 2021 14:33:58
Message-Id: 1612708428.3bb18d8385cd813991a46bdb34e5b34e75d9750a.grknight@gentoo
1 commit: 3bb18d8385cd813991a46bdb34e5b34e75d9750a
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 7 14:33:12 2021 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 7 14:33:48 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bb18d83
7
8 lxde-base/lxdm: Drop old; cleanup metadata
9
10 Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
11
12 .../files/lxdm-0.5.3-pam_console-disable.patch | 8 ---
13 lxde-base/lxdm/lxdm-0.5.3-r1.ebuild | 68 ----------------------
14 lxde-base/lxdm/metadata.xml | 3 -
15 3 files changed, 79 deletions(-)
16
17 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
18 deleted file mode 100644
19 index 8fb8cb4d388..00000000000
20 --- a/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch
21 +++ /dev/null
22 @@ -1,8 +0,0 @@
23 ---- lxdm-0.4.0.orig/pam/lxdm
24 -+++ lxdm-0.4.0/pam/lxdm
25 -@@ -5,4 +5,4 @@ account include system-auth
26 - session optional pam_keyinit.so force revoke
27 - session include system-auth
28 --session optional pam_console.so
29 -+#session optional pam_console.so
30 - session optional pam_gnome_keyring.so auto_start
31
32 diff --git a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
33 deleted file mode 100644
34 index cc2c819ceec..00000000000
35 --- a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
36 +++ /dev/null
37 @@ -1,68 +0,0 @@
38 -# Copyright 1999-2020 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=6
42 -
43 -# Using strip-linguas in eutils
44 -inherit eutils autotools systemd
45 -
46 -DESCRIPTION="LXDE Display Manager"
47 -HOMEPAGE="https://wiki.lxde.org/en/LXDM"
48 -SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
49 -
50 -LICENSE="GPL-3"
51 -SLOT="0"
52 -KEYWORDS="amd64 ~arm ~ppc x86"
53 -
54 -IUSE="debug gtk3 nls pam"
55 -
56 -RDEPEND="
57 - x11-libs/libxcb
58 - gtk3? ( x11-libs/gtk+:3 )
59 - !gtk3? ( x11-libs/gtk+:2 )
60 - nls? ( sys-devel/gettext )
61 - pam? ( sys-libs/pam )"
62 -DEPEND="${RDEPEND}
63 - >=dev-util/intltool-0.40
64 - virtual/pkgconfig"
65 -DOCS=( AUTHORS README TODO )
66 -
67 -src_prepare() {
68 - # Upstream bug, tarball contains pre-made lxdm.conf
69 - rm "${S}"/data/lxdm.conf || die
70 -
71 - # Fix consolekit and selinux
72 - eapply "${FILESDIR}/${P}-pam_console-disable.patch"
73 - # Apply all upstream fixes in git until 2016-11-11
74 - eapply "${FILESDIR}/lxdm-0.5.3-upstream-fixes.patch"
75 - eapply_user
76 -
77 - # this replaces the bootstrap/autogen script in most packages
78 - eautoreconf
79 -
80 - # process LINGUAS
81 - if use nls; then
82 - einfo "Running intltoolize ..."
83 - intltoolize --force --copy --automake || die
84 - strip-linguas -i "${S}/po" || die
85 - fi
86 -}
87 -src_configure() {
88 - econf --enable-password \
89 - --with-x \
90 - --with-xconn=xcb \
91 - --with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
92 - --disable-consolekit \
93 - $(use_enable gtk3) \
94 - $(use_enable nls) \
95 - $(use_enable debug) \
96 - $(use_with pam)
97 -}
98 -
99 -src_install() {
100 - default_src_install
101 -
102 - #Use Gentoo specific Xsession startup file
103 - exeinto /etc/${PN}
104 - doexe "${FILESDIR}"/Xsession
105 -}
106
107 diff --git a/lxde-base/lxdm/metadata.xml b/lxde-base/lxdm/metadata.xml
108 index f241db24df3..0d7fd1bc737 100644
109 --- a/lxde-base/lxdm/metadata.xml
110 +++ b/lxde-base/lxdm/metadata.xml
111 @@ -5,9 +5,6 @@
112 <email>grknight@g.o</email>
113 <name>Brian Evans</name>
114 </maintainer>
115 - <use>
116 - <flag name="gtk3">Use GTK+3 instead of 2</flag>
117 - </use>
118 <upstream>
119 <remote-id type="sourceforge">lxde</remote-id>
120 </upstream>