* [gentoo-commits] proj/qt:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/
@ 2012-03-18 15:37 Ben de Groot
0 siblings, 0 replies; 3+ messages in thread
From: Ben de Groot @ 2012-03-18 15:37 UTC (permalink / raw
To: gentoo-commits
commit: 714c269bddbc4226752ce3b8dc0afe72cbf2f668
Author: Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Sun Mar 18 15:37:17 2012 +0000
Commit: Ben de Groot <yngwin <AT> gmail <DOT> com>
CommitDate: Sun Mar 18 15:37:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=714c269b
x11-misc/lightdm: re-add qt4 useflag for razor greeter
---
x11-misc/lightdm/Manifest | 2 +
x11-misc/lightdm/files/Xsession | 69 +++++++++++++
x11-misc/lightdm/files/lightdm | 7 ++
x11-misc/lightdm/files/lightdm-autologin | 10 ++
.../lightdm/files/session-wrapper-lightdm.patch | 13 +++
x11-misc/lightdm/lightdm-1.1.8-r1.ebuild | 105 ++++++++++++++++++++
x11-misc/lightdm/metadata.xml | 11 ++
7 files changed, 217 insertions(+), 0 deletions(-)
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
new file mode 100644
index 0000000..1f56fb2
--- /dev/null
+++ b/x11-misc/lightdm/Manifest
@@ -0,0 +1,2 @@
+DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500
+DIST lightdm-1.1.8.tar.gz 637844 SHA256 3e30957c57c16cad0d2d130e41acd40e8d1e9a05d75b3fac9eb4e657c9b066eb SHA512 8bd6177cad5d474a31ac0ecdb47dc05e9461bb96cac97986736cfbb07f0bf96d5dbe0a97aa7da6761e60e2df2072a4f28911eeb8b2c0d3361a00b75b213d85b6 WHIRLPOOL 23f83d58e11bc176c0f654415e21e9f064192aabd0097f9fd30db280b92b59beb6873d59b1304e69eae93e616a2d038417df9cd74a1058878b714794b2db2e2f
diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession
new file mode 100644
index 0000000..5da041e
--- /dev/null
+++ b/x11-misc/lightdm/files/Xsession
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# LightDM wrapper to run around X sessions.
+
+echo "Running X session wrapper"
+
+# Load profile
+for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
+ if [ -f "$file" ]; then
+ echo "Loading profile from $file";
+ . "$file"
+ fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
+ if [ -f "$file" ]; then
+ echo "Loading resource: $file"
+ xrdb -nocpp -merge "$file"
+ fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+ if [ -f "$file" ]; then
+ echo "Loading keymap: $file"
+ setxkbmap `cat "$file"`
+ XKB_IN_USE=yes
+ fi
+done
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ]; then
+ for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+ if [ -f "$file" ]; then
+ echo "Loading modmap: $file"
+ xmodmap "$file"
+ fi
+ done
+fi
+
+unset XKB_IN_USE
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+ for script in $xinitdir/*; do
+ echo "Loading xinit script $script"
+ if [ -x "$script" -a ! -d "$script" ]; then
+ . "$script"
+ fi
+ done
+fi
+
+# Load Xsession scripts
+xsessionddir="/etc/X11/Xsession.d"
+if [ -d "$xsessionddir" ]; then
+ for i in `ls $xsessionddir`; do
+ script="$xsessionddir/$i"
+ echo "Loading X session script $script"
+ if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
+ . "$script"
+ fi
+ done
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $@
diff --git a/x11-misc/lightdm/files/lightdm b/x11-misc/lightdm/files/lightdm
new file mode 100644
index 0000000..ff404de
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth optional pam_env.so
+auth include system-login
+auth required pam_nologin.so
+account include system-login
+password include system-login
+session include system-auth
diff --git a/x11-misc/lightdm/files/lightdm-autologin b/x11-misc/lightdm/files/lightdm-autologin
new file mode 100644
index 0000000..9d165d6
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-autologin
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth optional pam_env.so
+auth required pam_nologin.so
+auth required pam_permit.so
+account include system-login
+password include system-login
+session include system-auth
+# For the keyring to unlock with autologin, you need to set an empty
+# password on the keyring.
+#Keyring=session optional pam_gnome_keyring.so auto_start
diff --git a/x11-misc/lightdm/files/session-wrapper-lightdm.patch b/x11-misc/lightdm/files/session-wrapper-lightdm.patch
new file mode 100644
index 0000000..9f41816
--- /dev/null
+++ b/x11-misc/lightdm/files/session-wrapper-lightdm.patch
@@ -0,0 +1,13 @@
+Index: lightdm-1.0.6/data/lightdm.conf
+===================================================================
+--- lightdm-1.0.6.orig/data/lightdm.conf
++++ lightdm-1.0.6/data/lightdm.conf
+@@ -65,7 +65,7 @@
+ #user-session=default
+ #allow-guest=true
+ #guest-session=UNIMPLEMENTED
+-#session-wrapper=lightdm-session
++session-wrapper=/etc/lightdm/Xsession
+ #display-setup-script=
+ #greeter-setup-script=
+ #session-setup-script=
diff --git a/x11-misc/lightdm/lightdm-1.1.8-r1.ebuild b/x11-misc/lightdm/lightdm-1.1.8-r1.ebuild
new file mode 100644
index 0000000..a69af21
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.1.8-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.1.8.ebuild,v 1.1 2012/03/16 22:29:52 hwoarang Exp $
+
+EAPI=4
+inherit autotools eutils pam
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
+ mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk +introspection qt4"
+
+RDEPEND="dev-libs/glib:2
+ dev-libs/libxml2
+ sys-apps/accountsservice
+ virtual/pam
+ x11-libs/libxklavier
+ x11-libs/libX11
+ introspection? ( dev-libs/gobject-introspection )
+ qt4? ( x11-libs/qt-core:4
+ x11-libs/qt-dbus:4
+ x11-libs/qt-gui:4 )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ dev-util/pkgconfig
+ gnome-base/gnome-common
+ sys-devel/gettext"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
+
+DOCS=( NEWS )
+
+src_prepare() {
+ sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
+ sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
+ epatch "${FILESDIR}"/session-wrapper-${PN}.patch
+ if has_version dev-libs/gobject-introspection; then
+ eautoreconf
+ else
+ AT_M4DIR=${WORKDIR} eautoreconf
+ fi
+}
+
+src_configure() {
+ # Set default values if global vars unset
+ local _greeter _session _user
+ _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+ _session=${LIGHTDM_SESSION:=gnome}
+ _user=${LIGHTDM_USER:=root}
+ # Let user know how lightdm is configured
+ einfo "Gentoo configuration"
+ einfo "Default greeter: ${_greeter}"
+ einfo "Default session: ${_session}"
+ einfo "Greeter user: ${_user}"
+
+ # do the actual configuration
+ econf --localstatedir=/var \
+ --disable-static \
+ --disable-tests \
+ $(use_enable introspection) \
+ $(use_enable qt4 liblightdm-qt) \
+ --with-user-session=${_session} \
+ --with-greeter-session=${_greeter} \
+ --with-greeter-user=${_user} \
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+
+ # Install missing files
+ insinto /etc/${PN}/
+ doins "${S}"/data/{${PN},users,keys}.conf
+ doins "${FILESDIR}"/Xsession
+ fperms +x /etc/${PN}/Xsession
+ # remove .la files
+ find "${ED}" -name "*.la" -exec rm -rf {} +
+ rm -Rf "${ED}"/etc/init || die
+
+ dopamd "${FILESDIR}"/${PN}
+ dopamd "${FILESDIR}"/${PN}-autologin
+}
+
+pkg_postinst() {
+ elog
+ elog "You will need to install a greeter as actual GUI for LightDM."
+ elog "Currently available greeters include:"
+ elog " x11-misc/lightdm-gtk-greeter"
+ elog " x11-wm/razorqt with USE=lightdm"
+ elog
+ elog "Even though the default /etc/${PN}/${PN}.conf will work for"
+ elog "most users, make sure you configure it to suit your needs"
+ elog "before using ${PN} for the first time."
+ elog "You can test the configuration file using the following"
+ elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
+ elog "requires xorg-server to be built with the 'kdrive' useflag."
+ elog
+ elog "You can also set your own default values for LIGHTDM_GREETER,"
+ elog "LIGHTDM_SESSION, LIGHTDM_USER in /etc/make.conf"
+ elog
+}
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
new file mode 100644
index 0000000..5f6cca2
--- /dev/null
+++ b/x11-misc/lightdm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+</maintainer>
+<use>
+ <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
+</use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/
@ 2012-05-27 6:35 Ben de Groot
0 siblings, 0 replies; 3+ messages in thread
From: Ben de Groot @ 2012-05-27 6:35 UTC (permalink / raw
To: gentoo-commits
commit: 77523983d5c0bd1cde290e3891382b8c40243b7b
Author: Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Sun May 27 06:33:33 2012 +0000
Commit: Ben de Groot <yngwin <AT> gmail <DOT> com>
CommitDate: Sun May 27 06:33:33 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=77523983
x11-misc/lightdm: update to 1.2.2
Include some improvements from dagger's dev overlay.
Make ebuild greeter agnostic, and let user set defaults.
---
x11-misc/lightdm/Manifest | 1 +
x11-misc/lightdm/files/lightdm | 1 +
.../files/lightdm-1.2.0-fix-configure.patch | 10 ++++++++++
...ightdm-1.1.8-r1.ebuild => lightdm-1.2.2.ebuild} | 15 +++++++--------
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 1f56fb2..bec123e 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,2 +1,3 @@
DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500
DIST lightdm-1.1.8.tar.gz 637844 SHA256 3e30957c57c16cad0d2d130e41acd40e8d1e9a05d75b3fac9eb4e657c9b066eb SHA512 8bd6177cad5d474a31ac0ecdb47dc05e9461bb96cac97986736cfbb07f0bf96d5dbe0a97aa7da6761e60e2df2072a4f28911eeb8b2c0d3361a00b75b213d85b6 WHIRLPOOL 23f83d58e11bc176c0f654415e21e9f064192aabd0097f9fd30db280b92b59beb6873d59b1304e69eae93e616a2d038417df9cd74a1058878b714794b2db2e2f
+DIST lightdm-1.2.2.tar.gz 642334 SHA256 772cc6a4e7da670352f6a38c05470b8fcfe50a2c1d3d424be1c9309afb0c541b SHA512 b5135e9241be12353da27945abad73c04f888cd0be1991cb23663be84b63b3781da93add7e51e438dee4e36a259458d6c66beb60382937234acf28dcbda520e7 WHIRLPOOL 968addfb9d56339ec20918761e30195cbdd357da59287325af7067ff229994937cb5fb6436e04a9a67987f6657b52a36cb3f3d993ce2330de74e42c8678c3c5c
diff --git a/x11-misc/lightdm/files/lightdm b/x11-misc/lightdm/files/lightdm
index ff404de..6286d6a 100644
--- a/x11-misc/lightdm/files/lightdm
+++ b/x11-misc/lightdm/files/lightdm
@@ -4,4 +4,5 @@ auth include system-login
auth required pam_nologin.so
account include system-login
password include system-login
+session optional pam_loginuid.so
session include system-auth
diff --git a/x11-misc/lightdm/files/lightdm-1.2.0-fix-configure.patch b/x11-misc/lightdm/files/lightdm-1.2.0-fix-configure.patch
new file mode 100644
index 0000000..c8c795e
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-1.2.0-fix-configure.patch
@@ -0,0 +1,10 @@
+--- configure.ac~ 2012-04-23 12:12:44.000000000 +0100
++++ configure.ac 2012-04-23 12:25:51.050999668 +0100
+@@ -93,6 +93,7 @@
+ PKG_CHECK_MODULES(LIBLIGHTDM_QT, [
+ QtCore
+ QtDBus
++ QtGui
+ ])
+ QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir`
+ AC_CHECK_TOOLS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH])
diff --git a/x11-misc/lightdm/lightdm-1.1.8-r1.ebuild b/x11-misc/lightdm/lightdm-1.2.2.ebuild
similarity index 86%
rename from x11-misc/lightdm/lightdm-1.1.8-r1.ebuild
rename to x11-misc/lightdm/lightdm-1.2.2.ebuild
index ec13e4e..884f5a9 100644
--- a/x11-misc/lightdm/lightdm-1.1.8-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.2.2.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.1.8.ebuild,v 1.1 2012/03/16 22:29:52 hwoarang Exp $
+# $Header: $
EAPI=4
inherit autotools eutils pam
DESCRIPTION="A lightweight display manager"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
+SRC_URI="http://launchpad.net/${PN}/1.2/${PV}/+download/${P}.tar.gz
mirror://gentoo/introspection-20110205.m4.tar.bz2"
LICENSE="GPL-3 LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="gtk +introspection qt4"
+IUSE="+introspection qt4"
RDEPEND="dev-libs/glib:2
dev-libs/libxml2
@@ -26,18 +26,21 @@ RDEPEND="dev-libs/glib:2
x11-libs/qt-dbus:4
x11-libs/qt-gui:4 )"
DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
dev-util/intltool
gnome-base/gnome-common
sys-devel/gettext
virtual/pkgconfig"
-PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
DOCS=( NEWS )
src_prepare() {
sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
+
epatch "${FILESDIR}"/session-wrapper-${PN}.patch
+ epatch "${FILESDIR}/${PN}"-1.2.0-fix-configure.patch
+
if has_version dev-libs/gobject-introspection; then
eautoreconf
else
@@ -60,7 +63,6 @@ src_configure() {
# do the actual configuration
econf --localstatedir=/var \
--disable-static \
- --disable-tests \
$(use_enable introspection) \
$(use_enable qt4 liblightdm-qt) \
--with-user-session=${_session} \
@@ -88,9 +90,6 @@ src_install() {
pkg_postinst() {
elog
elog "You will need to install a greeter as actual GUI for LightDM."
- elog "Currently available greeters include:"
- elog " x11-misc/lightdm-gtk-greeter"
- elog " x11-wm/razorqt with USE=lightdm"
elog
elog "Even though the default /etc/${PN}/${PN}.conf will work for"
elog "most users, make sure you configure it to suit your needs"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/
@ 2012-05-30 14:24 Ben de Groot
0 siblings, 0 replies; 3+ messages in thread
From: Ben de Groot @ 2012-05-30 14:24 UTC (permalink / raw
To: gentoo-commits
commit: 45ada3c0ec6f1799ca066fab9e3d10006db10ab5
Author: Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Wed May 30 14:24:32 2012 +0000
Commit: Ben de Groot <yngwin <AT> gmail <DOT> com>
CommitDate: Wed May 30 14:24:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=45ada3c0
x11-misc/lightdm: remove, since changes have been committed to gx86
---
x11-misc/lightdm/Manifest | 2 -
x11-misc/lightdm/files/Xsession | 69 -------------
x11-misc/lightdm/files/lightdm | 8 --
.../files/lightdm-1.2.0-fix-configure.patch | 10 --
x11-misc/lightdm/files/lightdm-autologin | 10 --
.../lightdm/files/session-wrapper-lightdm.patch | 13 ---
x11-misc/lightdm/lightdm-1.2.2.ebuild | 104 --------------------
x11-misc/lightdm/metadata.xml | 11 --
8 files changed, 0 insertions(+), 227 deletions(-)
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
deleted file mode 100644
index c03747d..0000000
--- a/x11-misc/lightdm/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500
-DIST lightdm-1.2.2.tar.gz 642334 SHA256 772cc6a4e7da670352f6a38c05470b8fcfe50a2c1d3d424be1c9309afb0c541b SHA512 b5135e9241be12353da27945abad73c04f888cd0be1991cb23663be84b63b3781da93add7e51e438dee4e36a259458d6c66beb60382937234acf28dcbda520e7 WHIRLPOOL 968addfb9d56339ec20918761e30195cbdd357da59287325af7067ff229994937cb5fb6436e04a9a67987f6657b52a36cb3f3d993ce2330de74e42c8678c3c5c
diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession
deleted file mode 100644
index 5da041e..0000000
--- a/x11-misc/lightdm/files/Xsession
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-#
-# LightDM wrapper to run around X sessions.
-
-echo "Running X session wrapper"
-
-# Load profile
-for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
- if [ -f "$file" ]; then
- echo "Loading profile from $file";
- . "$file"
- fi
-done
-
-# Load resources
-for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
- if [ -f "$file" ]; then
- echo "Loading resource: $file"
- xrdb -nocpp -merge "$file"
- fi
-done
-
-# Load keymaps
-for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
- if [ -f "$file" ]; then
- echo "Loading keymap: $file"
- setxkbmap `cat "$file"`
- XKB_IN_USE=yes
- fi
-done
-
-# Load xmodmap if not using XKB
-if [ -z "$XKB_IN_USE" ]; then
- for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
- if [ -f "$file" ]; then
- echo "Loading modmap: $file"
- xmodmap "$file"
- fi
- done
-fi
-
-unset XKB_IN_USE
-
-# Run all system xinitrc shell scripts.
-xinitdir="/etc/X11/xinit/xinitrc.d"
-if [ -d "$xinitdir" ]; then
- for script in $xinitdir/*; do
- echo "Loading xinit script $script"
- if [ -x "$script" -a ! -d "$script" ]; then
- . "$script"
- fi
- done
-fi
-
-# Load Xsession scripts
-xsessionddir="/etc/X11/Xsession.d"
-if [ -d "$xsessionddir" ]; then
- for i in `ls $xsessionddir`; do
- script="$xsessionddir/$i"
- echo "Loading X session script $script"
- if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
- . "$script"
- fi
- done
-fi
-
-echo "X session wrapper complete, running session $@"
-
-exec $@
diff --git a/x11-misc/lightdm/files/lightdm b/x11-misc/lightdm/files/lightdm
deleted file mode 100644
index 6286d6a..0000000
--- a/x11-misc/lightdm/files/lightdm
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth optional pam_env.so
-auth include system-login
-auth required pam_nologin.so
-account include system-login
-password include system-login
-session optional pam_loginuid.so
-session include system-auth
diff --git a/x11-misc/lightdm/files/lightdm-1.2.0-fix-configure.patch b/x11-misc/lightdm/files/lightdm-1.2.0-fix-configure.patch
deleted file mode 100644
index c8c795e..0000000
--- a/x11-misc/lightdm/files/lightdm-1.2.0-fix-configure.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac~ 2012-04-23 12:12:44.000000000 +0100
-+++ configure.ac 2012-04-23 12:25:51.050999668 +0100
-@@ -93,6 +93,7 @@
- PKG_CHECK_MODULES(LIBLIGHTDM_QT, [
- QtCore
- QtDBus
-+ QtGui
- ])
- QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir`
- AC_CHECK_TOOLS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH])
diff --git a/x11-misc/lightdm/files/lightdm-autologin b/x11-misc/lightdm/files/lightdm-autologin
deleted file mode 100644
index 9d165d6..0000000
--- a/x11-misc/lightdm/files/lightdm-autologin
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth optional pam_env.so
-auth required pam_nologin.so
-auth required pam_permit.so
-account include system-login
-password include system-login
-session include system-auth
-# For the keyring to unlock with autologin, you need to set an empty
-# password on the keyring.
-#Keyring=session optional pam_gnome_keyring.so auto_start
diff --git a/x11-misc/lightdm/files/session-wrapper-lightdm.patch b/x11-misc/lightdm/files/session-wrapper-lightdm.patch
deleted file mode 100644
index 9f41816..0000000
--- a/x11-misc/lightdm/files/session-wrapper-lightdm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lightdm-1.0.6/data/lightdm.conf
-===================================================================
---- lightdm-1.0.6.orig/data/lightdm.conf
-+++ lightdm-1.0.6/data/lightdm.conf
-@@ -65,7 +65,7 @@
- #user-session=default
- #allow-guest=true
- #guest-session=UNIMPLEMENTED
--#session-wrapper=lightdm-session
-+session-wrapper=/etc/lightdm/Xsession
- #display-setup-script=
- #greeter-setup-script=
- #session-setup-script=
diff --git a/x11-misc/lightdm/lightdm-1.2.2.ebuild b/x11-misc/lightdm/lightdm-1.2.2.ebuild
deleted file mode 100644
index 884f5a9..0000000
--- a/x11-misc/lightdm/lightdm-1.2.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit autotools eutils pam
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="http://launchpad.net/${PN}/1.2/${PV}/+download/${P}.tar.gz
- mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection qt4"
-
-RDEPEND="dev-libs/glib:2
- dev-libs/libxml2
- sys-apps/accountsservice
- virtual/pam
- x11-libs/libxklavier
- x11-libs/libX11
- introspection? ( dev-libs/gobject-introspection )
- qt4? ( x11-libs/qt-core:4
- x11-libs/qt-dbus:4
- x11-libs/qt-gui:4 )"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- dev-util/intltool
- gnome-base/gnome-common
- sys-devel/gettext
- virtual/pkgconfig"
-
-DOCS=( NEWS )
-
-src_prepare() {
- sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
- sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
-
- epatch "${FILESDIR}"/session-wrapper-${PN}.patch
- epatch "${FILESDIR}/${PN}"-1.2.0-fix-configure.patch
-
- if has_version dev-libs/gobject-introspection; then
- eautoreconf
- else
- AT_M4DIR=${WORKDIR} eautoreconf
- fi
-}
-
-src_configure() {
- # Set default values if global vars unset
- local _greeter _session _user
- _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
- _session=${LIGHTDM_SESSION:=gnome}
- _user=${LIGHTDM_USER:=root}
- # Let user know how lightdm is configured
- einfo "Gentoo configuration"
- einfo "Default greeter: ${_greeter}"
- einfo "Default session: ${_session}"
- einfo "Greeter user: ${_user}"
-
- # do the actual configuration
- econf --localstatedir=/var \
- --disable-static \
- $(use_enable introspection) \
- $(use_enable qt4 liblightdm-qt) \
- --with-user-session=${_session} \
- --with-greeter-session=${_greeter} \
- --with-greeter-user=${_user} \
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
- default
-
- # Install missing files
- insinto /etc/${PN}/
- doins "${S}"/data/{${PN},users,keys}.conf
- doins "${FILESDIR}"/Xsession
- fperms +x /etc/${PN}/Xsession
- # remove .la files
- find "${ED}" -name "*.la" -exec rm -rf {} +
- rm -Rf "${ED}"/etc/init || die
-
- dopamd "${FILESDIR}"/${PN}
- dopamd "${FILESDIR}"/${PN}-autologin
-}
-
-pkg_postinst() {
- elog
- elog "You will need to install a greeter as actual GUI for LightDM."
- elog
- elog "Even though the default /etc/${PN}/${PN}.conf will work for"
- elog "most users, make sure you configure it to suit your needs"
- elog "before using ${PN} for the first time."
- elog "You can test the configuration file using the following"
- elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
- elog "requires xorg-server to be built with the 'kdrive' useflag."
- elog
- elog "You can also set your own default values for LIGHTDM_GREETER,"
- elog "LIGHTDM_SESSION, LIGHTDM_USER in /etc/make.conf"
- elog
-}
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
deleted file mode 100644
index 5f6cca2..0000000
--- a/x11-misc/lightdm/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<use>
- <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
-</use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-30 14:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-30 14:24 [gentoo-commits] proj/qt:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/ Ben de Groot
-- strict thread matches above, loose matches on Subject: below --
2012-05-27 6:35 Ben de Groot
2012-03-18 15:37 Ben de Groot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox