p7zip gcc41 fix

Package-Manager: portage-2.1_pre4-r1

4 files changed, 124 insertions, 6 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index bc6d6a7f7210..528ddff2ca6d 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,10 @@
 # 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.31 2005/12/11 19:31:20 radek Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.32 2006/01/31 21:26:56 hanno Exp $
+
+  31 Jan 2006; Hanno Boeck <hanno@gentoo.org> +files/p7zip-4.30-gcc41.diff,
+  p7zip-4.30.ebuild:
+  Fix for gcc 4.1.
 
 *p7zip-4.30 (11 Dec 2005)
 
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index e66fabb9a6ed..3ac0d8a72250 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,13 +1,42 @@
-MD5 1998c9e77f3a8e02b8e7d356edb3d5fb ChangeLog 4444
+MD5 e09d02cbb10f0e9d3209bcc17f3f2336 ChangeLog 4561
+RMD160 7e1610f73692f9cdb8c2ebe5a1b612efa3ad5414 ChangeLog 4561
+SHA256 fcbe9502ad6b9e2bbb54151dd0637dd74acde96ca744fed9ea3177b8d31e7722 ChangeLog 4561
 MD5 bce80de865b3593d2479e9f87bb7c011 files/7z 142
+RMD160 83bec2cf921c9562e739cddf1b18092dceffa749 files/7z 142
+SHA256 4b5a22ff23f0dc7e3b5dc0c44733fe73b2d3cd1683092a3d691179687cf95e1d files/7z 142
 MD5 c815d7159d7519fdcc539a9bca4c4ed6 files/7za 144
+RMD160 e33d08f12db399a23bd91dda12079b2d11288ce9 files/7za 144
+SHA256 15a7f37e025d1188ee52a262027a268cdfcbd1347171da9aa560a3a1a824366b files/7za 144
 MD5 1defb955ab99c1352cd6d52a4839bff6 files/digest-p7zip-4.20 67
+RMD160 9571fbff8cf2b7f8113dbf91efecfc93525229f2 files/digest-p7zip-4.20 67
+SHA256 b1cd24be70273834a2992b1ea9a59d0a7f012e7dba74b67d2bd88423c0fa1915 files/digest-p7zip-4.20 67
 MD5 1defb955ab99c1352cd6d52a4839bff6 files/digest-p7zip-4.20-r1 67
+RMD160 9571fbff8cf2b7f8113dbf91efecfc93525229f2 files/digest-p7zip-4.20-r1 67
+SHA256 b1cd24be70273834a2992b1ea9a59d0a7f012e7dba74b67d2bd88423c0fa1915 files/digest-p7zip-4.20-r1 67
 MD5 4ed52dc9ef4b9514b9a07b51b450257a files/digest-p7zip-4.27 67
+RMD160 61e80dbcca91d6acbe7e154b0ec629c7e45eb2dc files/digest-p7zip-4.27 67
+SHA256 fd0dd434fff643408f11df182927ba5651c42c91d096a028bf10c829dd7004d7 files/digest-p7zip-4.27 67
 MD5 808322fe91496fb53dc5e11254d9c476 files/digest-p7zip-4.30 71
+RMD160 06eafdfb6dd3ebbbb17e7d87223bcf6566ac5645 files/digest-p7zip-4.30 71
+SHA256 4cdaa53eba46f274cde899cc7b22de6af70102e21181ea18b3e5e373675cc427 files/digest-p7zip-4.30 71
 MD5 5cd8b1eac59c69d93fd0380607d295fc files/p7zip-4.16_x86_static.patch 276
+RMD160 4065b0a5142e9e4d7845403b2e008cdee86a9570 files/p7zip-4.16_x86_static.patch 276
+SHA256 09fa439da270e1f96d580425a4addaeb4684b3f727d01d08e9b293124646797d files/p7zip-4.16_x86_static.patch 276
+MD5 48b62ef4a701f346f6ec244cd1589e66 files/p7zip-4.30-gcc41.diff 3678
+RMD160 cdf4ea114b1f9cb126766713c7b63ad10016800e files/p7zip-4.30-gcc41.diff 3678
+SHA256 c2747d78b920a9312312dfea679ddbd84527e98171e5b694e3031b0c46f3a681 files/p7zip-4.30-gcc41.diff 3678
 MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221
+RMD160 c3fe86fc44653637aea4680b20cf4a3919b7540c metadata.xml 221
+SHA256 1d86ed32a423a4e8e6af86272561dd598d9ce6d5bb55eb6c810b11a6c3383c6a metadata.xml 221
 MD5 63b3652045bfe3ef43c505e35eced205 p7zip-4.20-r1.ebuild 1024
+RMD160 0f14a0a72b4503263f7df51582e9baaea0629653 p7zip-4.20-r1.ebuild 1024
+SHA256 894810f55e47aa3afbd981cd2b3bbabeb11f94719872592de2788f6d9da575bb p7zip-4.20-r1.ebuild 1024
 MD5 9366cbb83b1cef1ad42a9a45cd46c029 p7zip-4.20.ebuild 942
+RMD160 7c76a4aeff52a2665fa29be964d316ee310c6354 p7zip-4.20.ebuild 942
+SHA256 afa2d20a1bec4c025a0774e55d011309ed260cda141e65008b039fbb084b5dfc p7zip-4.20.ebuild 942
 MD5 f07d6aa7e772761dc637dcc822912835 p7zip-4.27.ebuild 1387
-MD5 5070e5ed32ab77d9fb7112462b1ea8fa p7zip-4.30.ebuild 1390
+RMD160 c655fdb7ac5013fd5a1ecb12b259d6ddb1d98e05 p7zip-4.27.ebuild 1387
+SHA256 60e4f47f445b44c2a292b69ff3a1db2a138df383d060338334c08f7654320b0c p7zip-4.27.ebuild 1387
+MD5 27704899bd476506c7a9f802bfd52251 p7zip-4.30.ebuild 1426
+RMD160 9a11a7a87ebebe96e6ba2006ae9f96f788d47007 p7zip-4.30.ebuild 1426
+SHA256 e13fb062eac840026c163c950581bb0b1e24cb24152623f8733370fd4e17983b p7zip-4.30.ebuild 1426
diff --git a/app-arch/p7zip/files/p7zip-4.30-gcc41.diff b/app-arch/p7zip/files/p7zip-4.30-gcc41.diff
new file mode 100644
index 000000000000..ac2fb49b9efa
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-4.30-gcc41.diff
@@ -0,0 +1,84 @@
+diff -Naur p7zip_4.30/7zip/Archive/7z/7zIn.h p7zip_4.30-gcc41/7zip/Archive/7z/7zIn.h
+--- p7zip_4.30/7zip/Archive/7z/7zIn.h	2005-09-22 19:53:23.000000000 +0200
++++ p7zip_4.30-gcc41/7zip/Archive/7z/7zIn.h	2006-01-31 22:09:46.209606000 +0100
+@@ -244,7 +244,7 @@
+       CRecordVector<bool> &digestsDefined, 
+       CRecordVector<UInt32> &digests);
+ 
+-  HRESULT CInArchive::ReadStreamsInfo(
++  HRESULT ReadStreamsInfo(
+       const CObjectVector<CByteBuffer> *dataVector,
+       UInt64 &dataOffset,
+       CRecordVector<UInt64> &packSizes,
+diff -Naur p7zip_4.30/7zip/Compress/Arj/ArjDecoder1.h p7zip_4.30-gcc41/7zip/Compress/Arj/ArjDecoder1.h
+--- p7zip_4.30/7zip/Compress/Arj/ArjDecoder1.h	2005-09-22 19:53:21.000000000 +0200
++++ p7zip_4.30-gcc41/7zip/Compress/Arj/ArjDecoder1.h	2006-01-31 22:09:46.209606000 +0100
+@@ -58,7 +58,7 @@
+   UInt32 c_table[CTABLESIZE];
+   UInt32 pt_table[PTABLESIZE];
+   
+-  void CCoder::ReleaseStreams()
++  void ReleaseStreams()
+   {
+     m_OutWindowStream.ReleaseStream();
+     m_InBitStream.ReleaseStream();
+diff -Naur p7zip_4.30/7zip/Compress/Arj/ArjDecoder2.h p7zip_4.30-gcc41/7zip/Compress/Arj/ArjDecoder2.h
+--- p7zip_4.30/7zip/Compress/Arj/ArjDecoder2.h	2005-09-22 19:53:21.000000000 +0200
++++ p7zip_4.30-gcc41/7zip/Compress/Arj/ArjDecoder2.h	2006-01-31 22:09:46.209606000 +0100
+@@ -26,7 +26,7 @@
+   CLZOutWindow m_OutWindowStream;
+   NStream::NMSBF::CDecoder<CInBuffer> m_InBitStream;
+   
+-  void CCoder::ReleaseStreams()
++  void ReleaseStreams()
+   {
+     m_OutWindowStream.ReleaseStream();
+     m_InBitStream.ReleaseStream();
+diff -Naur p7zip_4.30/7zip/Compress/Deflate/DeflateDecoder.h p7zip_4.30-gcc41/7zip/Compress/Deflate/DeflateDecoder.h
+--- p7zip_4.30/7zip/Compress/Deflate/DeflateDecoder.h	2005-09-22 19:53:20.000000000 +0200
++++ p7zip_4.30-gcc41/7zip/Compress/Deflate/DeflateDecoder.h	2006-01-31 22:09:46.209606000 +0100
+@@ -60,7 +60,7 @@
+   void DeCodeLevelTable(Byte *newLevels, int numLevels);
+   bool ReadTables();
+   
+-  void CCoder::ReleaseStreams()
++  void ReleaseStreams()
+   {
+     m_OutWindowStream.ReleaseStream();
+     ReleaseInStream();
+diff -Naur p7zip_4.30/7zip/Compress/Deflate/DeflateEncoder.h p7zip_4.30-gcc41/7zip/Compress/Deflate/DeflateEncoder.h
+--- p7zip_4.30/7zip/Compress/Deflate/DeflateEncoder.h	2005-11-19 22:09:02.000000000 +0100
++++ p7zip_4.30-gcc41/7zip/Compress/Deflate/DeflateEncoder.h	2006-01-31 22:09:46.209606000 +0100
+@@ -115,7 +115,7 @@
+   void CopyBackBlockOp(UInt32 distance, UInt32 length);
+   void WriteBlockData(bool writeMode, bool finalBlock);
+ 
+-  void CCoder::ReleaseStreams()
++  void ReleaseStreams()
+   {
+     // m_MatchFinder.ReleaseStream();
+     m_OutStream.ReleaseStream();
+diff -Naur p7zip_4.30/7zip/Compress/Lzh/LzhDecoder.h p7zip_4.30-gcc41/7zip/Compress/Lzh/LzhDecoder.h
+--- p7zip_4.30/7zip/Compress/Lzh/LzhDecoder.h	2005-09-22 19:53:21.000000000 +0200
++++ p7zip_4.30-gcc41/7zip/Compress/Lzh/LzhDecoder.h	2006-01-31 22:09:46.209606000 +0100
+@@ -53,7 +53,7 @@
+   CHuffmanDecoder<kNumDistanceSymbols> m_PHuffmanDecoder;
+   CHuffmanDecoder<kNumCSymbols> m_CHuffmanDecoder;
+ 
+-  void CCoder::ReleaseStreams()
++  void ReleaseStreams()
+   {
+     m_OutWindowStream.ReleaseStream();
+     m_InBitStream.ReleaseStream();
+diff -Naur p7zip_4.30/7zip/UI/Console/ExtractCallbackConsole.h p7zip_4.30-gcc41/7zip/UI/Console/ExtractCallbackConsole.h
+--- p7zip_4.30/7zip/UI/Console/ExtractCallbackConsole.h	2005-09-22 19:53:22.000000000 +0200
++++ p7zip_4.30-gcc41/7zip/UI/Console/ExtractCallbackConsole.h	2006-01-31 22:09:46.209606000 +0100
+@@ -52,7 +52,7 @@
+ 
+   CStdOutStream *OutStream;
+ 
+-  void CExtractCallbackConsole::Init()
++  void Init()
+   {
+     NumArchives = 0;
+     NumArchiveErrors = 0;
diff --git a/app-arch/p7zip/p7zip-4.30.ebuild b/app-arch/p7zip/p7zip-4.30.ebuild
index dd04d767441e..bc6edbf981cb 100644
--- a/app-arch/p7zip/p7zip-4.30.ebuild
+++ b/app-arch/p7zip/p7zip-4.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.30.ebuild,v 1.1 2005/12/11 19:31:20 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.30.ebuild,v 1.2 2006/01/31 21:26:56 hanno Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -18,6 +18,7 @@ S=${WORKDIR}/${PN}_${PV}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch ${FILESDIR}/${P}-gcc41.diff
 	use static && epatch "${FILESDIR}"/p7zip-4.16_x86_static.patch
 	sed -i \
 		-e "/^CXX=/s:g++:$(tc-getCXX):" \