diff options
author | Fabian Groffen <grobian@gentoo.org> | 2010-09-30 08:19:56 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2010-09-30 08:19:56 +0000 |
commit | b192a8e49e17a0734c3e8fcefae1425e23c147db (patch) | |
tree | 037c49117dc8a7330dd64a8bfe12b0dd5a2220f5 /app-arch | |
parent | Add a USE-flag dependency on media-libs/lcsm[static-libs] (bug #336172). (diff) | |
download | gentoo-2-b192a8e49e17a0734c3e8fcefae1425e23c147db.tar.gz gentoo-2-b192a8e49e17a0734c3e8fcefae1425e23c147db.tar.bz2 gentoo-2-b192a8e49e17a0734c3e8fcefae1425e23c147db.zip |
Fix loading of 7z.bundle on Darwin, bug #338375 (force for dep problems which go beyond my territory)
(Portage version: 2.2.01.16706-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'app-arch')
-rw-r--r-- | app-arch/p7zip/ChangeLog | 5 | ||||
-rw-r--r-- | app-arch/p7zip/p7zip-9.13-r1.ebuild | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog index fb8550097532..e9cd950ee51b 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.129 2010/09/19 09:26:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.130 2010/09/30 08:19:56 grobian Exp $ + + 30 Sep 2010; Fabian Groffen <grobian@gentoo.org> p7zip-9.13-r1.ebuild: + Fix loading of 7z.bundle on Darwin, bug #338375 *p7zip-9.13-r1 (19 Sep 2010) diff --git a/app-arch/p7zip/p7zip-9.13-r1.ebuild b/app-arch/p7zip/p7zip-9.13-r1.ebuild index 405ab4092759..cc2060d6859d 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.1 2010/09/19 09:26:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13-r1.ebuild,v 1.2 2010/09/30 08:19:56 grobian Exp $ EAPI="2" WX_GTK_VER="2.8" @@ -64,9 +64,11 @@ src_prepare() { || cp -f makefile.macosx_32bits makefile.machine # bundles have extension .bundle but don't die because USE=-rar # removes the Rar directory + sed -i -e '/strcpy(name/s/\.so/.bundle/' \ + CPP/Windows/DLL.cpp || die sed -i -e '/^PROG=/s/\.so/.bundle/' \ CPP/7zip/Bundles/Format7zFree/makefile \ - CPP/7zip/Compress/Rar/makefile + 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 |