Convert and cleanup scripts for gentoo.

Remove unneeded/ugly configuration files (with patch).
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

9 files changed, 221 insertions, 5 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/Manifest b/gpe-base/gpe-login/Manifest
index f2870a27a727..991d938c0d44 100644
--- a/gpe-base/gpe-login/Manifest
+++ b/gpe-base/gpe-login/Manifest
@@ -1,11 +1,17 @@
 AUX gentoo-badge2.png 1055 RMD160 5f4536675572a05b896feef9c48dfd895eab897d SHA1 d064c8d97c9f3fb553eee6b16f85c915cbfd2848 SHA256 02e17bb52931a765318ba850ae39fd6c4eef74c3a3817d87ecbe79480744a791
+AUX gpe-login-0.95-cleanup.patch 1663 RMD160 0d5fb5ec8a86f82e21cb49a011609159a162de5d SHA1 80175c91a9323fd92d2427c09684287dd8462b2a SHA256 96852c9659de6aab449af1ec5e4e1fb3a6444496a1431f86bf3bf2a9e20affdb
 AUX gpe-login-0.95-gentoologo.patch 1229 RMD160 5fbd2bd64d7049810731a9fc5e8d789f3662da71 SHA1 a495bc0ff74376d61222a23364b08052ccf0d650 SHA256 091b67db8ea3f5b571ca5c7620c4bd718e5c76683085c894ade38f5b7b4a84ab
 AUX gpe-login.geometry-gentoo 69 RMD160 ebc6eef1e0d2366d095d64fd2a5d5a1d3820e992 SHA1 e30e13292b76bd21db645b54754d1be49def8c75 SHA256 4f7c92abb8b5f49008e0134e6dbf218885cf0d9dae5f3f205e504c8a77d7e688
-AUX gpe-login.setup-gentoo 54 RMD160 3ad56121a4bee94da29239d75dfef362af0a28fe SHA1 9fb9284670b3b792c01516cdd3485134212754f4 SHA256 364a92fa09baf846c676d19a02c996f7aa7a8c4032aeb4254addc0c32da71cd1
+AUX gpe-login.pre-session-gentoo 362 RMD160 02f4531011678aed279a1e1e5f1b407ff76e5507 SHA1 7305cbb93ef7aa22a0806405caba7e2b155b36a2 SHA256 ff56b20b8fa9022c1d5234ab80861c3339ea8e498b67f09594ca0013cd06bf67
+AUX gpe-login.session-gentoo 366 RMD160 e1f9d6a9133f1c3699d524941df20337ff3fbf12 SHA1 d4f3d7bb4ebf8bbca25c7190acaaaa322e1f801b SHA256 fc24eee6bb63c66efecfb16b1e768b9b6456cf322135cf50a3c4da2f0c1b9290
+AUX gpe-login.setup-gentoo 345 RMD160 455bcbd40d628ccefa5986c4d72be30fca0cfbb7 SHA1 2a2617ad873dd7f1ae23ecc12dac56779a681493 SHA256 7ccbe66132613778dc078f47706326fb507407b5896e18319bdcc4de7d69aea6
+AUX gpe-login.xinit-gentoo 511 RMD160 5a53ab8d9f027f9a68543df4d44e12f4a3198635 SHA1 763c8d08e74dec9ead5b4b51ff5749a9092316fe SHA256 e41ec912299612d91d1bbb6331240cc5384b860b9e461cc50113c05067537cd1
+AUX gpe-login.xsession-gentoo 1309 RMD160 2ec229b68a5b08fa0611fcf7cd35f5e335fbcea6 SHA1 39c41b4a28341c4c04dea0031ac1d1832e018e1d SHA256 6ccdc66af5fbdb1e1cc5756e48b807b4ff89f5aeed0b66ac48bfe91154a9c48e
 AUX locale.default-gentoo 45 RMD160 ed8e5272a36a7de7e9fcbccb8b8e210a44d45d12 SHA1 0a5e46321bd5a53ff9a09b914f0aa742b80ab561 SHA256 6cecdcb10f69896afaaae5cd84c4077409f93ac54d561e137b935a965f6000b9
 DIST gpe-login-0.95.tar.bz2 160704 RMD160 a1beb20125c44f6423d22a8b700233ae89d3a92e SHA1 8f689fd43322cc266a17b93e60e2c7635d933983 SHA256 8bea38af14c98354b1ee023475315ae3ba462d33b136a73cde9d83303b659d84
 EBUILD gpe-login-0.95-r1.ebuild 1668 RMD160 0b25a9df7a6fc2eaf02da4758d35b92ab86d9b53 SHA1 ac3c53f6e2ed43a5df8fe45008a5a04c2c560f80 SHA256 28a33e2c5f21b6bb7f6dffe3940c802a373b0ac8449557409066ea9cb838d092
 EBUILD gpe-login-0.95-r2.ebuild 1771 RMD160 d9dfd943000483c0c519ff80b084958d4136d4b4 SHA1 6fed05ec4b2d73b6d88bf5c5eff641b9dfcaf1fb SHA256 eb07e60824be5fd60df53d735c1998d6afc0d17cd60b339929773dbd01585020
+EBUILD gpe-login-0.95-r3.ebuild 1963 RMD160 7f7f41cb8978e73baf3e28009c1fe5dba1e10eb6 SHA1 b8ba39151f97cab3f484100b9b725892001ce8b5 SHA256 380a3059c42ac015cd1c02cd3d3d50b7b4eca4ec1dfa9ad6432791570a2487d0
 EBUILD gpe-login-0.95.ebuild 1305 RMD160 3e245863a7f399dc0550a7f487f942c8f3e6aee7 SHA1 e62e09747e23ce0d07e541dacfe769706eb30921 SHA256 1d62c3506a8f45402fd0bd35c421718e5761d445a7a5ec7bce84a8250bdd3ff0
-MISC ChangeLog 888 RMD160 e6babd9ba50aba184885c4012fa542102ee4579c SHA1 f8232b67e4562f8eb07c369c996916ab635919a6 SHA256 0ec6871f66b4059e273f222abf3fe859c4e045f772978c31b851065da9acce10
+MISC ChangeLog 1297 RMD160 af774f80b977234058e81d4a041d5542d48c6253 SHA1 fd65b253ef1084e8a783d3411757d9ce07feda0e SHA256 a60064482724da129c20a860a405a7d847fe20c8f4266308d81cfc2a3db9730a
 MISC metadata.xml 215 RMD160 fedcb3b558152736b025a43fba9b0f72b26cab0a SHA1 7cdcbeff68c19a0ecc3bcb46b2bd094ee69cd48d SHA256 b80ac51746e7677bc32591254e54b62c49f2c6cc134fe2a29247958ba9a58a5f
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"
+}