diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2005-10-04 10:47:05 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2005-10-04 10:47:05 +0000 |
| commit | bf8b24f19a1098a705b618ef1f0e6a8cd137c4ea (patch) | |
| tree | 7d1170d03bfdecae4d20aa3bbab7e520eee0a684 /app-arch | |
| parent | Move kubuntu patch to distfiles. (diff) | |
| download | historical-bf8b24f19a1098a705b618ef1f0e6a8cd137c4ea.tar.gz historical-bf8b24f19a1098a705b618ef1f0e6a8cd137c4ea.tar.bz2 historical-bf8b24f19a1098a705b618ef1f0e6a8cd137c4ea.zip | |
fix bug 107166 and make it respect multilib-strict
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/p7zip/ChangeLog | 5 | ||||
| -rw-r--r-- | app-arch/p7zip/Manifest | 8 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-4.27.ebuild | 12 |
3 files changed, 14 insertions, 11 deletions
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog index 2239a15aa51b..cb8ffadfe08e 100644 --- a/app-arch/p7zip/ChangeLog +++ b/app-arch/p7zip/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-arch/p7zip # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.29 2005/09/25 12:06:38 radek Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.30 2005/10/04 10:47:05 blubb Exp $ + + 04 Oct 2005; Simon Stelling <blubb@gentoo.org> p7zip-4.27.ebuild: + fix bug 107166 and make it respect multilib-strict 25 Sep 2005; Radoslaw Stachowiak <radek@gentoo.org> files/7z, files/7za: changed wrapper script to include " around @ diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest index f7b0efdacc7f..07e443bf4b66 100644 --- a/app-arch/p7zip/Manifest +++ b/app-arch/p7zip/Manifest @@ -1,11 +1,11 @@ -MD5 4666c0fec3c5867536b14d2040d5f2a4 p7zip-4.27.ebuild 1348 -MD5 63b3652045bfe3ef43c505e35eced205 p7zip-4.20-r1.ebuild 1024 -MD5 da6347f6b2fdfa906fac31807c9c89d8 ChangeLog 4189 +MD5 6ba6f061560041fe16fb19d108467323 ChangeLog 4311 MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221 +MD5 e6a14aff37a6d756e839d6076072197b p7zip-4.27.ebuild 1380 +MD5 63b3652045bfe3ef43c505e35eced205 p7zip-4.20-r1.ebuild 1024 MD5 9366cbb83b1cef1ad42a9a45cd46c029 p7zip-4.20.ebuild 942 MD5 bce80de865b3593d2479e9f87bb7c011 files/7z 142 MD5 c815d7159d7519fdcc539a9bca4c4ed6 files/7za 144 MD5 1defb955ab99c1352cd6d52a4839bff6 files/digest-p7zip-4.20 67 +MD5 1defb955ab99c1352cd6d52a4839bff6 files/digest-p7zip-4.20-r1 67 MD5 4ed52dc9ef4b9514b9a07b51b450257a files/digest-p7zip-4.27 67 MD5 5cd8b1eac59c69d93fd0380607d295fc files/p7zip-4.16_x86_static.patch 276 -MD5 1defb955ab99c1352cd6d52a4839bff6 files/digest-p7zip-4.20-r1 67 diff --git a/app-arch/p7zip/p7zip-4.27.ebuild b/app-arch/p7zip/p7zip-4.27.ebuild index b4c5bd618692..162c50d98950 100644 --- a/app-arch/p7zip/p7zip-4.27.ebuild +++ b/app-arch/p7zip/p7zip-4.27.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.27.ebuild,v 1.4 2005/09/25 10:09:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.27.ebuild,v 1.5 2005/10/04 10:47:05 blubb Exp $ -inherit eutils toolchain-funcs +inherit eutils toolchain-funcs multilib DESCRIPTION="Port of 7-Zip archiver for Unix" HOMEPAGE="http://p7zip.sourceforge.net/" @@ -22,7 +22,7 @@ src_unpack() { sed -i \ -e "/^CXX=/s:g++:$(tc-getCXX):" \ -e "/^CC=/s:gcc:$(tc-getCC):" \ - -e "s:-O1 -s -fPIC:${CXXFLAGS}:" \ + -e "s:-O1 -s:${CXXFLAGS}:" \ makefile* || die "cleaning up makefiles" } @@ -35,11 +35,11 @@ src_install() { make_wrapper 7za "/usr/lib/${PN}/7za" make_wrapper 7z "/usr/lib/${PN}/7z" - exeinto /usr/lib/${PN} + exeinto /usr/$(get_libdir)/${PN} doexe bin/7z bin/7za bin/7zCon.sfx || die "doexe bins" - exeinto /usr/lib/${PN}/Codecs + exeinto /usr/$(get_libdir)/${PN}/Codecs doexe bin/Codecs/* || die "doexe Codecs" - exeinto /usr/lib/${PN}/Formats + exeinto /usr/$(get_libdir)/${PN}/Formats doexe bin/Formats/* || die "doexe Formats" doman man1/7z.1 man1/7za.1 |