This sed statement for darwin cannot die because USE=-rar removes one of the two...

Package-Manager: portage-2.1.7.17/cvs/Linux armv7l

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 7e9809aec44c034b0167a7ba0a77e86135458f1c..6f8eac5c94e51719c745afc81038f9bc3f8c3395 100644 (file)
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.115 2010/03/08 19:13:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.116 2010/04/13 18:04:44 darkside Exp $
+
+  13 Apr 2010; Jeremy Olexa <darkside@gentoo.org> p7zip-9.04.ebuild:
+  This sed statement for darwin cannot die because USE=-rar removes one of
+  the two targets. bug 314429
 
   08 Mar 2010; Fabian Groffen <grobian@gentoo.org> p7zip-9.04.ebuild:
   Fix issues on Darwin: use correct makefile, patch makefile for rar, bug

diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index c5016a1c0b9e2b23ed198b77b0f20f8c765f0b1d..1e073abb4bf03d462dff4beaec6fac820ede0e2c 100644 (file)
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -13,6 +13,6 @@ EBUILD p7zip-4.58-r1.ebuild 2314 RMD160 4110d47453070a41cd567aba2f14cf8698df7ce4
 EBUILD p7zip-4.58.ebuild 2276 RMD160 9755629c5d99b60afae5b56a64b1d0407b3c9b3e SHA1 e8de5f15c4b1850068e7134de55425633334adda SHA256 4e87189dfefe899161a7aaa8349d9a2a7842b219185e50b8ef0cb9359b42e3fd
 EBUILD p7zip-4.65-r1.ebuild 3787 RMD160 2ae4e204783c9210164e25c560d74774e1241ce8 SHA1 b09e8e5c9c28e7ca9c8c6221629059e0a4f530a8 SHA256 201340751542774394fb3b2b0a3155e083d29ed2f00157c7890bf02d3df30dc0
 EBUILD p7zip-4.65.ebuild 3649 RMD160 22bba5fd32243bc77a8358de62cafd2c44f2dcc5 SHA1 2434016c8c40a5d96176e9e4d588874c25c7cf8b SHA256 cd810dfd73d62d3073f33369ce0bac1eb1e7458d15d96aa7ea6ace4b8b18fdb4
-EBUILD p7zip-9.04.ebuild 3883 RMD160 c6b2124b49dc5fb939717cac13251a38d18f106d SHA1 f03c1748edb21995a7c2e0c59ea7904d94ef7255 SHA256 fa42caae4ceb93addf265b0a0f0ce4db4735600b216dfa3ea47d19f8488f14a6
-MISC ChangeLog 14931 RMD160 369e77d29fcd2a111825d8204afa22d398ab10ec SHA1 826c8f972c7f39d8718a243f8ce687b793fd7d59 SHA256 3b17d31177a515ae9a0e6f6fe81f1637859f950034c2664bd98a6288cfae0853
+EBUILD p7zip-9.04.ebuild 3938 RMD160 078c2c7671a22baf82169dd6028fe35ace372ccd SHA1 4f6faa32610e73bbfcf67b3e6e4d499b84cf6aa9 SHA256 005baf9ca37697694d03970c18166d14bbaac9aa24b08cacf6ce2789a32e1ada
+MISC ChangeLog 15107 RMD160 4f61c0778e434b2d706f62d2306c88ffd67a8955 SHA1 7cdae7045cc7a2cb9b68bb35941636db56327560 SHA256 aa3e7a946a73f8b7a6a8debf91aded85306246f2abd470d3485e4ec434743134
 MISC metadata.xml 403 RMD160 e0525b688d7e49c113379f1da3cb48f7dd283339 SHA1 b792f63297087a3671ac45773e8f4b111f624572 SHA256 7a27b824829214305e00f9a9732fb3ba6325da30425b5e04b775d2bf2d93cedb

diff --git a/app-arch/p7zip/p7zip-9.04.ebuild b/app-arch/p7zip/p7zip-9.04.ebuild
index 76a80e1351df025e44737551d2239176198eefdf..a01a236001dbf0d73469e59c4647766a12e17bea 100644 (file)
--- a/app-arch/p7zip/p7zip-9.04.ebuild
+++ b/app-arch/p7zip/p7zip-9.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.04.ebuild,v 1.3 2010/03/08 19:13:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.04.ebuild,v 1.4 2010/04/13 18:04:44 darkside Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
@@ -55,10 +55,11 @@ src_prepare() {
                [[ ${CHOST} == *64-* ]] \
                        && cp -f makefile.macosx_64bits makefile.machine \
                        || cp -f makefile.macosx_32bits makefile.machine
-               # bundles have extension .bundle
+               # bundles have extension .bundle but don't die because USE=-rar
+               # removes the Rar directory
                sed -i -e '/^PROG=/s/\.so/.bundle/' \
                        CPP/7zip/Bundles/Format7zFree/makefile \
-                       CPP/7zip/Compress/Rar/makefile || die
+                       CPP/7zip/Compress/Rar/makefile
        elif use x86-fbsd; then
                # FreeBSD needs this special makefile, because it hasn't -ldl
                sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine