Add USE=branding, if set the default slim theme will be our very own developer's (nightmorph@g.o) theme, yay. Also, make slim start as a daemon again, bug #252353

(Portage version: 2.2_rc18/cvs/Linux 2.6.27.10 x86_64)

3 files changed, 28 insertions, 7 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 1cb14a7a4ae2..5f05cdfb199b 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.29 2008/12/23 04:50:31 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.30 2008/12/26 07:35:00 darkside Exp $
+
+*slim-1.3.1-r3 (26 Dec 2008)
+
+  26 Dec 2008; Jeremy Olexa <darkside@gentoo.org>
+  files/slim-1.3.1-config.diff, -slim-1.3.1-r2.ebuild,
+  +slim-1.3.1-r3.ebuild:
+  Add USE=branding, if set the default slim theme will be our very own
+  developer's (nightmorph@g.o) theme, yay. Also, make slim start as a daemon
+  again, bug #252353
 
 *slim-1.3.1-r2 (23 Dec 2008)
 
diff --git a/x11-misc/slim/files/slim-1.3.1-config.diff b/x11-misc/slim/files/slim-1.3.1-config.diff
index 1415d3d24d77..92e5915a84c1 100644
--- a/x11-misc/slim/files/slim-1.3.1-config.diff
+++ b/x11-misc/slim/files/slim-1.3.1-config.diff
@@ -1,5 +1,5 @@
---- slim.conf.orig	2008-12-22 22:31:25.073293331 -0600
-+++ slim.conf	2008-12-22 22:36:14.271006503 -0600
+--- slim.conf.orig	2008-12-26 01:26:00.240257721 -0600
++++ slim.conf	2008-12-26 01:26:34.109016531 -0600
 @@ -2,7 +2,7 @@
  # Note: -xauth $authfile is automatically appended
  default_path        ./:/bin:/usr/bin:/usr/local/bin
@@ -28,7 +28,7 @@
  
  # Commands executed when starting and exiting a session.
  # They can be used for registering a X11 session with
-@@ -41,6 +42,7 @@
+@@ -41,11 +42,12 @@
  #
  # sessionstart_cmd	some command
  # sessionstop_cmd	some command
@@ -36,3 +36,9 @@
  
  # Start in daemon mode. Valid values: yes | no
  # Note that this can be overriden by the command line
+ # options "-d" and "-nodaemon"
+-# daemon	yes
++daemon	yes
+ 
+ # Available sessions (first one is the default).
+ # The current chosen session name is replaced in the login_cmd
diff --git a/x11-misc/slim/slim-1.3.1-r2.ebuild b/x11-misc/slim/slim-1.3.1-r3.ebuild
index 107d16e244b4..7b213b639d3d 100644
--- a/x11-misc/slim/slim-1.3.1-r2.ebuild
+++ b/x11-misc/slim/slim-1.3.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1-r2.ebuild,v 1.1 2008/12/23 04:50:31 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1-r3.ebuild,v 1.1 2008/12/26 07:35:00 darkside Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="screenshot pam"
+IUSE="branding screenshot pam"
 
 DEPEND="x11-proto/xproto
 	x11-libs/libXmu
@@ -25,7 +25,8 @@ DEPEND="x11-proto/xproto
 	pam? ( virtual/pam )"
 RDEPEND="${DEPEND}
 	x11-apps/sessreg
-	screenshot? ( media-gfx/imagemagick )"
+	screenshot? ( media-gfx/imagemagick )
+	branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
 src_prepare() {
 	# respect C[XX]FLAGS, fix crosscompile,
@@ -37,6 +38,11 @@ src_prepare() {
 		-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
 		Makefile || die "sed failed in Makefile"
 	epatch "${FILESDIR}/${P}-config.diff"	
+
+	if use branding; then
+		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
+	fi
+
 }
 
 src_compile() {