Revision bump (bug #376675).

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

4 files changed, 134 insertions, 9 deletions

diff --git a/x11-wm/musca/ChangeLog b/x11-wm/musca/ChangeLog
index 0b3c599898d0..3b3803749bbd 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.18 2011/07/28 04:55:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.19 2011/10/06 20:31:51 jer Exp $
+
+*musca-0.9.24_p20100226-r2 (06 Oct 2011)
+
+  06 Oct 2011; Jeroen Roovers <jer@gentoo.org>
+  +musca-0.9.24_p20100226-r2.ebuild,
+  +files/musca-0.9.24_p20100226-dmenu-4.4.patch:
+  Revision bump (bug #376675).
 
   28 Jul 2011; Jeroen Roovers <jer@gentoo.org> -musca-0.9.24_p20100226.ebuild,
   musca-0.9.24_p20100226-r1.ebuild:
diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest
index 571725001dee..1ca1067d240d 100644
--- a/x11-wm/musca/Manifest
+++ b/x11-wm/musca/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX musca-0.9.24-make.patch 711 RMD160 b12498b12db93fee1297f13824dcd4eab010980d SHA1 239fd253cb59b46215305f6c72ed1d00b4aad959 SHA256 114b44eb6cc3584fb079faadc85d3ebf170d6c1f790a6f55c78ce7f95583cadb
+AUX musca-0.9.24_p20100226-dmenu-4.4.patch 2189 RMD160 135a864c6d136995018bd625fb364f65f932b171 SHA1 ed09142a7a87f81cb322e2faf49ed71bac3e6eb1 SHA256 ef1350444422047d47b5adce45843d74dc8af2f90054d320a4b220c098515812
 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_p20100226-r1.ebuild 1138 RMD160 ae2a7f5f7681695e13eb08226d1afac7ead3c4ca SHA1 992ea91a42fdf2116459ac0710df113b4ede84c1 SHA256 55c4007c37f3505ac68f9e687845a4b8638a7c39a56e7751f8a7222b2b17e503
-MISC ChangeLog 2444 RMD160 d7d28125b093c37202317b7ef8c890942ab508dc SHA1 8f0e171e0359061b53bb9500ef93a5719cfd8e9d SHA256 c48b9db8d48de073d01e87bb3166055a07338abd77bffd5df9f8b8704f8ef71e
+EBUILD musca-0.9.24_p20100226-r2.ebuild 1158 RMD160 6838a577072e0d17608ad8943ad7253f013ab487 SHA1 fb44712d585daabbebae9f598c31a8a49da96943 SHA256 029df586ce1a1b41322f4b27820e4417f58bf75814e2b693c23d197d61293445
+MISC ChangeLog 2651 RMD160 80f1ae1d311a868153f762daf06d60da60c5cd01 SHA1 6b90576c5ea480829a85936a864b421b775f1427 SHA256 a86a60bd5888e847a2998ae2486e5ce4a321534b3362f32e6ae057debb2e407d
 MISC metadata.xml 393 RMD160 e2da0b5e7c7353df5b12153def271d8f4acc5a61 SHA1 ec6334bd0bc315fe3c5b750bf0d7661956b2f691 SHA256 dd8215a2bee91775b10d55416da1e78dfcc5ede014c6c07990409386fd21a076
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59u5EACgkQfXuS5UK5QB0BlgQAh1cdCUDoIlZ1Ry21OZ7X6/qd
-4YifY9sndLy+5DV0++QtRm4YZ7d9RWksGy3ToiPgMvjKnABx0dnT0ydlZ1+HbGyD
-wNP+zb+KIDm7gdKY1VeoV6q+AhkEXFRVIhFYHulhrqqHOGvJzcQMpkOQi8i+66hu
-LswSEpk/oYI0TBMJBig=
-=WE2h
+iEYEARECAAYFAk6OED0ACgkQVWmRsqeSphOjvACfS0G2N1cCC/a0KrRJ7BACSBs5
+TiwAn049WtlnGFwU0CwOCO2Uun/4nrfN
+=enOK
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch b/x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch
new file mode 100644
index 000000000000..6e5c31dc8f14
--- /dev/null
+++ b/x11-wm/musca/files/musca-0.9.24_p20100226-dmenu-4.4.patch
@@ -0,0 +1,59 @@
+https://bugs.archlinux.org/task/25232
+https://bugs.launchpad.net/musca/+bug/816890
+
+diff --git a/config.h b/config.h
+index f27e122..dcad60f 100644
+--- a/config.h
++++ b/config.h
+@@ -39,7 +39,7 @@ setting settings[] = {
+ 	// optional startup file of musca commands, one per line
+ 	{ "startup",                 mst_str,   { .s = ".musca_start" }, ".+" },
+ 	// customize the dmenu command.
+-	{ "dmenu",                   mst_str,   { .s = "sort | dmenu -i -b"  }, ".+" },
++	{ "dmenu",                   mst_str,   { .s = "-i -b"  }, ".+" },
+ 	// customize the actions of dmenu driven window/group/command menus.  by default we
+ 	// just spit commands back to musca, but you can wrap or redirect stuff.  the $MUSCA
+ 	// environment variable is set to argv[0] in setup().  -i means execute stdin.
+diff --git a/musca.c b/musca.c
+index 7f1d6a3..794bb9c 100644
+--- a/musca.c
++++ b/musca.c
+@@ -2162,8 +2162,16 @@ void launch(char *cmd)
+ }
+ void menu(char *cmd, char *after)
+ {
++	// we keep original behaviour by sorting
+ 	char *tmp = allocate(strlen(cmd)+strlen(after)+BLOCK);
+-	sprintf(tmp, "%s | %s | %s", cmd, settings[ms_dmenu].s, after);
++	sprintf(tmp, "%s | sort | dmenu %s | %s", cmd, settings[ms_dmenu].s, after);
++	printf("%s\n", tmp);
++	launch(tmp); free(tmp);
++}
++void menufix(char *cmd, char*after)
++{
++	char *tmp = allocate(strlen(cmd)+strlen(after)+BLOCK);
++	sprintf(tmp, "%s %s | %s",cmd, settings[ms_dmenu].s, after);
+ 	printf("%s\n", tmp);
+ 	launch(tmp); free(tmp);
+ }
+@@ -2631,7 +2639,7 @@ char* com_command(char *cmd, regmatch_t *subs)
+ }
+ char* com_shell(char *cmd, regmatch_t *subs)
+ {
+-	menu("dmenu_path", settings[ms_run_shell_command].s);
++	menufix("dmenu_run", settings[ms_run_shell_command].s);
+ 	return NULL;
+ }
+ char* com_alias(char *cmd, regmatch_t *subs)
+diff --git a/musca_proto.h b/musca_proto.h
+index dc14d75..e25c1ea 100644
+--- a/musca_proto.h
++++ b/musca_proto.h
+@@ -145,6 +145,7 @@ void head_focus(head *h);
+ void head_next();
+ void launch(char *cmd);
+ void menu(char *cmd, char *after);
++void menufix(char *cmd, char *after);
+ void menu_wrapper(char *cmd, char *after);
+ void shutdown();
+ dcell parse_size(char *cmd, regmatch_t *subs, ucell index, ucell limit);
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r2.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r2.ebuild
new file mode 100644
index 000000000000..1b42b3e6ff6a
--- /dev/null
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r2.ebuild
@@ -0,0 +1,59 @@
+# 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_p20100226-r2.ebuild,v 1.1 2011/10/06 20:31:51 jer Exp $
+
+EAPI="4"
+
+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.html"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apis xlisten"
+
+COMMON="x11-libs/libX11"
+DEPEND="${COMMON}
+	sys-apps/sed"
+RDEPEND="
+	${COMMON}
+	>=x11-misc/dmenu-4.4
+	apis? ( x11-misc/xbindkeys )
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.24-make.patch \
+		"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch
+
+	local i
+	for i in apis xlisten; do
+		if ! use ${i}; then
+			sed -e "s|${i}||g" -i Makefile || die
+		fi
+	done
+
+	restore_config config.h
+	tc-export CC
+}
+
+src_install() {
+	dobin musca
+
+	local i
+	for i in xlisten apis; do
+		if use ${i}; then
+			dobin ${i}
+		fi
+	done
+	doman musca.1
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession musca
+
+	save_config config.h
+}