Fix patch

Package-Manager: portage-2.1.7.7/cvs/Linux x86_64

4 files changed, 28 insertions, 11 deletions

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index c3533b872a9f..6f343a81af44 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/charm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.25 2009/11/27 07:08:50 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.26 2009/11/27 08:49:04 je_fro Exp $
+
+  27 Nov 2009; Jeff Gardner <je_fro@gentoo.org> charm-6.1.2-r2.ebuild,
+  files/charm-6.1.2-charmc-gentoo.patch:
+  Fix patch again
 
   27 Nov 2009; Jeff Gardner <je_fro@gentoo.org> -charm-6.1.2.ebuild,
   -charm-6.1.2-r1.ebuild, files/charm-6.1.2-charmc-gentoo.patch:
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 0a30f4a3a1ca..6da2ed5c8421 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,6 +1,6 @@
 AUX charm-5.9-gcc-4.2.patch 466 RMD160 26686ecd228b9fe8d5ff7b5478b34aa2a20347ef SHA1 648f3d31f4ae5163279455a564a47bef7688b513 SHA256 6e83e80f1db4c25d70cebc8b14e76cb82fec473512e5a2b0474744e61892aa75
 AUX charm-5.9-gcc4.patch 1701 RMD160 7b28484b9f956fb310fc5f7bbbfb2c896a12081d SHA1 7478496cb6f13763b047abca700dfbee2c651c9d SHA256 5d1ccf611c8f40c4e6572fcf1bb8cae1f0339a158df7bd698efcd396c28777cc
-AUX charm-6.1.2-charmc-gentoo.patch 440 RMD160 a6b7dd08f927c60842f18093b735943345bccdc5 SHA1 4a406858513f698f6f5167fdcdd31bc93693817c SHA256 dcca3609df1d26d44b5e9f920199bf402f5ef74786c2573eda20df73a9990f1b
+AUX charm-6.1.2-charmc-gentoo.patch 983 RMD160 531733244e1ef563435f97ee0b476f4bb896f750 SHA1 952220bb0d7699616e99d1913ae7ab14693d6357 SHA256 a512effc73e6e7d8c9e5ae3877d41496960207803b71dcb58c4c06ddb5ce6520
 AUX charm-6.1.2-charmrun.patch 451 RMD160 c6fbdf5fd290d5d5c0d52a8b521326f080ed646e SHA1 22a398366f8df2a37253c034afefe33566cc3105 SHA256 2e3a0279f81e76cfb5087f6c23cc0e39dff50618b0635925e373cd0c773ce603
 AUX charm-charmc-gentoo.patch 1078 RMD160 f84f49f0ced57c842f1fefe24623581b94fddde8 SHA1 c058790ccd044e5bba37ab0ac7c1f1f8b4b18acc SHA256 b903a12c4817268abf6d5797ea8cf5cfcae7ff09b969c1f073ffc08b0afbff7b
 AUX charm-doc-makefile-gentoo.patch 1348 RMD160 15941f44aad97d3f67938725d64cb94583522c73 SHA1 2c965c4d6d9390fc48f29ebae9336bab720d77bc SHA256 9a0a7426daaa05adf5f5ec35c20a6fa1f0842e58e1beefebf8f94ff1debabe03
@@ -10,6 +10,6 @@ AUX charm-python-configure-gentoo.patch 984 RMD160 fb7f9279e528d3e74756c734c6837
 DIST charm-5.9.tar.gz 7580639 RMD160 ebc3a8515fd918c6e0fc0fd9963a22b3ae5d057d SHA1 8b34d083486e6350ddf31a71e7476d6027ef9c0f SHA256 b5f8d53f0b447dbd720a0f2607a0e7902c227c7377326bf279e448ed570dcc89
 DIST charm-6.1.2_src.tar.gz 24177223 RMD160 bdd6e88a8596139303025d5ecd484a4634811dc9 SHA1 0e6cee877f22794cb647ab22ef5651048abcbbd0 SHA256 cc8a522ddf495fdd44f8134d82dfe0a17b72c2cf5962960688463d3115e8e366
 EBUILD charm-5.9.ebuild 3825 RMD160 aab9026110c2eb0b4d979b8f1d5e35496be9ebb7 SHA1 2160b0bcd683cf03443f403afbb293cc144b408f SHA256 a0e46b1177cb2a916e55e0a1a8b8bcf9829900f134812a7e7303d0bc0f59166a
-EBUILD charm-6.1.2-r2.ebuild 3076 RMD160 0e7831dc656c11b8f0d2c0ba6e1fff945ef71ad8 SHA1 015ca9a7687bc72436e87c55dc4ad636c2b0bab4 SHA256 d372cd503dd585140c8c3a88d774ae102b40041ced4976c8a8a842739355d54a
-MISC ChangeLog 4190 RMD160 a6c3753634c7ee44698b7a0c25d34579a06e86ad SHA1 e061ff8eb41ec8e2d75e2396b316d20bf3908ce2 SHA256 51c14cab4868ab6516b53021b5bcd729734e830ec93d2f12a40f28c57bd3001b
+EBUILD charm-6.1.2-r2.ebuild 3095 RMD160 2bbdf8d06cef05601f9699ba9dd505942720c2b2 SHA1 3a6d48da2f105d58f7235fcc2057ae1fa9f9845e SHA256 33f7478f3051d232d77f17f5353702b2360403ff6ee5c295879bd8e9301b3b4d
+MISC ChangeLog 4321 RMD160 6e892e2f9a9f994118d70b84aaaf98f5b4b896da SHA1 ec6c766bee63fef712a41cad32c5b75e946a20b9 SHA256 9a063b18d7de4572368e0574bd750e98acda14fea5062a67984700c37c153a47
 MISC metadata.xml 398 RMD160 bf40832b2220f644b2d56f653a41f047d0184b85 SHA1 9782cf178225fb5944bc6612076ff81c2512c842 SHA256 bc7d0905ab52e35d45967685ef8106826e8bfaacc7a0f58ae652fdb2b863e33d
diff --git a/sys-cluster/charm/charm-6.1.2-r2.ebuild b/sys-cluster/charm/charm-6.1.2-r2.ebuild
index a042f621b87b..629a8f450777 100644
--- a/sys-cluster/charm/charm-6.1.2-r2.ebuild
+++ b/sys-cluster/charm/charm-6.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.1 2009/11/27 05:26:01 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2-r2.ebuild,v 1.2 2009/11/27 08:49:04 je_fro Exp $
 
 inherit eutils toolchain-funcs flag-o-matic multilib
 
@@ -68,6 +68,9 @@ src_compile() {
 }
 
 src_install() {
+pwd
+	cd "${S}"
+pwd
 	# make charmc play well with gentoo before
 	# we move it into /usr/bin
 	epatch "${FILESDIR}/${P}-charmc-gentoo.patch"
diff --git a/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch b/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch
index 89cec4bf7aa0..e381a7e1db8f 100644
--- a/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch
+++ b/sys-cluster/charm/files/charm-6.1.2-charmc-gentoo.patch
@@ -1,12 +1,22 @@
---- src/scripts/charmc.old	2009-11-27 00:57:14.260614376 -0600
-+++ src/scripts/charmc	2009-11-27 00:59:14.128805834 -0600
-@@ -343,9 +343,9 @@
+--- src/scripts/charmc	2009-11-27 02:24:30.648381166 -0600
++++ src/scripts/charmc.new	2009-11-27 02:31:06.150618002 -0600
+@@ -343,19 +343,9 @@
  	PROG_EXT=".exe"
  fi
  
--CHARMLIB="/usr/lib64"
--CHARMINC="/usr/include/charm-6.1.2"
--CHARMLIBSO="/usr/lib64"
+-CHARMLIB="$CHARMBIN/../lib"
+-CHARMINC="$CHARMBIN/../include"
+-CHARMLIBSO=
+-if test -d "$CHARMBIN/../lib_so" 
+-then
+-  CHARMLIBSO=`cd $CHARMBIN/../lib_so 2>/dev/null && pwd`
+-  #getting absolute path is harder than thought because of symbolic links and ..
+-  #ksh needs cd -P to resolve werid symbolic links, however -P is not portable
+-  #csh is ok too if it exists 
+-  test -z "$CHARMLIBSO" && CHARMLIBSO=`cd -P $CHARMBIN/../lib_so 2>/dev/null && pwd`
+-  test -z "$CHARMLIBSO" && CHARMLIBSO=`csh -c "cd $CHARMBIN/../lib_so >& /dev/null && pwd"`
+-  test -z "$CHARMLIBSO" && echo "$CHARMBIN/../lib_so: not found" && exit 1
+-fi
 +CHARMLIB="/usr/gentoo-libdir"
 +CHARMINC="/usr/include/gentoo-include"
 +CHARMLIBSO="/usr/gentoo-libdir"