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

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 28 insertions, 19 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/Manifest b/x11-wm/musca/Manifest
index 1cefd7879817..cc99d6a8d53a 100644
--- a/x11-wm/musca/Manifest
+++ b/x11-wm/musca/Manifest
@@ -2,20 +2,16 @@
 Hash: SHA1
 
 AUX musca-0.9.24-make.patch 711 RMD160 b12498b12db93fee1297f13824dcd4eab010980d SHA1 239fd253cb59b46215305f6c72ed1d00b4aad959 SHA256 114b44eb6cc3584fb079faadc85d3ebf170d6c1f790a6f55c78ce7f95583cadb
-DIST musca-0.9.24.tgz 81210 RMD160 599e6539455b94d05a48485ad28f4b28ca7d73e1 SHA1 a74d27a352b76dccf09792a00e50ba3c05b9929b SHA256 c34e37e2df5075a61f8d5268786ab8115816af95c46e063c50f7f1c500527301
+AUX musca.xsession 16 RMD160 b7465701e85c59cc8099accf39786f712262a92e SHA1 2d3dd698b35fe9f3fbb333103117a6f19a15eb63 SHA256 b9497cce444e83c33c62c124cb73fa3a7ee5b2ab24a9679b3c6d89a5957a9c47
 DIST musca-0.9.24_p20100226.tgz 81490 RMD160 e84696457e83831d4f5bb98a7b77770a214d35b6 SHA1 76744f1b24e5eb5adcf1546e593d9b633a2dfdc5 SHA256 63167c76fa5ea9381685d209e12b795001d8d0d183b22a6578f255b56ca87676
-EBUILD musca-0.9.24.ebuild 1087 RMD160 e0ff71509f153d9da11475db938beacff5b42f43 SHA1 38711e3b112a002f1b964e53c1c76f81686d1de0 SHA256 46f264b5df59622d40bc98c14823c7b0b4a8d616c2c2396ab2196e9b27a455b9
+EBUILD musca-0.9.24_p20100226-r1.ebuild 1134 RMD160 92625fd3a9e655296538001944b33d2cf714a22a SHA1 129f6dcf650e7300171189985f2cd13df663a54c SHA256 14f7cfca585d9b83890c7302a843c54e54353aa75efff52a16e84c07b2b0a8d8
 EBUILD musca-0.9.24_p20100226.ebuild 1108 RMD160 4b7efaf304d0c5b9c0f19765430452a2e8e9ca29 SHA1 32fb06c5574de4a07b047266041d81a47af0fd30 SHA256 12fa6cab6a8f8622d5c2ada1e5cf8ca5c5a40d61049979cf387c4df1dba2dbd1
-MISC ChangeLog 2045 RMD160 eb8b4447d0f9fa19df174dbb80486c4b033ce07a SHA1 46bc5a93f850a984ae6471b4acfe9a82494264d4 SHA256 5c1c70f66928675c70388546105891df98748e20bc2a4910ac9e4304c64afc77
+MISC ChangeLog 2300 RMD160 e55944f15072d89f729d1d0505a7aaa1a0ee1505 SHA1 6aaa95cb7dbb74961a88e422002b6ad5ad5dac28 SHA256 da63d8bc865dbc35042d4882a54556c971371e7b89e3f8b7cd892d00df63a154
 MISC metadata.xml 414 RMD160 48e7824340a745d8c0d30296aed143911bda4068 SHA1 c80f5d6a4342fe357f5e6be384bc9787b2d92243 SHA256 1c3fb26b847decbd35600a421d2ed11a494454cc463281c4d989f8341efb6029
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNSc3RAAoJEEqz6FtPBkyj+n0H/isfXU4+oGNhBSvef+ck4rt/
-oWNUjLbCuyhqkzyYGivWPytJohO1ow38K7wGB97+1KBiEkyYew53fQzNM8AJiNZt
-9BUTYHMzW/ifB/BILGTFWNoigIlKZZhrzl0OJL9jA8uBctw3LbfRpl6CrswnWEqs
-y5kY736RIxa+DtxuccFbHzRSToeg13v6Fhbl/SQGNBFAFAql0e+1YeOfDchMsTXR
-FQqyDS86Zse04ClJ7I64wIMWwYEDApG9fOzRfSFd8ESoXqGdgoBUSIxm2434KFnV
-QiddVUKh6o/Vo+76UD6ea1dtx5At1exb7FzRjqS66AayODZk35yyo3YiaMKt/hQ=
-=P5cQ
+iEYEARECAAYFAk3mXwAACgkQVWmRsqeSphNv1gCfQZT/2QVcV0gfP8ggqMXIQZUJ
+j6EAnjy5uCerCIR7wy96brnx9ddb5caM
+=baCt
 -----END PGP SIGNATURE-----
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
 }