Add fix from upstream for building with -pedantic #228725 by Nico R.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25 x86_64

4 files changed, 39 insertions, 4 deletions

diff --git a/app-arch/lzma-utils/ChangeLog b/app-arch/lzma-utils/ChangeLog
index 85f9188a4cc1..c260491c39ff 100644
--- a/app-arch/lzma-utils/ChangeLog
+++ b/app-arch/lzma-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/lzma-utils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/ChangeLog,v 1.40 2008/06/21 20:25:21 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/ChangeLog,v 1.41 2008/06/22 01:18:08 vapier Exp $
+
+  22 Jun 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/lzma-utils-4.32.6-semicolon.patch, lzma-utils-4.32.6.ebuild:
+  Add fix from upstream for building with -pedantic #228725 by Nico R.
 
   21 Jun 2008; Markus Rothe <corsair@gentoo.org> lzma-utils-4.32.6.ebuild:
   Stable on ppc64; bug #228671
diff --git a/app-arch/lzma-utils/Manifest b/app-arch/lzma-utils/Manifest
index cdbaa9950838..9500463ccea9 100644
--- a/app-arch/lzma-utils/Manifest
+++ b/app-arch/lzma-utils/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lzma-nocxx.sh 241 RMD160 149bcfede584579dff8b0e60b166d4df13508c6e SHA1 e75e4a6a4bdacecfeb9d600a7d4e368d9a8bbb22 SHA256 26c37bce11eac67399606180c51d06640f1f959484cf13c066738e7628c11f13
+AUX lzma-utils-4.32.6-semicolon.patch 617 RMD160 e2b5bf1350dfbd4ead593f351f202a7d02deef60 SHA1 68682dfcd36661409b71476d7aec8d9628acad2c SHA256 53f4a28e1ef86e2304ddee42c03487cbde95ecff4319777a47996159802ff400
 DIST lzma-4.32.5.tar.gz 472975 RMD160 af7e8badb6468c338ad1cc69e00564257668a237 SHA1 5b8b5e399c1b2bbb89bc455b860d5c2cfb87ab31 SHA256 908933eeaba8975bbee22645df019c8cc3920615d9bf618d9ff819e2e30a1ed7
 DIST lzma-4.32.6.tar.gz 478661 RMD160 b21761d2abd0b9e471467777ae515023767cd80f SHA1 cd75a42cf582b352c0765bf3dc767d000335e8cd SHA256 be4e7481b3cea9c51ac4f8c3175a7b0fd2454a0177af75aa452330e59224a5b9
 DIST lzma-utils-4.32.5-nocxx.patch.bz2 9853 RMD160 fc5adcd187f567b47b60485e65c7f0532d07d2bf SHA1 a5d84a7a0932965841a00d7282fc49b7f3978beb SHA256 3c80278f9903374c69b51bca44a7967a21bb553bf9f02aa27cf289ea0165720b
 DIST lzma-utils-4.32.6-nocxx.patch.bz2 23716 RMD160 e8ce73a025dc92b7a6f3e47d69674ca8ac850c95 SHA1 090d2c11b1010c418c552809a12e18b357d2cb54 SHA256 d692459fec80959b6995fc0443800e62ed38b57653b8ad5f5534e8d5005dd150
 EBUILD lzma-utils-4.32.5.ebuild 1183 RMD160 a0f1e8b0794e944bb0d0a46d374d6c880671bd28 SHA1 665fbf34c7d871a81ca175e1522d20fb062b0121 SHA256 62eac6c8e4cb094fcf9bd170942734d5a89fb9f3cc7597757b8cc037304a1471
-EBUILD lzma-utils-4.32.6.ebuild 1265 RMD160 04a2204ef61b32a378758f5e171fb30ea2895fdf SHA1 3c87d0ecbdeab6e8efc3eb5c0ae975bde682a991 SHA256 092cf14e9e5f7f878f5a724e36f6c524e0ad80fe84f5d3ec88a087485bde8f84
-MISC ChangeLog 4950 RMD160 3e286b0f47100ffd4916045452c31fae9ef01597 SHA1 7b1520559785676dc320585db917d3b22f4db68d SHA256 34a04b15e34c85dddd0e0e70b056dc59576e4f879325ba5e53c4e4e9d81a7980
+EBUILD lzma-utils-4.32.6.ebuild 1311 RMD160 05611c48bd3e8d3e8f71da0123e9f1a3622248b9 SHA1 c06ffe62e39ac3bfa8bb1fa12cec1837b1890d6d SHA256 87a82bbce0ed1421836baac3855683410887eca79a07083818b5d3f068777e22
+MISC ChangeLog 5141 RMD160 7034a2e5ebff80695a08a923c6e444381361f1dd SHA1 aab2204b2c62faf3dadffe74765099dbab9dea62 SHA256 4833d40e14072f82b597765f65a6798ade46882d654768200b7bc87d4ff3018a
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhdqFYACgkQ67wieSYcaxfjTgCfdeSuoMSrLu/Bcq0pXzgnXvwd
+JsIAnRUB/JnI1dAQSfsiTbyq1atDfIEL
+=K0eR
+-----END PGP SIGNATURE-----
diff --git a/app-arch/lzma-utils/files/lzma-utils-4.32.6-semicolon.patch b/app-arch/lzma-utils/files/lzma-utils-4.32.6-semicolon.patch
new file mode 100644
index 000000000000..600e1b9b530c
--- /dev/null
+++ b/app-arch/lzma-utils/files/lzma-utils-4.32.6-semicolon.patch
@@ -0,0 +1,19 @@
+commit 6bd98aeca2c27900c4b8101d6a29db84bb9db372
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date:   Sat Jun 21 15:18:05 2008 +0300
+
+    Remove invalid semicolon. Thanks to Steffi Wassermann.
+
+diff --git a/src/sdk/7zip/Compress/LZMA/LZMAEncoder.cpp b/src/sdk/7zip/Compress/LZMA/LZMAEncoder.cpp
+index a88020f..5770504 100644
+--- a/src/sdk/7zip/Compress/LZMA/LZMAEncoder.cpp
++++ b/src/sdk/7zip/Compress/LZMA/LZMAEncoder.cpp
+@@ -182,7 +182,7 @@ UInt32 CLiteralEncoder2::GetPrice(bool matchMode, Byte matchByte, Byte symbol) c
+     context = (context << 1) | bit;
+   }
+   return price;
+-};
++}
+ 
+ 
+ namespace NLength {
diff --git a/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild b/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild
index 419243dd4ee2..4230d4b73f3f 100644
--- a/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild
+++ b/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild,v 1.8 2008/06/22 01:14:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild,v 1.9 2008/06/22 01:18:08 vapier Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
@@ -26,6 +26,7 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-semicolon.patch #228725
 	if use nocxx ; then
 		epatch "${WORKDIR}"/${P}-nocxx.patch
 		find -type f -print0 | xargs -0 touch -r configure