Remove config.h patch from patch, use sed instead. Call restore_config before patching. Add sed script to remove sed subtitution that hangs waiting for pipe input now that dmenu_run does not return output.

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

4 files changed, 23 insertions, 25 deletions

diff --git a/x11-wm/musca/ChangeLog b/x11-wm/musca/ChangeLog
index a5e940f964bc..950e7c50fd1d 100644
--- a/x11-wm/musca/ChangeLog
+++ b/x11-wm/musca/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/musca
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.20 2012/02/17 16:00:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/ChangeLog,v 1.21 2012/03/06 21:39:45 jer Exp $
+
+  06 Mar 2012; Jeroen Roovers <jer@gentoo.org>
+  musca-0.9.24_p20100226-r2.ebuild,
+  files/musca-0.9.24_p20100226-dmenu-4.4.patch:
+  Remove config.h patch from patch, use sed instead. Call restore_config before
+  patching. Add sed script to remove sed subtitution that hangs waiting for
+  pipe input now that dmenu_run does not return output.
 
   17 Feb 2012; Jeroen Roovers <jer@gentoo.org>
   -musca-0.9.24_p20100226-r1.ebuild:
diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest
index e6aa241641db..bdb8e3234edf 100644
--- a/x11-wm/musca/Manifest
+++ b/x11-wm/musca/Manifest
@@ -2,16 +2,16 @@
 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-0.9.24_p20100226-dmenu-4.4.patch 1421 RMD160 fcd016fb649e1b75549cd0fbffda19e8b1091622 SHA1 91232891b706ce344756a1e304032e913f186e45 SHA256 d88c845edaa58a73bc4d2c331bfbd15cbbb0db50df6ab74e351eb35d92e77e6d
 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-r2.ebuild 1158 RMD160 6838a577072e0d17608ad8943ad7253f013ab487 SHA1 fb44712d585daabbebae9f598c31a8a49da96943 SHA256 029df586ce1a1b41322f4b27820e4417f58bf75814e2b693c23d197d61293445
-MISC ChangeLog 2743 RMD160 684814987b9033642469a20ffbe240e1bd9b5b45 SHA1 2bd85b13323148e8295dd81b093bccee527c59b4 SHA256 94a9b925dd62ebff8dbe32d8eaf7c15f6ef46b2f32617f2f8262965a7bd8e7d6
+EBUILD musca-0.9.24_p20100226-r2.ebuild 1303 RMD160 92b0d6a6649891c15125c4bf236f8e29b713390a SHA1 3df85af9f88fb813ec926316c57ca46fb7a13409 SHA256 e19f5a1401b7d05c01410a3a5e3c606c565e81a4ce6b256870f361c9ccc62e3d
+MISC ChangeLog 3087 RMD160 220acef801a3306c8eca21c9324d25a2d9fb4d25 SHA1 19fd92401f469cb955edabd7d37d3c3bbeac5834 SHA256 89ec50e8858c3f7f384cd751db78f71b94127f7c05d5060a24456bc153e93fe7
 MISC metadata.xml 393 RMD160 e2da0b5e7c7353df5b12153def271d8f4acc5a61 SHA1 ec6334bd0bc315fe3c5b750bf0d7661956b2f691 SHA256 dd8215a2bee91775b10d55416da1e78dfcc5ede014c6c07990409386fd21a076
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8+ebAACgkQVWmRsqeSphOOnACfZNYyg6mzCOr5C/0l0bTcTC3v
-wg4An1p68grdzx995lduczuZLNXIOq2v
-=5xsW
+iEYEARECAAYFAk9WhC4ACgkQVWmRsqeSphPZbgCfbMM0ZbKKslWFThflBZj19zPs
+IHwAmgNqpgqvcONmhJKppvDJg2bPmJO0
+=38+m
 -----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
index 6e5c31dc8f14..ce6bc45de73e 100644
--- 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
@@ -1,21 +1,6 @@
 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)
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r2.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r2.ebuild
index 1b42b3e6ff6a..1c1e99397190 100644
--- a/x11-wm/musca/musca-0.9.24_p20100226-r2.ebuild
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/musca/musca-0.9.24_p20100226-r2.ebuild,v 1.2 2012/03/06 21:39:45 jer Exp $
 
 EAPI="4"
 
@@ -26,6 +26,13 @@ RDEPEND="
 "
 
 src_prepare() {
+	restore_config config.h
+cp -av config.h{,.org}
+	sed -i config.h \
+		-e 's:"sort | dmenu -i -b":"-i -b":g' \
+		-e 's:sed.*exec.*-i::g' \
+		|| die
+diff -u config.h{.org,}
 	epatch \
 		"${FILESDIR}"/${PN}-0.9.24-make.patch \
 		"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch
@@ -37,7 +44,6 @@ src_prepare() {
 		fi
 	done
 
-	restore_config config.h
 	tc-export CC
 }