Convert and cleanup scripts for gentoo.

Remove unneeded/ugly configuration files (with patch).
(Portage version: 2.1.6.13/cvs/Linux x86_64)

8 files changed, 213 insertions, 3 deletions

diff --git a/gpe-base/gpe-login/ChangeLog b/gpe-base/gpe-login/ChangeLog
index 7abe88d6872a..aa2bf7157871 100644
--- a/gpe-base/gpe-login/ChangeLog
+++ b/gpe-base/gpe-login/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gpe-base/gpe-login
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/ChangeLog,v 1.3 2009/05/30 15:36:01 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/ChangeLog,v 1.4 2009/07/04 01:27:33 miknix Exp $
+
+*gpe-login-0.95-r3 (04 Jul 2009)
+
+  04 Jul 2009; Angelo Arrifano <miknix@gentoo.org>
+  +files/gpe-login-0.95-cleanup.patch, +files/gpe-login.pre-session-gentoo,
+  +files/gpe-login.session-gentoo, files/gpe-login.setup-gentoo,
+  +files/gpe-login.xinit-gentoo, +files/gpe-login.xsession-gentoo,
+  +gpe-login-0.95-r3.ebuild:
+  Convert and cleanup scripts for gentoo.
+  Remove unneeded/ugly configuration files.
 
 *gpe-login-0.95-r2 (30 May 2009)
 
diff --git a/gpe-base/gpe-login/files/gpe-login-0.95-cleanup.patch b/gpe-base/gpe-login/files/gpe-login-0.95-cleanup.patch
new file mode 100644
index 000000000000..95ad5acf5a3f
--- /dev/null
+++ b/gpe-base/gpe-login/files/gpe-login-0.95-cleanup.patch
@@ -0,0 +1,54 @@
+--- Makefile.am.bak	2009-06-13 16:51:53.000000000 +0000
++++ Makefile.am	2009-06-13 16:55:45.000000000 +0000
+@@ -18,7 +18,6 @@
+ 
+ x11dir = $(sysconfdir)/X11
+ x11_SCRIPTS = gpe-login.setup X11/gpe-login.pre-session
+-x11_DATA = gpe-login.keylaunchrc X11/gpe-login.gtkrc
+ 
+ apmdir = $(sysconfdir)/apm/suspend.d
+ apm_SCRIPTS = gpe-login.suspend 
+@@ -26,15 +25,12 @@
+ xsessiondir = $(sysconfdir)/X11/Xsession.d
+ xsession_SCRIPTS = gpe-login.session
+ 
+-xinitdir = $(sysconfdir)/X11/Xinit.d
++xinitdir = $(sysconfdir)/X11/gpe-dm/Xinit.d
+ xinit_SCRIPTS = gpe-login.xinit
+ 
+ gpedir = $(sysconfdir)/gpe
+ gpe_DATA = gpe-login.conf locale.alias
+ 
+-sysdir = $(sysconfdir)/sysconfig
+-sys_DATA = gpe-login.sysconfig
+-
+ pixmapsdir = $(datadir)/gpe/pixmaps/default
+ pixmaps_DATA = \
+                pixmaps/session-back.png \
+@@ -46,12 +42,10 @@
+ 
+ EXTRA_DIST = \
+              $(x11_SCRIPTS) \
+-             $(x11_DATA) \
+              $(apm_SCRIPTS) \
+              $(xsession_SCRIPTS) \
+              $(xinit_SCRIPTS) \
+              $(gpe_DATA) \
+-             $(sys_DATA) \
+              $(pixmaps_DATA) \
+              intltool-extract.in \
+              intltool-merge.in \
+@@ -66,13 +60,11 @@
+ 	cd $(DESTDIR)$(apmdir) && mv gpe-login.suspend S98lock-display
+ 	cd $(DESTDIR)$(xsessiondir) && mv gpe-login.session 50autolock
+ 	cd $(DESTDIR)$(xinitdir) && mv gpe-login.xinit 99gpe-login
+-	cd $(DESTDIR)$(sysdir) && mv gpe-login.sysconfig gpelogin
+ 
+ uninstall-hook:
+ 	$(RM) -f $(DESTDIR)$(apmdir)/S98lock-display
+ 	$(RM) -f $(DESTDIR)$(xsessiondir)/50autolock
+ 	$(RM) -f $(DESTDIR)$(xinitdir)/99gpe-login
+-	$(RM) -f $(DESTDIR)$(sysdir)/gpelogin
+ 	
+ clean-local:
+ 	rm -f *.d *~
diff --git a/gpe-base/gpe-login/files/gpe-login.pre-session-gentoo b/gpe-base/gpe-login/files/gpe-login.pre-session-gentoo
new file mode 100644
index 000000000000..2a1e17196477
--- /dev/null
+++ b/gpe-base/gpe-login/files/gpe-login.pre-session-gentoo
@@ -0,0 +1,10 @@
+#!/bin/sh
+# /etc/X11/gpe-login.pre-session: This is executed before Xsession.
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Angelo Arrifano <miknix@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/files/gpe-login.pre-session-gentoo,v 1.1 2009/07/04 01:27:40 miknix Exp $
+
+USER=$1
+
+
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 000000000000..0268ccad4c18
--- /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: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/files/gpe-login.session-gentoo,v 1.1 2009/07/04 01:27:40 miknix Exp $
+
+/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 a84e47618278..6fa71ff32224 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: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/files/gpe-login.setup-gentoo,v 1.2 2009/07/04 01:27:40 miknix Exp $
 
-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 000000000000..231dc28dad8f
--- /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: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/files/gpe-login.xinit-gentoo,v 1.1 2009/07/04 01:27:40 miknix Exp $
+# 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/files/gpe-login.xsession-gentoo b/gpe-base/gpe-login/files/gpe-login.xsession-gentoo
new file mode 100644
index 000000000000..8180ad9732da
--- /dev/null
+++ b/gpe-base/gpe-login/files/gpe-login.xsession-gentoo
@@ -0,0 +1,41 @@
+#!/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: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/files/gpe-login.xsession-gentoo,v 1.1 2009/07/04 01:27:40 miknix Exp $
+# Based on gpe xserver-common's Xsession
+
+. /etc/profile
+
+if [ -f $HOME/.profile ]; then
+ . $HOME/.profile
+fi
+
+if [ -f /usr/bin/dbus-launch ]; then
+  ## test for an existing bus daemon, just to be safe
+  if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+     ## if not found, launch a new one
+     eval `/usr/bin/dbus-launch --auto-syntax --exit-with-session`
+     echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
+  fi
+fi
+
+
+SYSSESSIONDIR=/etc/X11/Xsession.d
+# Use run-parts to source every file in the session directory; we source
+# instead of executing so that the variables and functions defined above
+# are available to the scripts, and so that they can pass variables to each
+# other.
+
+SESSIONFILES=`ls -X $SYSSESSIONDIR`
+if [ -n "$SESSIONFILES" ]; then
+	for SESSIONFILE in $SESSIONFILES; do
+	# Test if script is executable first before sourcing it
+	if [ -x "$SYSSESSIONDIR/$SESSIONFILE" ]; then
+		. $SYSSESSIONDIR/$SESSIONFILE
+	fi
+	done
+fi
+
+exit 0
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 000000000000..2c7dae4d36c8
--- /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-r3.ebuild,v 1.1 2009/07/04 01:27:33 miknix Exp $
+
+GPE_TARBALL_SUFFIX="bz2"
+inherit gpe eutils autotools
+
+DESCRIPTION="The GPE user login screen"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~x86"
+IUSE="branding"
+
+DEPEND="${DEPEND} gpe-base/libgpewidget"
+RDEPEND="${RDEPEND} ${DEPEND}
+	x11-misc/xkbd
+	gpe-utils/gpe-ownerinfo"
+
+src_unpack() {
+	local gentoo_files="./gpe-login.setup
+	                    ./gpe-login.xinit
+						./gpe-login.session
+						X11/gpe-login.pre-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
+		einfo "Replacing ${gfile}"
+		cp "${FILESDIR}/${gfile/[^\/]*\//}-gentoo" "${gfile}" \
+			|| die "Replace ${gfile} fail"
+		chmod 0755 ${gfile} || die "Cannot chmod ${gfile}"
+	done
+
+	# This patch removes a lot of ugly files and fixes
+	# the X11/Xinit.d path
+	epatch "${FILESDIR}/${P}-cleanup.patch"
+
+	eautoreconf
+}
+
+src_install() {
+	gpe_src_install "$@"
+
+	insinto /etc/X11/
+	newins "${FILESDIR}/gpe-login.geometry-gentoo" gpe-login.geometry
+	exeinto /etc/X11/
+	newexe "${FILESDIR}/gpe-login.xsession-gentoo" Xsession
+	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/X11/gpe-login.pre-session"
+	einfo "/etc/gpe/gpe-login.conf"
+	einfo "/etc/gpe/locale.default"
+}