[gpe-base/gpe-login] Cleanup gpe-login scripts.

5 files changed, 101 insertions, 4 deletions

diff --git a/gpe-base/gpe-login/Manifest b/gpe-base/gpe-login/Manifest
index fa3d3be..a68309e 100644
--- a/gpe-base/gpe-login/Manifest
+++ b/gpe-base/gpe-login/Manifest
@@ -1,11 +1,13 @@
 AUX gentoo-badge2.png 1055 SHA1 d064c8d97c9f3fb553eee6b16f85c915cbfd2848 SHA256 02e17bb52931a765318ba850ae39fd6c4eef74c3a3817d87ecbe79480744a791
 AUX gpe-login-0.95-gentoologo.patch 1229 SHA1 a495bc0ff74376d61222a23364b08052ccf0d650 SHA256 091b67db8ea3f5b571ca5c7620c4bd718e5c76683085c894ade38f5b7b4a84ab
 AUX gpe-login.geometry-gentoo 69 SHA1 e30e13292b76bd21db645b54754d1be49def8c75 SHA256 4f7c92abb8b5f49008e0134e6dbf218885cf0d9dae5f3f205e504c8a77d7e688
-AUX gpe-login.setup-gentoo 54 SHA1 9fb9284670b3b792c01516cdd3485134212754f4 SHA256 364a92fa09baf846c676d19a02c996f7aa7a8c4032aeb4254addc0c32da71cd1
+AUX gpe-login.session-gentoo 255 SHA1 4910af1bd4a0dde396610ca70f7b7529a4be6191 SHA256 6b7864bdc9f57c4a00a71dc47144fa9f3b56796cefe8dffc37835218ece8d158
+AUX gpe-login.setup-gentoo 236 SHA1 e43043b801d6375e59c150637b6610ea176109c7 SHA256 519042d41824ce8529fe0275e34764f823d66b7d1a0a44d941dd3d1a25107da9
+AUX gpe-login.xinit-gentoo 402 SHA1 02c40d2286b0b5ec820f298d0092cb8e673b7e3e SHA256 1c5b265cd6b58ea5d915b85ac48f01a282eb4f8a317227a4a9b9ab96acc1ce2b
 AUX locale.default-gentoo 45 SHA1 0a5e46321bd5a53ff9a09b914f0aa742b80ab561 SHA256 6cecdcb10f69896afaaae5cd84c4077409f93ac54d561e137b935a965f6000b9
 DIST gpe-login-0.95.tar.bz2 160704 SHA1 8f689fd43322cc266a17b93e60e2c7635d933983 SHA256 8bea38af14c98354b1ee023475315ae3ba462d33b136a73cde9d83303b659d84
 EBUILD gpe-login-0.95-r1.ebuild 1668 SHA1 ac3c53f6e2ed43a5df8fe45008a5a04c2c560f80 SHA256 28a33e2c5f21b6bb7f6dffe3940c802a373b0ac8449557409066ea9cb838d092
-EBUILD gpe-login-0.95-r2.ebuild 1771 SHA1 a3d9305cdfdc67db35c366a7f2e020b13a7bb401 SHA256 6d42c85f80c28364ffa08ca6b28b11531800e20bc2da2d503e2f576134627cb8
+EBUILD gpe-login-0.95-r3.ebuild 1891 SHA1 f75fd74149d4b626484bd3bef250616433722c9b SHA256 e46a65d7d50fc49ca3ce04d3940b88db1cdc235c3c6ad8fdac83c39aa23fb899
 EBUILD gpe-login-0.95.ebuild 1305 SHA1 e62e09747e23ce0d07e541dacfe769706eb30921 SHA256 1d62c3506a8f45402fd0bd35c421718e5761d445a7a5ec7bce84a8250bdd3ff0
 MISC ChangeLog 713 SHA1 9ecb2e42cdfb2f3ceba0658b457383a5cb09f3de SHA256 29a83fc33ce430a9f817bb0db9d100a5176405ec04024162d30f726360d67f9a
 MISC metadata.xml 215 SHA1 7cdcbeff68c19a0ecc3bcb46b2bd094ee69cd48d SHA256 b80ac51746e7677bc32591254e54b62c49f2c6cc134fe2a29247958ba9a58a5f
diff --git a/gpe-base/gpe-login/files/gpe-login.session-gentoo b/gpe-base/gpe-login/files/gpe-login.session-gentoo
new file mode 100644
index 0000000..d0b5022
--- /dev/null
+++ b/gpe-base/gpe-login/files/gpe-login.session-gentoo
@@ -0,0 +1,8 @@
+#!/bin/sh
+# /etc/X11/Xsession.d/50autolock: gpe-login autolock.
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Angelo Arrifano <miknix@gentoo.org>
+# $Header: $
+
+/usr/bin/gpe-login --autolock &
diff --git a/gpe-base/gpe-login/files/gpe-login.setup-gentoo b/gpe-base/gpe-login/files/gpe-login.setup-gentoo
index a84e476..0ca7f9b 100644
--- a/gpe-base/gpe-login/files/gpe-login.setup-gentoo
+++ b/gpe-base/gpe-login/files/gpe-login.setup-gentoo
@@ -1,4 +1,7 @@
 #!/bin/sh
-# Dummy gpe-login.setup
+# /etc/X11/gpe-login.setup: This is executed at gpe-login startup.
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Angelo Arrifano <miknix@gentoo.org>
+# $Header: $
 
-PATH=/usr/bin:/bin
diff --git a/gpe-base/gpe-login/files/gpe-login.xinit-gentoo b/gpe-base/gpe-login/files/gpe-login.xinit-gentoo
new file mode 100644
index 0000000..804584a
--- /dev/null
+++ b/gpe-base/gpe-login/files/gpe-login.xinit-gentoo
@@ -0,0 +1,12 @@
+#!/bin/sh
+# /etc/X11/gpe-dm/Xinit.d/99gpe-login: gpe-login launcher.
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Angelo Arrifano <miknix@gentoo.org>
+# $Header: $
+# Based on gpe-login.xinit
+
+# FIXME: We need to check if this isn't inherited to the user environment
+# export GTK2_RC_FILES=/etc/X11/gpe-login.gtkrc
+
+exec /usr/bin/gpe-login
diff --git a/gpe-base/gpe-login/gpe-login-0.95-r3.ebuild b/gpe-base/gpe-login/gpe-login-0.95-r3.ebuild
new file mode 100644
index 0000000..bb635c7
--- /dev/null
+++ b/gpe-base/gpe-login/gpe-login-0.95-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/gpe-login-0.95-r1.ebuild,v 1.1 2009/04/07 15:28:41 miknix Exp $
+
+GPE_TARBALL_SUFFIX="bz2"
+inherit gpe eutils
+
+DESCRIPTION="The GPE user login screen"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~x86"
+IUSE="branding"
+
+DEPEND="${DEPEND}
+	>=gpe-base/libgpewidget-0.102"
+RDEPEND="${RDEPEND}
+	${DEPEND}
+	x11-misc/xkbd
+	gpe-utils/gpe-ownerinfo"
+
+src_unpack() {
+	local gentoo_files="gpe-login.setup
+	                    gpe-login.xinit
+						gpe-login.session"
+
+	gpe_src_unpack "$@"
+
+	# Patch login to show up a beaty gentoo logo (if found)
+	# solar says conditional patching is bad
+	epatch "${FILESDIR}/gpe-login-0.95-gentoologo.patch"
+
+	# Use our gentooish scripts instead
+	for gfile in $gentoo_files; do
+		cp "${FILESDIR}/${gfile}-gentoo" "${gfile}" \
+			|| die "Replace ${gfile} fail"
+		chmod 0755 ${gfile} || die "Cannot chmod ${gfile}"
+	done
+
+	# We fixed gpe-dm to use this path
+	sed -i -e 's;/X11/Xinit.d;/X11/gpe-dm/Xinit.d;g' Makefile.in \
+		|| die "Sed failed for file Xinit.d"
+}
+
+src_install() {
+	gpe_src_install "$@"
+
+	# FIXME: Remove these
+	# /etc/X11/gpe-login.gtkrc
+	# /etc/X11/gpe-login.keylaunchrc
+	# /etc/sysconfig/gpelogin
+
+	insinto /etc/X11/
+	newins "${FILESDIR}/gpe-login.geometry-gentoo" gpe-login.geometry
+	insinto /etc/gpe/
+	newins "${FILESDIR}/locale.default-gentoo" locale.default
+
+	# Install the gentoo logo into pixmaps, see above
+	if use branding; then
+		insinto /usr/share/pixmaps/
+		newins "${FILESDIR}/gentoo-badge2.png" gpe-login-gentoo.png
+	fi
+}
+
+pkg_postinst() {
+	einfo "Have a look on the following files to fine tune"
+	einfo "your brand new login manager:"
+	einfo "/etc/X11/gpe-login.setup"
+	einfo "/etc/X11/gpe-login.geometry"
+	einfo "/etc/gpe/gpe-login.conf"
+	einfo "/etc/gpe/locale.default"
+}