Fix compilation problems on x86, bug #545912

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 55 insertions, 21 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 4864975e3540..4454321e7995 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.165 2015/04/07 14:05:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.166 2015/04/08 12:31:38 jlec Exp $
+
+  08 Apr 2015; Justin Lecher <jlec@gentoo.org>
+  +files/p7zip-9.38.1-osversion.patch, p7zip-9.38.1.ebuild:
+  Fix compilation problems on x86, bug #545912
 
   07 Apr 2015; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1-r4.ebuild,
   p7zip-9.20.1-r5.ebuild, p7zip-9.38.1.ebuild:
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 4349c1cdd323..8b379bbbef5b 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -6,29 +6,30 @@ AUX p7zip 1210 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799
 AUX p7zip-9.20.1-QA.patch 650 SHA256 695b6836b13699e3db3e019dbd54275e48a01b59210fd353a2d9e46224c60785 SHA512 b07f8608b973be7c547b226bc23dd064d6cc18f6b1ea70ce72aff72fa098852914eb8d331fe7230b7fdfbb1f0fce59eb3404fd3a5b44d151ea847e87fd2d8f39 WHIRLPOOL 077a4bdf44dcbd66a525e795e082aef41321dc7770415a1cd78716d78aa5b5b2e780afcb4194ea7c2ae2947a596292be18ab8dd3f9bce302e47f8d9cdcc6a046
 AUX p7zip-9.20.1-execstack.patch 785 SHA256 0725ca42b5ac8d4024a18e2759a12c3ba04b8ea504376c14d8890f7bebba3fb1 SHA512 2b3404554295596dd1113700f72f7149baded7b381e70edea78a2cf66ad69ac6fb03653c490843ecab13e348638a0efaaeb3f5e71a0670255d09a91c70c7977f WHIRLPOOL 4aa1a9632d706c4f9f8b906a9a84929605a56e92c4289a296b767d107e11f85848d40bd58ad4df21c2d87f385318b8e740b71bc7c0467ea3af2bd6c58502d25a
 AUX p7zip-9.20.1-long_rar_pwd.patch 805 SHA256 5c2fdd7132e5fdceac91d783b1056420537f14a1e3fc7715b75dac698704ebf8 SHA512 0895fec9ec2a0eae960e44f181d2dcac618916d4bf7a5576e234ad7d2fc9417da4eb589c115b0b4040f7c9142cd43637355d8d62e8f43201117c0ee2a6da02cb WHIRLPOOL bd2d339a7356f1b3201005fe6f05ad881b2292e5fadf46a32a28c1667d32fe8b5b555105975e7c69dfa90cc157b415b86a4e153e13dfe0b8bfc4ef095c24fb57
+AUX p7zip-9.38.1-osversion.patch 838 SHA256 135de03123263910ed99d1afa07ee4a39e471fc257e9dcbe7a8ce0477634cc54 SHA512 28a798a2930552ee940f4f400e66e11cf7ee113c3c0fcf782404c45b95b5774c52b0518520a5f38cc9d7abe795756fce14a0c0e143c31f8da50253bcda423909 WHIRLPOOL 6c6f0e024ba590139fbb6f61ae8f3699e841ac8b00d530e6f7418ccc182aca2f5ffa81925b2bc2b1520cfbd617f0bf8f3c3f95b74222a5300b0f89b10ec19604
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04 WHIRLPOOL 6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24
 EBUILD p7zip-9.20.1-r4.ebuild 4237 SHA256 847ac11b93c4d17cf14a43baff094044a46cfd4b48ee0d76c11966b0c42cc57c SHA512 138c20e3ebd2ae0c9b2eeec74dd58815f1f74881514eb6bb792546c499b7eaa78a2af07ca9e2c18df48ec9f005abbf8f4075aed067591ee7ab849e9580547a71 WHIRLPOOL 29bceb1b07206805e721949877ba24a37a12f98fac93af79c07830b31f4c342d237b72ab37c4de0a66cc051afa93ed8e2e75e79cfdad545789a9dc5fac7d968b
 EBUILD p7zip-9.20.1-r5.ebuild 4471 SHA256 60d3321b38d933f78e473ced4e9a8a915fb2ea903144e3eb9a606dc9a5e358e4 SHA512 092f71fa786ff9ade07b6a35696682c1944952233e58583fc1d895b78f4e7f18355afd7d7759e601c241cfd8aae4f829e72bea1b355cdac8600a7b89127b999d WHIRLPOOL 440beccba8d4f16f6c6dd64e89e4709604cc46e14c4a64f7272702d433191b4d08824993b7df8d9149700b85136edb8c448739cf2a02f771510b061839810f9e
-EBUILD p7zip-9.38.1.ebuild 4264 SHA256 e737006808db541279530d05435cdeb799e3b85e43f96065184cb2a6854fa092 SHA512 ca2bd8f89cd011115b14dc86b53810c3aad0af92c7fccd63ab14377b5b2fb3658ba436ea96ad490b710bc85f60641264ce962a2ab1d3460aca5eb6e3efe4521b WHIRLPOOL 032b9bcd5141ec1306f0dcdf2125b7b09bbba72d7f7229cd7fffc1a0680009a2f1678fcd73999c0799940fc088d71c806f087b7fe30f5d9b4a9ea378f7003dfd
-MISC ChangeLog 21691 SHA256 0acbeb69e8adb8fdf5b81a711a3f1e53683ff47e8a57e256aeb108a595f675ed SHA512 0eb81245925508c93eec0655dc7d149fcaa942db991b01331b02bb3cbdba14a61ba33c67f86de4764aaa0d169901807f0a7a6dc800084e8170202308ebedc207 WHIRLPOOL 87252ffe81891dd7992a71e914652de6896a29b28bcba55bc78e3b28a9986eff96e82aa8a32e3b43cca146f2172c8befccd6d21bcea033f52f04e64840c8b7d7
+EBUILD p7zip-9.38.1.ebuild 4313 SHA256 87f21e8e36cf6d88d26a5a7913d776304df4a47e0858db0ceb8f8ddcc6a9643a SHA512 5d8ef712e79d4a5166a3484a3596bedd6aecc0b6ef5dfd1566ca08c7b5d683ecaca20579acf0870be3dbf7aed49ab4e5f455eb8ac660a94d23c1a3377244dfbd WHIRLPOOL cfc0862dcb4283899fb4479e9bf40d4c0865802b2bbbcd8545410b2172ae5238063881ae1180b3b98e24b0425846d8e7640c01d231fa445fa69eb56deec05d1e
+MISC ChangeLog 21846 SHA256 5d9f027ddad07f6963a840a407a73f80c0ad7f7c0a4ca6846c9a1c3b2f9e7012 SHA512 0c1b4b9a39123781df8e8887bd61145ddb57c8dc7d56bbd5ffe893070146af2008809036d3ee1d0aa92c1ed708be7d18d6b54325a8a5d36a249cdaf78eb085bd WHIRLPOOL 400a94f11d1f02ccec8c464ab54da949fc497b7be1314ae2f4c94f2b0a32dc83d958ecb33ccca8309251b9d4719419a2de17637bff31de12c8ee332106a40887
 MISC metadata.xml 332 SHA256 4f1520cfbd8b72e61635d58783a77d08189616c031d0288eb6c47ae20b182353 SHA512 9aee4332f10ec1b28c6f40c580adfb5d7d6220f00ed3cea73c11a5063ca3ca737761b206c1b6f926b9e2418f5db0439df108d9a99747eff1277190f0f6258d86 WHIRLPOOL 1610d8c1a4038ffe903cc16e153745ca611732813a1a0c03601aabff96d42106994a84962dda28783ea8943e3c8c8b11d45b25cd96ebe0926194df96e0e25a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVI+Q9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVJR+rXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirZzoQAKJrPHsRQX55+kpWoBp/IiBm
-XUpInamnHgu1gDOtXeza5nV3u/kxcBMSC5SvXjhJhEt0hR3axr2DIkNhmZUN0TDJ
-qMvNGhkLSGf22ysE7EP47mveXIjvDGATBQPb6R0xOjPqcGHAXAEoMMUYhO+5Bp6i
-/AF1FCtQztvJ5l6xcB0VK/to7bkBJh71HKioCEHZ2qfki/FJYMCLYxAgRE6y6GKV
-okMFp2RgTKtQsX+3VBTQ+l80CROFVNeGtQqbxtlnav6eJrCF4uVaf2qP+rqlF34G
-9nYCQjiNL/DM7h1fLintYh/oLSdiC0IgCmTxQw5WxJD2Kq/wJJMEmFiJzSF/qI5H
-r5R/LzztDVoTr+udnqjNCUjhqzarsO7UOqmIy4KyJkfflSJgSD3i4+38DtTqf4+k
-JUvbGhi2jurb1KqPoRYCIqW0NmiwT22E9pyV9Oi8UHx1N9A4L9a3QVQzz4FgL9Ta
-+lMo4GszTyBAE8fTkaiiuTNg/BQF25ULWWHXYtj0dc4PoMrbpJ1qII0/xSnPTS4T
-qn40EdYeSWPeScY4aPZMmdk6NbscDDE5V3uoeL2erMSCXCndJO8Z2XmS1B9pZ1N1
-piNNEIDiH7VhgZDzyeR6nHdLCsgVpP+ojKD3LTYPAvnG9/W9bm+qaxYXmpl0h43Z
-kDVNuavrYzYGjvWISpyQ
-=vA7q
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirUzcP/28k1C7vjMJw8KAZ1vL82Owj
+o0HuUVuWcNIgsUtaGWnglv+prXW7hVH0RLpQu1qbO8Fd5wjBKe0Q3cEsknOKfcyM
+QA0dy8R6N4m9xizes/P2xz655lwlty6r4UIFEd5ww6C812wAa0o7To9BO2NsE8XY
+bcCeEA87yD5qt5bh3AQEMcX5V6LZBUehraZdSSQ1IDXltkvgYkM5wMBDD51r5y9n
+B03WBKu0pwndYSUPITVnKDEqy6sLH6SZrjfJQe2VGTS3OXFgEgLAuDfPgIC2uanr
+3wsBwGmXp7zz1KHo4QqPAG3TYM79Fxf+w1rT5WDoUc7mL25l6sXhs4rF9eD0lNP+
+0cTfyq9DWDa8LMJY8vpX4gOVR0juLPE/RkCxlx4MxvFZ+jWtrRZsPSI9R1CMxGQB
+UO23eYgSCwSf5GQe3cfinoONVv6uKPnOMMF/JiJetvMBkz/8F1RgDlvNEdRfVcCQ
+s03+5L73LaOF/hxLPbdiFtxMAvZj4hAYigLK5OQ3m3U3SrCuO7PIjjKKmWNijTTr
+2veo/kuZw5ZbcT71sOJVDBs14CPlXI+JEKndT9mKV3NVuba42MyLKgRt2LKNL0ky
+3SYqLQheoxf49TPtia0eQuK2dGDj9bqskjfRSxKnpQbhejO2P/dO9RvtLYyOsGNt
+UrrerI1zyLBBQi4e1N42
+=otf+
 -----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/files/p7zip-9.38.1-osversion.patch b/app-arch/p7zip/files/p7zip-9.38.1-osversion.patch
new file mode 100644
index 000000000000..49e0653e43ef
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-9.38.1-osversion.patch
@@ -0,0 +1,28 @@
+diff -Naur old/CPP/7zip/UI/FileManager/FM.cpp new/CPP/7zip/UI/FileManager/FM.cpp
+--- old/CPP/7zip/UI/FileManager/FM.cpp	2015-01-18 08:59:09.000000000 -1000
++++ new/CPP/7zip/UI/FileManager/FM.cpp	2015-02-09 11:39:55.575712452 -1000
+@@ -348,24 +348,7 @@
+ 
+ bool IsLargePageSupported()
+ {
+-  #ifdef _WIN64
+   return true;
+-  #else
+-  OSVERSIONINFO versionInfo;
+-  versionInfo.dwOSVersionInfoSize = sizeof(versionInfo);
+-  if (!::GetVersionEx(&versionInfo))
+-    return false;
+-  if (versionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT || versionInfo.dwMajorVersion < 5)
+-    return false;
+-  if (versionInfo.dwMajorVersion > 5)
+-    return true;
+-  if (versionInfo.dwMinorVersion < 1)
+-    return false;
+-  if (versionInfo.dwMinorVersion > 1)
+-    return true;
+-  // return IsWow64();
+-  return false;
+-  #endif
+ }
+ 
+ #if 0 //#ifndef UNDER_CE
diff --git a/app-arch/p7zip/p7zip-9.38.1.ebuild b/app-arch/p7zip/p7zip-9.38.1.ebuild
index c3dfaa2ad039..897bb08c78ea 100644
--- a/app-arch/p7zip/p7zip-9.38.1.ebuild
+++ b/app-arch/p7zip/p7zip-9.38.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild,v 1.2 2015/04/07 10:10:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild,v 1.3 2015/04/08 12:31:38 jlec Exp $
 
 EAPI=5
 
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}_${PV}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-osversion.patch
+
 	if ! use pch; then
 		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
 	fi
@@ -125,9 +127,8 @@ src_install() {
 		newins GUI/p7zip_16_ok.png p7zip.png
 
 		if use kde; then
-
-			rm GUI/kde4/p7zip_compress.desktop
-			insinto  /usr/share/kde4/services/ServiceMenus
+			rm GUI/kde4/p7zip_compress.desktop || die
+			insinto /usr/share/kde4/services/ServiceMenus
 			doins GUI/kde4/*.desktop
 		fi
 	fi