Add xsession entry thanks to Matthew Alexander (bug #369355). Remove die() messages.

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

3 files changed, 22 insertions, 9 deletions

diff --git a/x11-wm/musca/ChangeLog b/x11-wm/musca/ChangeLog
index 208fdd33bb0c..96e2fadd595b 100644
--- a/x11-wm/musca/ChangeLog
+++ b/x11-wm/musca/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/musca
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.15 2011/02/02 21:34:00 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.16 2011/06/01 15:47:06 jer Exp $
+
+*musca-0.9.24_p20100226-r1 (01 Jun 2011)
+
+  01 Jun 2011; Jeroen Roovers <jer@gentoo.org> -musca-0.9.24.ebuild,
+  +musca-0.9.24_p20100226-r1.ebuild, +files/musca.xsession:
+  Add xsession entry thanks to Matthew Alexander (bug #369355). Remove die()
+  messages.
 
   02 Feb 2011; Tim Harder <radhermit@gentoo.org> musca-0.9.24_p20100226.ebuild:
   Add ~amd64 keyword.
diff --git a/x11-wm/musca/files/musca.xsession b/x11-wm/musca/files/musca.xsession
new file mode 100644
index 000000000000..41e90a7ceb3e
--- /dev/null
+++ b/x11-wm/musca/files/musca.xsession
@@ -0,0 +1,2 @@
+#!/bin/sh
+musca
diff --git a/x11-wm/musca/musca-0.9.24.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r1.ebuild
index 38678519ac70..888c30bc5db7 100644
--- a/x11-wm/musca/musca-0.9.24.ebuild
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/musca-0.9.24.ebuild,v 1.6 2010/02/18 05:41:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/musca-0.9.24_p20100226-r1.ebuild,v 1.1 2011/06/01 15:47:06 jer Exp $
 
 EAPI="2"
 
@@ -9,11 +9,11 @@ inherit eutils savedconfig toolchain-funcs
 DESCRIPTION="A simple dynamic window manager for X, with features nicked from
 ratpoison and dwm"
 HOMEPAGE="http://aerosuidae.net/musca/"
-SRC_URI="http://aerosuidae.net/${P}.tgz"
+SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="apis xlisten"
 
 COMMON="x11-libs/libX11"
@@ -24,7 +24,7 @@ RDEPEND="
 "
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
+	epatch "${FILESDIR}"/${P/_p*}-make.patch
 
 	local i
 	for i in apis xlisten; do
@@ -40,14 +40,18 @@ src_compile() {
 }
 
 src_install() {
-	dobin musca || die "dobin failed"
+	dobin musca || die
 
 	local i
 	for i in xlisten apis; do
 		if use ${i}; then
-			dobin ${i} || die "dobin ${i} failed"
+			dobin ${i} || die
 		fi
 	done
-	doman musca.1 || die "doman failed"
+	doman musca.1 || die
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession musca || die
+
 	save_config config.h
 }