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 | fbd6127cb17b727628c832ff3d85186cc787f61f (patch) | |
| tree | abe903680725c43e29639137b6fcb22167910b83 /app-arch | |
| parent | Add a USE-flag dependency on media-libs/lcsm[static-libs] (bug #336172). (diff) | |
| download | historical-fbd6127cb17b727628c832ff3d85186cc787f61f.tar.gz historical-fbd6127cb17b727628c832ff3d85186cc787f61f.tar.bz2 historical-fbd6127cb17b727628c832ff3d85186cc787f61f.zip | |
Fix loading of 7z.bundle on Darwin, bug #338375 (force for dep problems which go beyond my territory)
Package-Manager: portage-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/Manifest | 14 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-9.13-r1.ebuild | 6 |
3 files changed, 10 insertions, 15 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/Manifest b/app-arch/p7zip/Manifest index c9dca57423b0..3170553b8caf 100644 --- a/app-arch/p7zip/Manifest +++ b/app-arch/p7zip/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 4.65-hardlink.patch 413 RMD160 49bfa9195ee874f1e6718503919b620b0986a711 SHA1 ed6d221f34f029c2b1cc7d710b78e98e2d310e32 SHA256 187fc9f9ec0160c7b5f6a1bf7394e7d92db1fbebf219a1ea55725d40255256c8 AUX 4.65-kde4.patch 3409 RMD160 568a0804bac5a46a471c974d3a9ae8919d0e73cd SHA1 b6535d4b79ece3c36b91355434ff1de7bdfd8ce8 SHA256 85215ca3c0e98340bca6469d4f21ebdd64b92958886f0d6500379d6ad0ea52ed AUX 4.65-makefile.patch 450 RMD160 9f3de770dd3d74d3546c871364ee527bb9c9d3b6 SHA1 7fdcbf714b65c25e5749ee78b34256bba84adee0 SHA256 d36e71be74fdcc3c2afaf2217cb4712f00e3e75f3d23efd6c288f058092c4120 @@ -12,14 +9,7 @@ DIST p7zip_4.65_src_all.tar.bz2 2501418 RMD160 1749032c16e7c5afaa79bc123db33d61a DIST p7zip_9.13_src_all.tar.bz2 3753579 RMD160 beb9181330f4dfa75aa4f473c68a462c76b7ab19 SHA1 81da0729561ce123c0a82656ec96a04ad5bfa522 SHA256 fc9c0fa2eabd367d6adbc3ea07bb305dbdc1f68717eea362c8c074b91c03d923 EBUILD p7zip-4.58.ebuild 2276 RMD160 9755629c5d99b60afae5b56a64b1d0407b3c9b3e SHA1 e8de5f15c4b1850068e7134de55425633334adda SHA256 4e87189dfefe899161a7aaa8349d9a2a7842b219185e50b8ef0cb9359b42e3fd EBUILD p7zip-4.65-r1.ebuild 3705 RMD160 eabb596da9883417ecd255a64d644afe6f227eef SHA1 744a4983d4fcac91f0ba7f536f951f7d0af49901 SHA256 e65498de7ba3c3e8ca87085102a2f6edeedb96afb13b70167f008dc969c27817 -EBUILD p7zip-9.13-r1.ebuild 4066 RMD160 77160b72c0dd870c7b35c806cbb973d5e13716ad SHA1 80d423bb178ebaf956bdfdf3b8802e28d4e0fe39 SHA256 c40ef20a20cfdd2e46ed7b03b1c8fa7a1f6f65c8698ec40cc2514c7f2f38fffb +EBUILD p7zip-9.13-r1.ebuild 4151 RMD160 463bbbf75bd92733ce67b9a430135f7c1526fea5 SHA1 b103ac69b297d4b9aad2c34727e385e5415e280b SHA256 50ada05539d5b53b32b2b7f8e352fb087f6bd813fae69aaba50f96a2ee84860a EBUILD p7zip-9.13.ebuild 3845 RMD160 028d662c756ff34c98ed22d2a77761824b4c766c SHA1 e7c59d5aa7cf37a67f73e855f8d6f549e5cb042f SHA256 082e2c9753ae128480b0bdf4e9fe8402e44ec386cc48c6503a36009d5cfb3cb3 -MISC ChangeLog 16477 RMD160 686b53aecfbd91c868827ffe5001a0cb753d3a01 SHA1 1767c32938a6fe466afb5729fb49ba864dacfc9c SHA256 0afd3254a6fe6f9c05b9dd2ddda4a25dda6f7d8f8c5bd1b7694d9eb1fc56e045 +MISC ChangeLog 16604 RMD160 f15c07a4a49671b5cd081c59ca16f18fa5a92212 SHA1 74ed5a6d96143a34449d77b827e594a215b5bdb1 SHA256 582579b6d2fe714c47659c1fa5a3fb19950d18ad329549888c3f68d02ad65c69 MISC metadata.xml 403 RMD160 e0525b688d7e49c113379f1da3cb48f7dd283339 SHA1 b792f63297087a3671ac45773e8f4b111f624572 SHA256 7a27b824829214305e00f9a9732fb3ba6325da30425b5e04b775d2bf2d93cedb ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAkyV12oACgkQgAnW8HDreRZoiQCfYFIwVAWjjJK60VYrFrvNxlxY -hhsAoKBfqq1b7Sin22KyaKNcnR8ZbsmC -=teT0 ------END PGP SIGNATURE----- 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 |