summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2012-02-10 16:17:05 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2012-02-10 16:17:05 +0000
commit169ea5b3814728698b11df9d041ad205f00227f3 (patch)
treea5c3d3f98f49c58bddffece9063f7a8247fb9569
parentMove windowmaker-crm to windowmaker, update metadata (diff)
downloadgnustep-169ea5b3814728698b11df9d041ad205f00227f3.tar.gz
gnustep-169ea5b3814728698b11df9d041ad205f00227f3.tar.bz2
gnustep-169ea5b3814728698b11df9d041ad205f00227f3.zip
Fix paths in generated menus and sed lines to evaluate EPREFIX
(Portage version: 2.2.0_alpha85/svn/Linux x86_64, signed Manifest commit with key C74525F2) svn path=/overlay/; revision=442
-rw-r--r--x11-wm/windowmaker/ChangeLog3
-rw-r--r--x11-wm/windowmaker/Manifest14
-rw-r--r--x11-wm/windowmaker/windowmaker-9999.ebuild6
3 files changed, 18 insertions, 5 deletions
diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 4f7bb8f..d1f64d9 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 10 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> windowmaker-9999.ebuild:
+ Fix paths in generated menus and sed lines to evaluate EPREFIX
+
*windowmaker-9999 (10 Feb 2012)
10 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org>
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 2e6c243..e2cf6ed 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX wmaker.desktop 221 RMD160 501ba6451f7e756cc3d07682d728bcd6fe55366d SHA1 acd95a41645fbef358459f8f4753056cb321497e SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84
DIST WindowMaker-extra-0.1.tar.gz 238018 RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 SHA1 80f34cb3af705ec0f79d727b82cef28ee50fc4e7 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4
-EBUILD windowmaker-9999.ebuild 2642 RMD160 634729f5b200aef4c463d5067a091fd61b4585a9 SHA1 b7f5c091893284a349af8a56073f8c7c503e2a43 SHA256 9db6f34b339d1c387e337e344cbaeb7a9e160687949840aa85fccc72159d7f45
-MISC ChangeLog 846 RMD160 a0eb8c69d859ecc8ea6b417d53f577931083025b SHA1 13c33865d24a175a46eee7e7c87ee04a6a19f7b3 SHA256 0183e53dc338a4a1ef3b29e7fece330b217c4302d0ac016e1491f5e31b1dfcb0
+EBUILD windowmaker-9999.ebuild 2652 RMD160 7ff7cea4158afb3aa6259750c8fe7c7fa4801d05 SHA1 3b11f1245e3c2fb955702a6cc9ecbbff77bbc21c SHA256 6f604e8591a1123d45ce9dcd3bb9cd1ae080eb29e6d5a88f5a885ce6312a752b
+MISC ChangeLog 992 RMD160 09a1604f4df55e20f4c0c7efa54b575f587c1bb7 SHA1 d0dd876e66a9af825240f224a0ec9f247fccaa44 SHA256 7f5f5686055f73b92a561532dea1d8788cc4b30b091d0c7c959fd768aae10400
MISC metadata.xml 394 RMD160 b38936f0ba7b057fb41eeab348514bc1ee5a9b29 SHA1 c6207f10ee5f811733c721277dbe9fabe3d16ead SHA256 1b7d1d11e92f67acd47aa9243ae010ea48f55c631fa6b43b025b368b8c03a9ee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk81QwAACgkQFYEBGcdFJfK4iQD+PcCL/O3zT+R9gwj+ediIwMQD
++HhvHFkh1XLzRcAHc6EBAKc6q9zdUH344SaiWWhJE0BsPAJJFp7XDX0gOGr51oBj
+=EFot
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
index 502caff..54fd0c8 100644
--- a/x11-wm/windowmaker/windowmaker-9999.ebuild
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -38,11 +38,11 @@ src_unpack() {
src_prepare() {
# Fix some paths
- for file in "${S}"/WindowMaker/*menu*; do
+ for file in WindowMaker/*menu* util/wmgenmenu.c; do
if [[ -r $file ]] ; then
sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
- sed -i -e 's:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;' "$file" || die
- sed -i -e 's:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;' "$file" || die
+ sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+ sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
fi;
done;