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 | 9c2d881c8e8818c422433bd5b6091ed447fcdc1a (patch) | |
| tree | 1ca38501ea7557294b1741c6184c77165b121dde /app-arch/p7zip | |
| parent | keyworded ~arch for ppc64, bug 330569 (diff) | |
| download | historical-9c2d881c8e8818c422433bd5b6091ed447fcdc1a.tar.gz historical-9c2d881c8e8818c422433bd5b6091ed447fcdc1a.tar.bz2 historical-9c2d881c8e8818c422433bd5b6091ed447fcdc1a.zip | |
Make fix for bug #338375 partially conditional for USE=rar
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-9.13-r1.ebuild | 4 |
3 files changed, 8 insertions, 5 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/Manifest b/app-arch/p7zip/Manifest index 3170553b8caf..358f26304a42 100644 --- a/app-arch/p7zip/Manifest +++ b/app-arch/p7zip/Manifest @@ -9,7 +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 4151 RMD160 463bbbf75bd92733ce67b9a430135f7c1526fea5 SHA1 b103ac69b297d4b9aad2c34727e385e5415e280b SHA256 50ada05539d5b53b32b2b7f8e352fb087f6bd813fae69aaba50f96a2ee84860a +EBUILD p7zip-9.13-r1.ebuild 4170 RMD160 b9ad7ac407e85b078bc84c8b28a1ee5cffdcb20d SHA1 41e9a48c20d1608f642b3172d05f73d4efacb9a7 SHA256 1550c1fa0ac3808d0d5becbeeec5f841e2ccedcf6fb5b3b563a889d3c6f493ee EBUILD p7zip-9.13.ebuild 3845 RMD160 028d662c756ff34c98ed22d2a77761824b4c766c SHA1 e7c59d5aa7cf37a67f73e855f8d6f549e5cb042f SHA256 082e2c9753ae128480b0bdf4e9fe8402e44ec386cc48c6503a36009d5cfb3cb3 -MISC ChangeLog 16604 RMD160 f15c07a4a49671b5cd081c59ca16f18fa5a92212 SHA1 74ed5a6d96143a34449d77b827e594a215b5bdb1 SHA256 582579b6d2fe714c47659c1fa5a3fb19950d18ad329549888c3f68d02ad65c69 +MISC ChangeLog 16739 RMD160 8d53ac1b62ca45aefe4eb1ef219d9deb3f958400 SHA1 26b46083b6c0f0b88219a5912d027aa4e287f058 SHA256 22681aaf38f2a5ac6ebe95b0d34b856a65386b3404555c6d02cf9df374e48493 MISC metadata.xml 403 RMD160 e0525b688d7e49c113379f1da3cb48f7dd283339 SHA1 b792f63297087a3671ac45773e8f4b111f624572 SHA256 7a27b824829214305e00f9a9732fb3ba6325da30425b5e04b775d2bf2d93cedb 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 |