Added patch from upstream which fixes bug #202797

Package-Manager: portage-2.1.4.1

4 files changed, 89 insertions, 2 deletions

diff --git a/rox-base/rox-session/ChangeLog b/rox-base/rox-session/ChangeLog
index 7e1997254918..92122167b81a 100644
--- a/rox-base/rox-session/ChangeLog
+++ b/rox-base/rox-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for rox-base/rox-session
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.33 2008/01/18 13:41:05 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.34 2008/02/21 13:51:26 lack Exp $
+
+*rox-session-0.30-r4 (21 Feb 2008)
+
+  21 Feb 2008; Jim Ramsay <lack@gentoo.org>
+  +files/rox-session-0.30-logging.patch, +rox-session-0.30-r4.ebuild:
+  Added patch from upstream which fixes bug #202797
 
   18 Jan 2008; Jim Ramsay <lack@gentoo.org> rox-session-0.30-r3.ebuild:
   rox-session expects to be able to use xgamma and xset (Bug #202797)
diff --git a/rox-base/rox-session/Manifest b/rox-base/rox-session/Manifest
index cdf0085964b1..2a3a819ceb01 100644
--- a/rox-base/rox-session/Manifest
+++ b/rox-base/rox-session/Manifest
@@ -1,10 +1,12 @@
 AUX ROX-Defaults.xml 696 RMD160 d3fe5408c3e29dac38c48b5959f7d6442274b02d SHA1 36f606d9c2b932b99f87f73d1d44a63e10d6c297 SHA256 e2da029d1d64e2803346e4f9270e8851cbd2d89fc27e893670fe3bd1e933bfb8
+AUX rox-session-0.30-logging.patch 425 RMD160 1c6334b46c9a19ce945dc068fd436fb0290db7bc SHA1 673b69629c2f722c7cc3b01cd62460b020c8b709 SHA256 cecdf11cc8dae0ef26d1e6dea17bfd92574bde34055a43c2b209db50f5debe4c
 AUX rox-session-0.30-wmselect.patch 2199 RMD160 0ab605347eb84c891ccdc11fd4dbb7519856860a SHA1 f38c19dc59f091401f9ede38d5476034e2a9d1e7 SHA256 01093cd67b9db25bf24028ba4baa087779e4e6eef10abf6bd6a9dd2bf993327d
 AUX rox-start 1115 RMD160 adb4c4ca3a5892da82e99f952165ed556322a2e5 SHA1 7992d2f67dd7e0dbd96e8c220450de83a84a3711 SHA256 0c8fc2a8562f42f2ffc05631ddfbc4237e2186f7ab013dcba92d3c3c0f21b1f3
 DIST rox-session-0.29.tar.bz2 130948 RMD160 1a9cbd125db8b3c949a04e798ebefa482b0e57ee SHA1 318833b3cb9901e72f2be432c9d32bc5e68c825e SHA256 c0899a372d7d39c787ae2cc3e02649dd1d6957156829f1689c7d3600f6e0d5b6
 DIST rox-session-0.30.tar.bz2 131563 RMD160 0c28efc9a86b0c3b2d7af05485dc510b6faf3373 SHA1 df506e6c3be111e015059bc70f983a9f0cea7d51 SHA256 c58f861aae4796a5191ee9a471fca9b8ac30978af954316ec1f650f5a1c336bd
 EBUILD rox-session-0.29.ebuild 1241 RMD160 95137e9cfce191ef2e732433a6065fa516e14eac SHA1 312c816956061f81b961dafea74de22839ae6eed SHA256 ccd0b015cbc592b34f8a6b51390fda0b7f0eea40a3d891c15b1f1eb456aa0e2c
 EBUILD rox-session-0.30-r3.ebuild 1882 RMD160 8ed2d64b4677d354d7556c5ee1a8eb32e23ffc25 SHA1 faa122c711b732a81bf8eba56c21e447302e8d08 SHA256 cbfdb3cf593b724cf1133c4580e0f30ce3aa01fdb3f0ee6dc1da53778b1bb63e
+EBUILD rox-session-0.30-r4.ebuild 1945 RMD160 7f079856bbbaa63d703076e38a7260f22cbacfbd SHA1 4ad92c9751b5cb1b560330dd81bfc53faac844c6 SHA256 ab3b8563d0bd70406ab501c4ac7c63d74f6bf345944aea0dd6eab0e089cb34ad
 EBUILD rox-session-0.30.ebuild 1257 RMD160 a07595837c722be1d01ee35a50fb95e821bb0acf SHA1 75d893b73f872b052dd81f72cc85ccc77776a1ed SHA256 e5d55d05176d304305d3ce4193acb5283f44150eca75e86995ce7ac9b9151ef9
-MISC ChangeLog 6114 RMD160 1e1aeeae0b252ca8cc6da3ea5687a71024024a51 SHA1 3b425b96c9ccd58c1a7651f409ed3e94228c0731 SHA256 10e3964e676c64654e3eee85b1d1070074800674fce0f560a6d7e28dd6da2c33
+MISC ChangeLog 6317 RMD160 efdfe3484e529ec758ba628eacbfc2a946860983 SHA1 1ecbc1cee5870d6c2ef12dce11d518c4a5d68260 SHA256 a5489217ef227011fee8496676e6d34e1ba19039f1588663355e8cfb2fc409bf
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
diff --git a/rox-base/rox-session/files/rox-session-0.30-logging.patch b/rox-base/rox-session/files/rox-session-0.30-logging.patch
new file mode 100644
index 000000000000..1bf926b8d172
--- /dev/null
+++ b/rox-base/rox-session/files/rox-session-0.30-logging.patch
@@ -0,0 +1,13 @@
+Index: xsettings.py
+===================================================================
+--- ROX-Session/xsettings.py	(revision 5205)
++++ ROX-Session/xsettings.py	(working copy)
+@@ -344,7 +344,7 @@
+ 			if os.spawnvp(os.P_WAIT, cmd[0], cmd):
+ 				warn(cmd[0]+' failed')
+ 		except OSError, exc:
+-			warn('%s failed: %s', (cmd[0], exc))
++			warn('%s failed: %s', cmd[0], exc)
+ 		del self.to_run[0]
+ 
+ 		return len(self.to_run)>0
diff --git a/rox-base/rox-session/rox-session-0.30-r4.ebuild b/rox-base/rox-session/rox-session-0.30-r4.ebuild
new file mode 100644
index 000000000000..29890a9303c5
--- /dev/null
+++ b/rox-base/rox-session/rox-session-0.30-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.30-r4.ebuild,v 1.1 2008/02/21 13:51:26 lack Exp $
+
+ROX_LIB_VER="2.0.4-r1"
+ROX_VER="2.7-r1"
+inherit eutils rox-0install
+
+DESCRIPTION="Rox-Session is a really simple session manager"
+HOMEPAGE="http://rox.sourceforge.net/rox_session.html"
+SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/dbus-python-0.71
+	x11-apps/xgamma
+	x11-apps/xset"
+
+MY_PN="ROX-Session"
+APPNAME=${MY_PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# By default on first startup rox-session tries to load oroborox (and
+	# download it if it's not already installed).  This patch gives users a
+	# choice of existing WM instead of forcing oroborox down their throats:
+	epatch "${FILESDIR}/${P}-wmselect.patch"
+
+	# Fixes bug #202797
+	epatch "${FILESDIR}/${P}-logging.patch"
+}
+
+src_install() {
+	rox-0install_src_install
+
+	dobin "${FILESDIR}/rox-start"
+
+	local wm="rox"
+	make_session_desktop "ROX Desktop" /usr/bin/rox-start
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/rox-start" > "${D}/etc/X11/Sessions/ROX_Desktop"
+	fperms a+x /etc/X11/Sessions/ROX_Desktop
+
+	# This is fun- Requires 'ROX-Defaults' which is basically useless.
+	# So setup a dummy feed for it:
+	local feedname
+	feedname=$(0distutils -e "${FILESDIR}/ROX-Defaults.xml") || die "0distutils URI escape failed"
+	insinto "${NATIVE_FEED_DIR}"
+	newins "${FILESDIR}/ROX-Defaults.xml" "${feedname}"
+}
+
+pkg_postinst() {
+	echo
+	einfo "ROX-Session has been installed into ${APPDIR}"
+	einfo "Please review its documentation about proper use. A symlink"
+	einfo "for the executable has been created as /usr/bin/${WRAPPERNAME}."
+	echo
+	einfo "It has also been installed as an X Session, so you should be"
+	einfo "able to select it in the Session list of gdm or kdm"
+}