Added patch from upstream which fixes bug #202797

(Portage version: 2.1.4.1)

3 files changed, 86 insertions, 1 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/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"
+}