diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-09-30 20:25:41 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-09-30 20:25:41 +0000 |
| commit | 14db867de935f5d6468188701c095a4541894a25 (patch) | |
| tree | 1989264ec162e97fe105e4fc9d8921d0f932b8cb /app-arch/p7zip | |
| parent | keyworded ~arch for ppc64, bug 330569 (diff) | |
| download | gentoo-2-14db867de935f5d6468188701c095a4541894a25.tar.gz gentoo-2-14db867de935f5d6468188701c095a4541894a25.tar.bz2 gentoo-2-14db867de935f5d6468188701c095a4541894a25.zip | |
Make fix for bug #338375 partially conditional for USE=rar
(Portage version: 2.2.01.16706-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'app-arch/p7zip')
| -rw-r--r-- | app-arch/p7zip/ChangeLog | 5 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-9.13-r1.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog index e9cd950ee51b..b15ac2fa9f22 100644 --- a/app-arch/p7zip/ChangeLog +++ b/app-arch/p7zip/ChangeLog @@ -1,6 +1,9 @@ # 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.130 2010/09/30 08:19:56 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.131 2010/09/30 20:25:41 grobian Exp $ + + 30 Sep 2010; Fabian Groffen <grobian@gentoo.org> p7zip-9.13-r1.ebuild: + Make fix for bug #338375 partially conditional for USE=rar 30 Sep 2010; Fabian Groffen <grobian@gentoo.org> p7zip-9.13-r1.ebuild: Fix loading of 7z.bundle on Darwin, bug #338375 diff --git a/app-arch/p7zip/p7zip-9.13-r1.ebuild b/app-arch/p7zip/p7zip-9.13-r1.ebuild index cc2060d6859d..4dad0747d76f 100644 --- a/app-arch/p7zip/p7zip-9.13-r1.ebuild +++ b/app-arch/p7zip/p7zip-9.13-r1.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.13-r1.ebuild,v 1.2 2010/09/30 08:19:56 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13-r1.ebuild,v 1.3 2010/09/30 20:25:41 grobian Exp $ EAPI="2" WX_GTK_VER="2.8" @@ -68,7 +68,7 @@ src_prepare() { CPP/Windows/DLL.cpp || die sed -i -e '/^PROG=/s/\.so/.bundle/' \ CPP/7zip/Bundles/Format7zFree/makefile \ - CPP/7zip/Compress/Rar/makefile || die + $(use rar && echo CPP/7zip/Compress/Rar/makefile) || die 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 |