Fixed assembly and threading issues

Package-Manager: portage-2.1.1

5 files changed, 116 insertions, 20 deletions

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index 2e8d4639cad3..02cabc79af3b 100644
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/beecrypt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.32 2006/10/16 05:31:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.33 2006/10/23 09:48:40 alonbl Exp $
+
+  23 Oct 2006; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/beecrypt-4.1.2-asm.patch, +files/beecrypt-4.1.2-threads.patch,
+  beecrypt-4.1.2-r1.ebuild:
+  Fixed assembly and threading issues
 
   16 Oct 2006; Mike Frysinger <vapier@gentoo.org>
   +files/beecrypt-4.1.2-gcc4.patch, beecrypt-4.1.2-r1.ebuild:
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 29bb70058bc8..28d0a2d0965f 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX beecrypt-3.1.0-alpha.patch 321 RMD160 d97ac1d5c57cb10adf623947f556d4f0edce7928 SHA1 17b56b54a11366beef462e3d4c5a075d48f57c04 SHA256 da7c655286db874a5b96ae4413bf86d02e14d759a54d68e4de4e22e4adf10027
 MD5 9801ec0e3201addd45f08dea31ac5324 files/beecrypt-3.1.0-alpha.patch 321
 RMD160 d97ac1d5c57cb10adf623947f556d4f0edce7928 files/beecrypt-3.1.0-alpha.patch 321
@@ -13,6 +10,10 @@ AUX beecrypt-3.1.0-python2.3.patch 769 RMD160 28cc17cbb871689df4f18acc2702e4acbb
 MD5 a1ec8219f4c2e7e3185f2cd869ddae33 files/beecrypt-3.1.0-python2.3.patch 769
 RMD160 28cc17cbb871689df4f18acc2702e4acbbb79bd7 files/beecrypt-3.1.0-python2.3.patch 769
 SHA256 322410d9a2e6777fce554deeddb1e34011143918a8da306269440c9a06b9ae0f files/beecrypt-3.1.0-python2.3.patch 769
+AUX beecrypt-4.1.2-asm.patch 316 RMD160 cde09914491d8ea0f09196fc5a2422ff99ce4991 SHA1 6104df21e89149a97a33fb62e9cb4379e861b5c6 SHA256 f7b6b6f180138ea7c4ee67840630564478d149959b37d9dfdd8ffbc288fee60c
+MD5 0be6078714bfd48c770ca675190255f1 files/beecrypt-4.1.2-asm.patch 316
+RMD160 cde09914491d8ea0f09196fc5a2422ff99ce4991 files/beecrypt-4.1.2-asm.patch 316
+SHA256 f7b6b6f180138ea7c4ee67840630564478d149959b37d9dfdd8ffbc288fee60c files/beecrypt-4.1.2-asm.patch 316
 AUX beecrypt-4.1.2-athlon.patch 700 RMD160 f5026638df29a94f5a77ca42d29a5d9dd3d7e103 SHA1 7faca3ef443441629fad21751ba176108012088a SHA256 cc3eacd51054126b101c43592f75ed755161b680bdf5ab0c1b7ffef8f076534f
 MD5 1790137c0aa51e5978f813f06f74f9f5 files/beecrypt-4.1.2-athlon.patch 700
 RMD160 f5026638df29a94f5a77ca42d29a5d9dd3d7e103 files/beecrypt-4.1.2-athlon.patch 700
@@ -37,6 +38,10 @@ AUX beecrypt-4.1.2-python-debug-py-c.patch 887 RMD160 414bc978cae368facdcb6fbaae
 MD5 fdd692868cf8ae58fc39b626ea5bcb4f files/beecrypt-4.1.2-python-debug-py-c.patch 887
 RMD160 414bc978cae368facdcb6fbaae9f80edd1c2ec16 files/beecrypt-4.1.2-python-debug-py-c.patch 887
 SHA256 4a31c4f7591334e9ea1dffc314f924e6379aed2818ce95c85e3f970054538c98 files/beecrypt-4.1.2-python-debug-py-c.patch 887
+AUX beecrypt-4.1.2-threads.patch 2142 RMD160 96b4dc0ebd5bc28228e063987987f3db2817621a SHA1 f3e252258a3d4e253df3735951ae3dfaff2f6132 SHA256 c8bdc84848ec24330fd3973fb84cef2eaaa1d8e845039dc5a0d0f6bc4c4345da
+MD5 5ac8b6646bab83fbc83c29ee89b55a4c files/beecrypt-4.1.2-threads.patch 2142
+RMD160 96b4dc0ebd5bc28228e063987987f3db2817621a files/beecrypt-4.1.2-threads.patch 2142
+SHA256 c8bdc84848ec24330fd3973fb84cef2eaaa1d8e845039dc5a0d0f6bc4c4345da files/beecrypt-4.1.2-threads.patch 2142
 DIST beecrypt-3.1.0.tar.gz 452555 RMD160 da5f1ad11f8724ee75c2860252a881d1591ccb43 SHA1 1dd2bde0c5551248750ad4cdc8214cc1364e874b SHA256 50b574d330fecbc9faed81746a1abfcec903c264ae753ac64d4edf22c701519f
 DIST beecrypt-4.1.2.tar.gz 774280 RMD160 fe26e5429738450fa2ef00b37e9725eec29bda08 SHA1 71cebd3329bb2561ffba24a2004dfac50b143f59 SHA256 f29eb246947677a9e7870521e3d576fd0d91a7072210a4404ed137e40cfc18fd
 EBUILD beecrypt-3.1.0-r1.ebuild 1402 RMD160 03c6b77ac915087f4dcd6116a1dc59cd08c532fd SHA1 9d9da4870adf0533a0e14bd6ab929d121916fd33 SHA256 1970672ee4db318921e4c5a959481015087bc3dc4eb524e6aeb66c6813b1a030
@@ -47,18 +52,18 @@ EBUILD beecrypt-3.1.0-r2.ebuild 1723 RMD160 8d23c514408cb5447401b94a65b8834c8792
 MD5 b6c457c06f2f7babce8779dc33405e21 beecrypt-3.1.0-r2.ebuild 1723
 RMD160 8d23c514408cb5447401b94a65b8834c87922187 beecrypt-3.1.0-r2.ebuild 1723
 SHA256 ce7a18ed0154803578ba50d9964add3573367af04c1e55905ed43815aa417dc8 beecrypt-3.1.0-r2.ebuild 1723
-EBUILD beecrypt-4.1.2-r1.ebuild 2106 RMD160 8d9419f5c166b20923bcd3518e11d8cbc2a61ae7 SHA1 c1e4bdfcf031d0d949d781eb4007d1cf7f25b9c7 SHA256 d817aec6945fdb0edb6e5d93165541750a0ec8af7c02ff1dfa7c67b17ed3cec4
-MD5 c26bc895c0cab4bd4cccc51249b8fbfe beecrypt-4.1.2-r1.ebuild 2106
-RMD160 8d9419f5c166b20923bcd3518e11d8cbc2a61ae7 beecrypt-4.1.2-r1.ebuild 2106
-SHA256 d817aec6945fdb0edb6e5d93165541750a0ec8af7c02ff1dfa7c67b17ed3cec4 beecrypt-4.1.2-r1.ebuild 2106
+EBUILD beecrypt-4.1.2-r1.ebuild 2184 RMD160 74e45ded0c153f57ac327e08565305dc09bd3fac SHA1 02c39d65ece78d4f0563311af44b5b58cd18b7ff SHA256 28134f9389e5402abc4f313248dfc405356b919ee17d7b21b1cbb0a38a02dcf2
+MD5 3e948b2ddf57148bacd8dd626c2f56cc beecrypt-4.1.2-r1.ebuild 2184
+RMD160 74e45ded0c153f57ac327e08565305dc09bd3fac beecrypt-4.1.2-r1.ebuild 2184
+SHA256 28134f9389e5402abc4f313248dfc405356b919ee17d7b21b1cbb0a38a02dcf2 beecrypt-4.1.2-r1.ebuild 2184
 EBUILD beecrypt-4.1.2.ebuild 1571 RMD160 a81510f782805e7a69dd3fc21c3b6ad3491ec0c9 SHA1 2b15ccdc2de2fb69d131c85a179f0e3cfa93a941 SHA256 acc9b6321c2dc67140e1a0cdfc6b666779f0580fe5b473fb2a1f7ca9a1baa33e
 MD5 58efa38295c5d97f1bac7465fa9b87de beecrypt-4.1.2.ebuild 1571
 RMD160 a81510f782805e7a69dd3fc21c3b6ad3491ec0c9 beecrypt-4.1.2.ebuild 1571
 SHA256 acc9b6321c2dc67140e1a0cdfc6b666779f0580fe5b473fb2a1f7ca9a1baa33e beecrypt-4.1.2.ebuild 1571
-MISC ChangeLog 5298 RMD160 eb15dcfe16900f0e9441164a64f9a4e2f250c7e2 SHA1 b4f938f2145a2f94d91b970672366b8bbfe96214 SHA256 9f5d633f36cc6a3d165a3ea1d2a5d73803ed678f8db7dc63cb5db48ddacdece4
-MD5 1ba8a5a684ab5346e5d6c62b323ebadc ChangeLog 5298
-RMD160 eb15dcfe16900f0e9441164a64f9a4e2f250c7e2 ChangeLog 5298
-SHA256 9f5d633f36cc6a3d165a3ea1d2a5d73803ed678f8db7dc63cb5db48ddacdece4 ChangeLog 5298
+MISC ChangeLog 5485 RMD160 7d0a61c108d2d4c6535c2ecbf660e05c1ae5b322 SHA1 53e999a1088c6245b75646f55303f800b3889288 SHA256 772dc5f81effc702b1dabf65ae981baee39ba76b4858d4440f59f0b864bdf076
+MD5 dd6ef538506e15d1f13bb1147f566259 ChangeLog 5485
+RMD160 7d0a61c108d2d4c6535c2ecbf660e05c1ae5b322 ChangeLog 5485
+SHA256 772dc5f81effc702b1dabf65ae981baee39ba76b4858d4440f59f0b864bdf076 ChangeLog 5485
 MISC metadata.xml 441 RMD160 78ec9e33fd6ae832d800ba544f5474e36cafd48c SHA1 0061a112b5252de7a4803ecb7b201e48be7dc5b7 SHA256 5675e81fe2ef6bb6949439f5c88e041c614a2ad8c554c685e745a457c116279d
 MD5 ca48fb502dfc8284bdf1dad98f1f1f93 metadata.xml 441
 RMD160 78ec9e33fd6ae832d800ba544f5474e36cafd48c metadata.xml 441
@@ -75,10 +80,3 @@ SHA256 99d90cfdcd84ee178ff78f76c1a75b7ea12bc89a29cf633a585d884de57413b8 files/di
 MD5 f036930b8f9b568a6d4f0be92dfd660a files/digest-beecrypt-4.1.2-r1 244
 RMD160 95f2cc2b7b670f7e7ebfcdb7b320386305e49ab7 files/digest-beecrypt-4.1.2-r1 244
 SHA256 99d90cfdcd84ee178ff78f76c1a75b7ea12bc89a29cf633a585d884de57413b8 files/digest-beecrypt-4.1.2-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFMxklamhnQswr0vIRAid7AKCkm747WhQE5tNkVD2aIey2U6Ej4gCfWZMx
-bJK6f1yIoZsGg00I9bDsKjo=
-=q/8f
------END PGP SIGNATURE-----
diff --git a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
index 4f83aa6236b9..4ab190910628 100644
--- a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.4 2006/10/16 05:31:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.5 2006/10/23 09:48:40 alonbl Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -37,6 +37,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-python-debug-py-c.patch
 	epatch "${FILESDIR}"/${P}-configure-ac.patch
 	epatch "${FILESDIR}"/${P}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-asm.patch
+	epatch "${FILESDIR}"/${P}-threads.patch
 	eautoreconf
 }
 
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-asm.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-asm.patch
new file mode 100644
index 000000000000..c2349eb3ffc4
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.1.2-asm.patch
@@ -0,0 +1,13 @@
+--- ./gas/x86.m4.org	2006-10-23 10:31:02.000000000 +0200
++++ ./gas/x86.m4	2006-10-23 10:31:13.000000000 +0200
+@@ -48,3 +48,10 @@ define(USE_MMX)
+ define(USE_SSE)
+ define(USE_SSE2)
+ ')
++ifelse(ASM_ARCH,pentium-m,`
++undefine(`ALIGN')
++define(ALIGN,`.p2align 4')
++define(USE_MMX)
++define(USE_SSE)
++define(USE_SSE2)
++')
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-threads.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-threads.patch
new file mode 100644
index 000000000000..d47cac4ca3a0
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.1.2-threads.patch
@@ -0,0 +1,78 @@
+diff -urNp beecrypt-4.1.2.org/c++/mutex.h beecrypt-4.1.2/c++/mutex.h
+--- beecrypt-4.1.2.org/c++/mutex.h	2004-09-07 13:47:51.000000000 +0300
++++ beecrypt-4.1.2/c++/mutex.h	2006-10-23 11:19:04.000000000 +0200
+@@ -37,7 +37,9 @@ namespace beecrypt {
+ 	class BEECRYPTCXXAPI mutex
+ 	{
+ 	private:
++#ifdef ENABLE_THREADS
+ 		bc_mutex_t _lock;
++#endif
+ 
+ 	public:
+ 		inline void init() throw (char*)
+@@ -55,7 +57,9 @@ namespace beecrypt {
+ 			if ((rc = pthread_mutex_init(&_lock, 0)))
+ 				throw strerror(rc);
+ 			# else
++			#  ifdef ENABLE_THREADS
+ 			#  error
++			#  endif
+ 			# endif
+ 			#endif
+ 		}
+@@ -75,7 +79,9 @@ namespace beecrypt {
+ 			if ((rc = pthread_mutex_lock(&_lock)))
+ 				throw strerror(rc);
+ 			# else
++			#  ifdef ENABLE_THREADS
+ 			#  error
++			#  endif
+ 			# endif
+ 			#endif
+ 		}
+@@ -107,7 +113,9 @@ namespace beecrypt {
+ 				return false;
+ 			throw strerror(rc);
+ 			# else
++			#  ifdef ENABLE_THREADS
+ 			#  error
++			#  endif
+ 			# endif
+ 			#endif
+ 		}
+@@ -126,7 +134,9 @@ namespace beecrypt {
+ 			if ((rc = pthread_mutex_unlock(&_lock)))
+ 				throw strerror(rc);
+ 			# else
++			#  ifdef ENABLE_THREADS
+ 			#  error
++			#  endif
+ 			# endif
+ 			#endif
+ 		}
+@@ -145,7 +155,9 @@ namespace beecrypt {
+ 			if ((rc = pthread_mutex_destroy(&_lock)))
+ 				throw strerror(rc);
+ 			# else
++			#  ifdef ENABLE_THREADS
+ 			#  error
++			#  endif
+ 			# endif
+ 			#endif
+ 		}
+diff -urNp beecrypt-4.1.2.org/c++/security/Security.cxx beecrypt-4.1.2/c++/security/Security.cxx
+--- beecrypt-4.1.2.org/c++/security/Security.cxx	2004-11-02 09:06:58.000000000 +0200
++++ beecrypt-4.1.2/c++/security/Security.cxx	2006-10-23 11:19:23.000000000 +0200
+@@ -115,10 +115,8 @@ void Security::initialize()
+ 					{
+ 						#if WIN32
+ 						const Provider& (*inst)(void*) = (const Provider& (*)(void*)) GetProcAddress((HMODULE) handle, "provider_const_ref");
+-						#elif HAVE_PTHREAD_H
+-						const Provider& (*inst)(void*) = (const Provider& (*)(void*)) dlsym(handle, "provider_const_ref");
+ 						#else
+-						# error
++						const Provider& (*inst)(void*) = (const Provider& (*)(void*)) dlsym(handle, "provider_const_ref");
+ 						#endif
+ 
+ 						if (inst)