Rid paths of temporary install directory. (bug #199551)

Package-Manager: portage-2.1.3.16

4 files changed, 25 insertions, 16 deletions

diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index ec16d4fe6b59..4a3d18a6d31d 100644
--- a/x11-wm/wmii/ChangeLog
+++ b/x11-wm/wmii/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/wmii
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.25 2007/11/19 03:29:17 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.26 2007/11/19 05:40:17 omp Exp $
+
+*wmii-3.6-r1 (19 Nov 2007)
+
+  19 Nov 2007; David Shakaryan <omp@gentoo.org> -wmii-3.6.ebuild,
+  +wmii-3.6-r1.ebuild:
+  Rid paths of temporary install directory. (bug #199551)
 
   19 Nov 2007; David Shakaryan <omp@gentoo.org> wmii-3.5.1.ebuild:
   Depend on correct version of libixp for older release. (bug #199556)
diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index 56c8450ee65d..6e7fc1feabc2 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -20,14 +20,14 @@ EBUILD wmii-3.5.1.ebuild 1133 RMD160 1d290a8cee3c54ba81d15a37c3373348abe0d772 SH
 MD5 68ca984da5ba5680c84c5611a2959f87 wmii-3.5.1.ebuild 1133
 RMD160 1d290a8cee3c54ba81d15a37c3373348abe0d772 wmii-3.5.1.ebuild 1133
 SHA256 c596b8ba1980b9e5d3221a9924e1918d218e2df749001af88670ab77e2f0882e wmii-3.5.1.ebuild 1133
-EBUILD wmii-3.6.ebuild 1098 RMD160 0c25a68ffd12de9603468a2e71a1572c00b0e96a SHA1 7ab153fce2d1c09e611b6df01226a92d5c9bb4dd SHA256 d34e957a8e63920ed2346697e5bb9258a118a4368482e5420f968bf4025105a9
-MD5 eb1ada59dafb60885081128b698b164b wmii-3.6.ebuild 1098
-RMD160 0c25a68ffd12de9603468a2e71a1572c00b0e96a wmii-3.6.ebuild 1098
-SHA256 d34e957a8e63920ed2346697e5bb9258a118a4368482e5420f968bf4025105a9 wmii-3.6.ebuild 1098
-MISC ChangeLog 3837 RMD160 4d838ec0ec5347b3adb9323be2cfd5dc295f5188 SHA1 e7c0a4d0d7da3f8036f877d9d0b0b69903cc35ca SHA256 8123602f3a2218490f8459d65d9285625dac8b22bdd936a17f1d5f6f160e7f74
-MD5 5d0a6eab619745252353aab46b8b879e ChangeLog 3837
-RMD160 4d838ec0ec5347b3adb9323be2cfd5dc295f5188 ChangeLog 3837
-SHA256 8123602f3a2218490f8459d65d9285625dac8b22bdd936a17f1d5f6f160e7f74 ChangeLog 3837
+EBUILD wmii-3.6-r1.ebuild 1211 RMD160 c34f2ac7859841236b3f1f4514026215efce4518 SHA1 18470ee4ec3c547cde1c4ef816214724d597f563 SHA256 8ed5cc25d559e23f55cd34d490788532ca5d4d61e0b2cef902ce870ec98d29fb
+MD5 d1de5ac39089ecdf9887b84eabaf9136 wmii-3.6-r1.ebuild 1211
+RMD160 c34f2ac7859841236b3f1f4514026215efce4518 wmii-3.6-r1.ebuild 1211
+SHA256 8ed5cc25d559e23f55cd34d490788532ca5d4d61e0b2cef902ce870ec98d29fb wmii-3.6-r1.ebuild 1211
+MISC ChangeLog 4013 RMD160 04bdaf5ac1fafba9c57827c0fee4c112e74625f9 SHA1 1dccbf6732b04ae2a56631e17fa8f399e033e4d8 SHA256 9d20f7f13e4e7fbcd9f8320787c0cbda89d982ae52426809638dae1e83706db8
+MD5 a0d14b23eb8b750e7949b45f26670d6d ChangeLog 4013
+RMD160 04bdaf5ac1fafba9c57827c0fee4c112e74625f9 ChangeLog 4013
+SHA256 9d20f7f13e4e7fbcd9f8320787c0cbda89d982ae52426809638dae1e83706db8 ChangeLog 4013
 MISC metadata.xml 694 RMD160 e87d8b4bc25a7a7f90bd31f56b7f3276b2449bd0 SHA1 7b97d946a5538f2ba73e652dc60a2994714c5382 SHA256 5a59ed4f579bee8cf8973150ec17e51a44dc3013a00d7846d5a6d0b570e95689
 MD5 a707a751ad8e47a1e4651414f9f64c54 metadata.xml 694
 RMD160 e87d8b4bc25a7a7f90bd31f56b7f3276b2449bd0 metadata.xml 694
@@ -38,13 +38,13 @@ SHA256 886a1da58613bcdf0877695776f59fa5cece12d820c130ab4fca80e45a1c4d22 files/di
 MD5 0d077a459dc376a0a8b4327bb7466fa2 files/digest-wmii-3.5.1 229
 RMD160 64e376cc2b40fa92d03665eeb6c1a4bea5d57e7c files/digest-wmii-3.5.1 229
 SHA256 31f6d725c2af8c6fda7d56cc6b7318baf80bc4cadf52711eb15e325e753ac438 files/digest-wmii-3.5.1 229
-MD5 06271d80d573af57b4ee12a07b1b73c6 files/digest-wmii-3.6 226
-RMD160 06f429b5a0b1282bb0084e13c2793b59537d7a62 files/digest-wmii-3.6 226
-SHA256 fb78cf0be981a96a251ffc2ec45851d1ede90019989acf46b47944b684fdc6d9 files/digest-wmii-3.6 226
+MD5 06271d80d573af57b4ee12a07b1b73c6 files/digest-wmii-3.6-r1 226
+RMD160 06f429b5a0b1282bb0084e13c2793b59537d7a62 files/digest-wmii-3.6-r1 226
+SHA256 fb78cf0be981a96a251ffc2ec45851d1ede90019989acf46b47944b684fdc6d9 files/digest-wmii-3.6-r1 226
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHQQMevSApE0uP4UsRAhV4AJ4xCebFWn9Vta4giFVNxdXmLRbGAgCcDHu4
-kLJciUdJfkYflmi6TVK2m7I=
-=N+7t
+iD8DBQFHQSHSvSApE0uP4UsRAvj4AJ4/nfmIlB8/KB84vK4qJkzVFSQg3wCfRjNw
+nOzpekWvCLkXuW94kMjxG+M=
+=KlMk
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/wmii/files/digest-wmii-3.6 b/x11-wm/wmii/files/digest-wmii-3.6-r1
index 97df9076ece5..97df9076ece5 100644
--- a/x11-wm/wmii/files/digest-wmii-3.6
+++ b/x11-wm/wmii/files/digest-wmii-3.6-r1
diff --git a/x11-wm/wmii/wmii-3.6.ebuild b/x11-wm/wmii/wmii-3.6-r1.ebuild
index 4d68fca5a8f9..bdc720bde9ef 100644
--- a/x11-wm/wmii/wmii-3.6.ebuild
+++ b/x11-wm/wmii/wmii-3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.6.ebuild,v 1.2 2007/11/19 03:23:17 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.6-r1.ebuild,v 1.1 2007/11/19 05:40:17 omp Exp $
 
 inherit multilib toolchain-funcs
 
@@ -39,6 +39,9 @@ src_install() {
 	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 	dodoc NOTES README TODO
 
+	# Rid paths of temporary install directory. (bug #199551)
+	sed -i -e "s|${D}||g" "${D}/usr/bin/wmiistartrc"
+
 	echo -e "#!/bin/sh\n/usr/bin/wmii" > "${T}/${PN}"
 	exeinto /etc/X11/Sessions
 	doexe "${T}/${PN}"