Add gentoo logo to gpe-login.

Fix incorrect deps on RDEPEND.
(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 105 insertions, 1 deletions

diff --git a/gpe-base/gpe-login/ChangeLog b/gpe-base/gpe-login/ChangeLog
index 93b7c07128d7..1e26d8bd0334 100644
--- a/gpe-base/gpe-login/ChangeLog
+++ b/gpe-base/gpe-login/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1 2009/03/15 21:00:44 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/ChangeLog,v 1.2 2009/04/07 15:28:41 miknix Exp $
+
+*gpe-login-0.95-r1 (07 Apr 2009)
+
+  07 Apr 2009; <miknix@gentoo.org> +files/gpe-login-0.95-gentoologo.patch,
+  +files/gentoo-badge2.png, +gpe-login-0.95-r1.ebuild:
+  Patch gpe-login to show a beauty gentoo logo.
+  Also fix incorrect deps on DEPEND.
 
 *gpe-login-0.95 (15 Mar 2009)
 
diff --git a/gpe-base/gpe-login/files/gentoo-badge2.png b/gpe-base/gpe-login/files/gentoo-badge2.png
new file mode 100644
index 000000000000..07ae247aa210
--- /dev/null
+++ b/gpe-base/gpe-login/files/gentoo-badge2.png
diff --git a/gpe-base/gpe-login/files/gpe-login-0.95-gentoologo.patch b/gpe-base/gpe-login/files/gpe-login-0.95-gentoologo.patch
new file mode 100644
index 000000000000..88fb2819b76f
--- /dev/null
+++ b/gpe-base/gpe-login/files/gpe-login-0.95-gentoologo.patch
@@ -0,0 +1,36 @@
+--- gpe-login.c	2008-08-13 19:08:28.000000000 +0100
++++ /home/miknix/Community/gpe-login.c	2009-04-07 14:16:16.000000000 +0100
+@@ -1,6 +1,9 @@
+ /*
+  * Copyright (C) 2002, 2003, 2005 Philip Blundell <philb@gnu.org>
+  *
++ * Add gentoo logo widget
++ * Copyright (C) 2009, Angelo Arrifano <miknix@gentoo.org>
++ *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version
+@@ -1584,6 +1587,8 @@ main (int argc, char *argv[])
+   FILE *cfp;
+   GdkCursor *cursor;
+   GtkWidget *socket_frame;
++  GtkWidget *logo;
++
+ 
+   /* gchar *gpe_catindent = gpe_get_catindent ();  */
+   /* guint gpe_catspacing = gpe_get_catspacing (); */
+@@ -2042,6 +2047,14 @@ main (int argc, char *argv[])
+          gtk_socket_steal (GTK_SOCKET (socket), xkbd_xid);
+     }
+ 
++  /* Show up a beauty gentoo powered logo */
++#define GENTOO_LOGO_DIR "/usr/share/pixmaps/gpe-login-gentoo.png"
++  if (! access(GENTOO_LOGO_DIR, R_OK)) {
++     logo = gtk_image_new_from_file(GENTOO_LOGO_DIR);
++     gtk_box_pack_end (GTK_BOX (vbox2), logo, FALSE, FALSE, 0);
++     gtk_widget_show(logo);
++  }
++
+   gtk_main ();
+ 
+   cleanup_children ();
diff --git a/gpe-base/gpe-login/gpe-login-0.95-r1.ebuild b/gpe-base/gpe-login/gpe-login-0.95-r1.ebuild
new file mode 100644
index 000000000000..fb78076a8b75
--- /dev/null
+++ b/gpe-base/gpe-login/gpe-login-0.95-r1.ebuild
@@ -0,0 +1,61 @@
+# 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() {
+	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 gpe-login.setup instead
+	cp "${FILESDIR}/gpe-login.setup-gentoo" gpe-login.setup \
+		|| die "Cannot replace gpe-login.setup"
+	chmod 0755 gpe-login.setup \
+		|| die "Cannot chmod gpe-login.setup"
+	# This file is device specific, dont install it
+	sed -i -e 's;gpe-login.keylaunchrc;;' Makefile.in \
+		|| die "Sed failed"
+}
+
+src_install() {
+	gpe_src_install "$@"
+
+	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"
+}