Update RELPATH to compensate for the added offset.

Package-Manager: portage-2.2.01.19120-prefix/cvs/Darwin i386

3 files changed, 17 insertions, 10 deletions

diff --git a/app-misc/ca-certificates/ChangeLog b/app-misc/ca-certificates/ChangeLog
index b8e199c0fab1..be14703d0800 100644
--- a/app-misc/ca-certificates/ChangeLog
+++ b/app-misc/ca-certificates/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/ca-certificates
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.55 2011/09/07 01:47:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.56 2011/09/07 07:04:06 grobian Exp $
+
+  07 Sep 2011; Fabian Groffen <grobian@gentoo.org>
+  ca-certificates-20110502-r4.ebuild:
+  Update RELPATH to compensate for the added offset.
 
 *ca-certificates-20110502-r4 (07 Sep 2011)
 
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 9a5eeb7c465e..f731edc240cf 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ca-certificates-20090709-root.patch 2842 RMD160 cee480400c29c113b9478250997a0d08f18428aa SHA1 fc3305985dcc784387daccd2368a123546738312 SHA256 701da246597154c37b5c9ff6999730fe8b76fe10811f71b2d1eded50a2f4f175
 AUX ca-certificates-20110502-root.patch 2942 RMD160 9b702ba1ca466134445375a71b0b44bf3bf904ae SHA1 e41f8ee727176c591621cef12c76ccee4a2b0a52 SHA256 7f2273b748140c5806c37e954bb27846cb0b8bdddda15ba0f23d3fcae6e77e28
@@ -12,14 +12,14 @@ EBUILD ca-certificates-20110421.ebuild 2119 RMD160 4d43af5a2d49eede27e6cd6b41568
 EBUILD ca-certificates-20110502-r1.ebuild 2116 RMD160 58b09920e8e77b7fdbb88d694e905c8b1d23f821 SHA1 64f97fe7afe251eb984509bfefe0e31dd2d74c49 SHA256 39b705809344be81df5d717a63f7909127481f9ec052c2169d74ac2eda508e68
 EBUILD ca-certificates-20110502-r2.ebuild 2858 RMD160 262b5a79440219a1a28f0fd18f153820ecb4fbd5 SHA1 a687a1f60539688d64911b2ede31f8981d128c26 SHA256 3c67bf66b6bf7d4f17fe3cf4eeb696331e62e201b51cdacd6bfc523ec3b2b0c6
 EBUILD ca-certificates-20110502-r3.ebuild 3028 RMD160 e1e5462fb5d15d2ec731658d14662072681278fa SHA1 bbac7afbb44b1c46dad5ea96349e4afb92c890d2 SHA256 878b924558f6dcbf177a2ca5dbc4a4f8fa2410a43a89e003308b34d4eb629a75
-EBUILD ca-certificates-20110502-r4.ebuild 3035 RMD160 1d1467860c7c11b9193b1dd931aa024d4f79d592 SHA1 de5b5a482e635d1aa4ffdafa9707bba4aa44abc7 SHA256 b6a50b36a5c4b77a910d462a9efbd2682e1abf7a5d237c03c88180b812567c8f
+EBUILD ca-certificates-20110502-r4.ebuild 3141 RMD160 42fce01b1da4dfdf7259391ef6fb84d050a592d2 SHA1 6536de1ed27743e3d46e0f08b1508da9cc360e1e SHA256 34c606d16aa73932f3c17b4c8a7124c6b00b06a9cb9cff4046b8a2cfe6e4797c
 EBUILD ca-certificates-20110502.ebuild 2120 RMD160 eff412c030efac5272b3109326d483857cb62f67 SHA1 533aa547d6360b0cd5af7b696763cd22d5e33abe SHA256 11ba88945cc66cc74f3e2236f0be28ed5e55162b7f1133929f7c4d6c7081dc05
-MISC ChangeLog 9127 RMD160 07b75ea330135a59cb735aabb6e8d2be58cf28ad SHA1 c374e4f4e94bd58bdf9828ec9a20104f86485745 SHA256 390b4db1c5998504d49b2051eb66bbe11c27293bab72013c666410195d350c64
+MISC ChangeLog 9271 RMD160 d48d98c367eaf9572c86d3ac496f4e0a24bdebf1 SHA1 4bdda29235b37de2fd9398b4ebfe769ef3a9083b SHA256 eb3412d2978d5211cbca23f62666f2ebf7f6b799c74cef0efcc2a6666a930f52
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iF4EAREIAAYFAk5mzU4ACgkQaC/OocHi7JaD4wD+NACKY16K+PqdgVZuOlEfNk+n
-B7EYwOiT+LI0ZoqezacBAI1s3LSbAppT1P4wlqUiSn0IWlvSxri8jm4NGhwEqbse
-=GGXR
+iEYEARECAAYFAk5nF3AACgkQX3X2B8XHTokq1QCglhpqKnwwJXmNJrdoagehbrK+
+u4kAoJU254dnQAoFeKRV7++VNhsEn409
+=7j47
 -----END PGP SIGNATURE-----
diff --git a/app-misc/ca-certificates/ca-certificates-20110502-r4.ebuild b/app-misc/ca-certificates/ca-certificates-20110502-r4.ebuild
index 4dc9b7fd4c64..8cc8e7ad9bee 100644
--- a/app-misc/ca-certificates/ca-certificates-20110502-r4.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20110502-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r4.ebuild,v 1.1 2011/09/07 01:47:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r4.ebuild,v 1.2 2011/09/07 07:04:06 grobian Exp $
 
 EAPI="3"
 
@@ -46,7 +46,10 @@ src_unpack() {
 src_prepare() {
 	cd "./${EPREFIX}" || die
 	epatch "${FILESDIR}"/${PN}-20110502-root.patch
-	sed -i -e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
 		usr/sbin/update-ca-certificates || die
 }