Fix building with sys-devel/binutils-2.20.51.0.2 (bug #291785).

Package-Manager: portage-14775-svn/cvs/Linux x86_64

4 files changed, 44 insertions, 5 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index 5600837d924c..d1111043d981 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.50 2009/11/03 21:39:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.51 2009/11/04 12:24:23 arfrever Exp $
+
+  04 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  botan-1.8.8.ebuild,
+  +files/botan-1.8.8-use_negative_lea_displacement.patch:
+  Fix building with sys-devel/binutils-2.20.51.0.2 (bug #291785).
 
 *botan-1.8.8 (03 Nov 2009)
 
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index b3ade73f70f6..d092e738c992 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,6 +1,7 @@
+AUX botan-1.8.8-use_negative_lea_displacement.patch 884 RMD160 c259f4d51f3c25df93d2cf99f9f29d6f2f92ea5d SHA1 d5b3deec6fadaea2b2fc41e3b62ca38c8c007f16 SHA256 b88d8a5af5a849e7a0ecbce70d63f5348cb15fd156440080e6f8e6d569084784
 DIST Botan-1.8.7.tgz 3464535 RMD160 73a6417f1445282e4b2fbf45557f2644b2996563 SHA1 69d985f66aa024f0d53c2d5597a4f1a0b9735959 SHA256 a4087fa008aa6b84a6780c9eedbe63319fba2f27bb5f182a1b0f349eba02ea24
 DIST Botan-1.8.8.tgz 2844588 RMD160 f8ac1842ddba312903442038d32da57f25f9bc1b SHA1 699df8f0c5e8d48fa8c65a873bb2e9975d4d66c5 SHA256 60a31bd9ed18ac85293d7f44c7fbb9bd0206eb7df5b42dff8517dd01b446ba84
 EBUILD botan-1.8.7.ebuild 2130 RMD160 5927d516fa550d4739d9eec50b6a20a35307ba46 SHA1 4c5c2330156f49f4436a1151a6a4a8c024a51ef4 SHA256 21f6d6b44dfb46904ea07241fcec8f6c8f9db6b0e60a3a4d012242bccd8fa24b
-EBUILD botan-1.8.8.ebuild 2125 RMD160 2e06936aed0b99f6b47533463600557e3019d44f SHA1 b7e5bb35411383645abbb9d988ff08d0b3befc0a SHA256 e48d5bb9d2a2368cb3c06e0a2b938a8ff3d21ffc236fdac89c0b9f5ab7648924
-MISC ChangeLog 7879 RMD160 4e0f2d0296474ea78372e7497fa3c26d3ae3bc60 SHA1 631755f0c7b2bfc2bc5932e997cde29217c6d338 SHA256 1fb0321f37708dce2641fb34a24cea13ac132189faa9f6a0dfd88244660a96c8
+EBUILD botan-1.8.8.ebuild 2214 RMD160 f848b8163477f831bafc29c11f7f05a10afa256e SHA1 6cd3e1e6c1e21b8795d93d28aaf338c57e434a97 SHA256 613cfbcca5e663551936367442f3707ac3ad1e17694c10f928327fa99a4f0864
+MISC ChangeLog 8099 RMD160 2beec3874084eaca9b0cb3771a3d8d779e33a1c1 SHA1 f3dd431666c6b090aebd9994e8c9ac5648443da2 SHA256 ae703af5b2daf791a370464bc35d38c8d838f50e7f46902013b5c0a542b4ed0f
 MISC metadata.xml 319 RMD160 084032a656409b8d666fa6e9c0b0f89e3ef955e7 SHA1 77d4f800c80c56a3191d488ef2d6444ab165cee3 SHA256 c0597f70f00af70ca6f77bf906babe3059717b8c1e91a74c61904008e0c14054
diff --git a/dev-libs/botan/botan-1.8.8.ebuild b/dev-libs/botan/botan-1.8.8.ebuild
index 712f5b505d53..8e85dcc671a2 100644
--- a/dev-libs/botan/botan-1.8.8.ebuild
+++ b/dev-libs/botan/botan-1.8.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.8.ebuild,v 1.1 2009/11/03 21:39:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.8.ebuild,v 1.2 2009/11/04 12:24:23 arfrever Exp $
 
 EAPI="2"
 
-inherit multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 MY_PN="Botan"
 MY_P="${MY_PN}-${PV}"
@@ -27,6 +27,10 @@ RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
 DEPEND="${RDEPEND}
 	>=dev-lang/python-2.4"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-use_negative_lea_displacement.patch"
+}
+
 src_configure() {
 	local disable_modules="proc_walk,unix_procs,cpu_counter"
 
diff --git a/dev-libs/botan/files/botan-1.8.8-use_negative_lea_displacement.patch b/dev-libs/botan/files/botan-1.8.8-use_negative_lea_displacement.patch
new file mode 100644
index 000000000000..50faa56bdca3
--- /dev/null
+++ b/dev-libs/botan/files/botan-1.8.8-use_negative_lea_displacement.patch
@@ -0,0 +1,29 @@
+#
+# old_revision [a101c8c86b755a666c72baf03154230e09e0667e]
+#
+# patch "src/hash/sha1_amd64/sha1_amd64_imp.S"
+#  from [dd263db10309950dec501dd9257a8df43cf6c6aa]
+#    to [ab1db7a394b41a1d3b9a63a6e8e1571e4671b962]
+#
+============================================================
+--- src/hash/sha1_amd64/sha1_amd64_imp.S	dd263db10309950dec501dd9257a8df43cf6c6aa
++++ src/hash/sha1_amd64/sha1_amd64_imp.S	ab1db7a394b41a1d3b9a63a6e8e1571e4671b962
+@@ -103,10 +103,16 @@ ALIGN;
+ 
+    subq $320, W
+ 
++/*
++* Using negative values for SHA-1 constants > 2^31 to work around
++* a bug in binutils not accepting large lea displacements.
++*   -0x70E44324 == 0x8F1BBCDC
++*   -0x359D3E2A == 0xCA62C1D6
++*/
+ #define MAGIC1 0x5A827999
+ #define MAGIC2 0x6ED9EBA1
+-#define MAGIC3 0x8F1BBCDC
+-#define MAGIC4 0xCA62C1D6
++#define MAGIC3 -0x70E44324
++#define MAGIC4 -0x359D3E2A
+ 
+ #define T %esi
+ #define T2 %eax