New slim.conf patch (bug 250722) by Nico R. Wohlgemuth. Converted to EAPI-2 since portage-2.1.6.2 will be stable any day now. add screenshot use flag to dep on imagemagick

Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.27.10 x86_64

5 files changed, 66 insertions, 34 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 0fb2d68734de..1cb14a7a4ae2 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.28 2008/12/12 09:53:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.29 2008/12/23 04:50:31 darkside Exp $
+
+*slim-1.3.1-r2 (23 Dec 2008)
+
+  23 Dec 2008; Jeremy Olexa <darkside@gentoo.org>
+  +files/slim-1.3.1-config.diff, metadata.xml, -slim-1.3.0-r2.ebuild,
+  +slim-1.3.1-r2.ebuild:
+  New slim.conf patch (bug 250722) by Nico R. Wohlgemuth. Converted to EAPI-2
+  since portage-2.1.6.2 will be stable any day now. add screenshot use flag to
+  dep on imagemagick
 
   12 Dec 2008; Raúl Porcel <armin76@gentoo.org> slim-1.3.1-r1.ebuild:
   sparc/x86 stable wrt #248448
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index d756bc0d9e48..3830a850071f 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,8 +1,9 @@
 AUX slim-1.3.0-gcc43.patch 255 RMD160 dafb1ce951a97220916f14a418a9f4814b8c5f98 SHA1 46bcb9952bb3f9f8fefc53083cb475e073de4b46 SHA256 0cf636a722e048bcf6ca68c1419a87cacd65b87e92cda2ad88d1043b353621c4
+AUX slim-1.3.1-config.diff 1358 RMD160 67d5c7c5955856d6aefc950ec7cae8250f3234e0 SHA1 9101771d3ee4e066c1aa5ea936ae8095c905d838 SHA256 645501fd1210e2cacedbe79d297f74e945c1faa400b0c31aa828191cf50aa067
 DIST slim-1.3.0.tar.gz 218646 RMD160 80205d8e757c76f9c0e21263ec38624f605d9586 SHA1 f27f40c73a2f757f1ae32155bf0438c97be2c019 SHA256 b3cb736ce567146e9bdb5e081fce95d4ec69d64ccc30d004e921823b54c44e9b
 DIST slim-1.3.1.tar.gz 219446 RMD160 dc0c7c7257dfa8c2bee47ffa5ec8ddf17fd38f70 SHA1 30152b280724daf75299a8ee16585041f253ed4f SHA256 acd7a4024bfd7c2a4f3cd5d77ffed4956d13727a8f554042126d0568defe0f77
 EBUILD slim-1.3.0-r1.ebuild 2901 RMD160 a8aa2ce96b0d4c802527c54c3d6602059a413c68 SHA1 7ac674b6fdc09d46e64c40ac52971396020a2d67 SHA256 d254f24ec386681493aba0c489bd7c880199950f4041ac2a3f00ae74c7ee37ce
-EBUILD slim-1.3.0-r2.ebuild 3284 RMD160 1bc4b4f1eea1dcc2f64418e14d1437c4a0e78ebb SHA1 6982b023c8117fbf0751d85b4d7e02567ecf2b59 SHA256 4f0bb9372f0294e27991dc946d76ba9b57b74a5b76627c7d0a80632f41ffa2c0
 EBUILD slim-1.3.1-r1.ebuild 3100 RMD160 fcf3f8235578aa19e94567aa14c23532d338630c SHA1 608f64fef25024698273e611de2f305133d86889 SHA256 7b0b0fadb980f96946b1a7a289b3127a7689a4815033c9e36b7365e4498c5255
-MISC ChangeLog 3928 RMD160 70635c727fe0ac57dabbc4d09865e452b746edf6 SHA1 beae0f7523dd9beb5a2ad75ea6840bddd970acb1 SHA256 9ba2f72fef2d0cada77cb8b77aa1e468009922b46f4b27e50d154b55ad65c1d3
-MISC metadata.xml 233 RMD160 cdc8b3d6e2c4eaff8f37088ee4e9c68c6eca7cd2 SHA1 5c3eaf0604c2e1273d7892ce1317a2525ce7d1c4 SHA256 46d923a7ef5b27ee3a8a182c96567dfe7013b0f2eb59930f332d8ade5b09f610
+EBUILD slim-1.3.1-r2.ebuild 2350 RMD160 582120a2b84372600e7ad466355b1c455ea07543 SHA1 0258d5e30a59a19f23901ffe5be398a0eb3fffb6 SHA256 d8c23f8bbae795a31c8c5f7b86a0e2f1ef0a0a3c22f0a8fafe480ad872d8cb88
+MISC ChangeLog 4283 RMD160 99ac9b2190b4f3e510b4b07a8269c11923d87d4d SHA1 ae6753140a5d079a6c6c7f6a607a0a84fbbbcb32 SHA256 40700d41a78fdbd370c9cf426cfbc04d5e3ff3942aa305a9aee5589042b687ad
+MISC metadata.xml 348 RMD160 22b309bfa0ee5378b0476cc4c7fe8ea3eabe8fbc SHA1 4f8c2e941ce68487614dfab204737ff51f9f8531 SHA256 821a30989eb2cad5bd636c79abffbdb600b31d67cd1b6fb219204d8aedd987bb
diff --git a/x11-misc/slim/files/slim-1.3.1-config.diff b/x11-misc/slim/files/slim-1.3.1-config.diff
new file mode 100644
index 000000000000..1415d3d24d77
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.1-config.diff
@@ -0,0 +1,38 @@
+--- slim.conf.orig	2008-12-22 22:31:25.073293331 -0600
++++ slim.conf	2008-12-22 22:36:14.271006503 -0600
+@@ -2,7 +2,7 @@
+ # Note: -xauth $authfile is automatically appended
+ default_path        ./:/bin:/usr/bin:/usr/local/bin
+ default_xserver     /usr/bin/X
+-#xserver_arguments   -dpi 75
++xserver_arguments   -nolisten tcp -br -deferglyphs 16
+ 
+ # Commands for halt, login, etc.
+ halt_cmd            /sbin/shutdown -h now
+@@ -18,7 +18,7 @@
+ 
+ 
+ # Activate numlock when slim starts. Valid values: on|off
+-# numlock             on
++numlock             on
+ 
+ # Hide the mouse cursor (note: does not work with some WMs).
+ # Valid values: true|false
+@@ -33,7 +33,8 @@
+ # to adjust the command according to your preferred shell,
+ # i.e. for freebsd use:
+ # login_cmd           exec /bin/sh - ~/.xinitrc %session
+-login_cmd           exec /bin/bash -login ~/.xinitrc %session
++# login_cmd           exec /bin/bash -login ~/.xinitrc %session
++login_cmd           exec /bin/bash -login /etc/X11/xinit/xinitrc
+ 
+ # Commands executed when starting and exiting a session.
+ # They can be used for registering a X11 session with
+@@ -41,6 +42,7 @@
+ #
+ # sessionstart_cmd	some command
+ # sessionstop_cmd	some command
++sessionstart_cmd	/usr/bin/sessreg -a -l :0.0 %user
+ 
+ # Start in daemon mode. Valid values: yes | no
+ # Note that this can be overriden by the command line
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
index c164cdae1bb7..8f20e7cca7da 100644
--- a/x11-misc/slim/metadata.xml
+++ b/x11-misc/slim/metadata.xml
@@ -5,5 +5,8 @@
 	<maintainer>
 		<email>darkside@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="screenshot">Enable screenshot support (using <pkg>media-gfx/imagemagick</pkg>)</flag>
+	</use>
 </pkgmetadata>
 
diff --git a/x11-misc/slim/slim-1.3.0-r2.ebuild b/x11-misc/slim/slim-1.3.1-r2.ebuild
index 366866713bc2..107d16e244b4 100644
--- a/x11-misc/slim/slim-1.3.0-r2.ebuild
+++ b/x11-misc/slim/slim-1.3.1-r2.ebuild
@@ -1,8 +1,10 @@
 # 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.0-r2.ebuild,v 1.5 2008/09/26 10:42:41 aballier Exp $
+# $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 $
 
-inherit eutils toolchain-funcs pam
+EAPI=2
+
+inherit toolchain-funcs pam eutils
 
 DESCRIPTION="Simple Login Manager"
 HOMEPAGE="http://slim.berlios.de"
@@ -10,8 +12,8 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
-IUSE="pam"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="screenshot pam"
 
 DEPEND="x11-proto/xproto
 	x11-libs/libXmu
@@ -22,40 +24,19 @@ DEPEND="x11-proto/xproto
 	media-libs/jpeg
 	pam? ( virtual/pam )"
 RDEPEND="${DEPEND}
-	media-fonts/corefonts
-	x11-apps/sessreg"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
+	x11-apps/sessreg
+	screenshot? ( media-gfx/imagemagick )"
 
+src_prepare() {
 	# respect C[XX]FLAGS, fix crosscompile,
 	# fix linking order for --as-needed"
 	sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:" \
 		-e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \
 		-e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \
-		-e "s:/usr/X11R6:/usr:" \
 		-e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \
 		-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
-		Makefile || die 'sed failed in Makefile'
-
-	# Remove all X11R6 references from slim.conf
-	# Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop
-	# Set the default logfile to /dev/null to avoid cluttering up the harddisk
-	# as slim puts a lot of garbage in its logfile
-	# Make slim honor XSESSION in /etc/rc.conf by default.
-	sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' \
-		-e 's/# daemon/daemon/' \
-		-e 's#/var/log/slim.log#/dev/null#g' \
-		-e '/^login_cmd.*/s#exec /bin/bash.*#exec /bin/bash -login /etc/X11/xinit/xinitrc#' \
-		slim.conf || die "sed failed in slim.conf"
-
-		# This method of appending to the slim.conf file may change, but it
-		# works for now.
-		echo "# Needed so your login will show up in wtmp and utmp, etc" >> slim.conf || die
-		echo "sessionstart_cmd        /usr/bin/sessreg -a -l $DISPLAY %user" >> slim.conf || die
-		echo "sessionstop_cmd         /usr/bin/sessreg -d -l $DISPLAY %user" >> slim.conf || die
+		Makefile || die "sed failed in Makefile"
+	epatch "${FILESDIR}/${P}-config.diff"	
 }
 
 src_compile() {