another amd64 fix

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 6a8ae3c467f25564ebd31e6f34b641b7acaf7333..59f2f61b74eef9827e650b2b71c18b9060ccdbd2 100644 (file)
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.12 2004/10/17 14:45:35 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.13 2004/10/17 17:11:37 liquidx Exp $
+
+  17 Oct 2004; Alastair Tse <liquidx@gentoo.org>
+  evolution-data-server-1.0.2.ebuild:
+  fix for am64, take2
 
   17 Oct 2004; Alastair Tse <liquidx@gentoo.org>
   evolution-data-server-1.0.2.ebuild:

diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index d553dc4df822611f40a0cb4b8cfe857a99a41ede..a15f7eb27bc1803b845623ce588363e08c6d17ec 100644 (file)
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 baf4ce7d89fe06e6dce32785c2e934fe ChangeLog 2033
+MD5 a408b91274c255e8d9b7fdf9afe6cf84 ChangeLog 2143
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 9fcd25eb590d49e8c13b7634e3e3ce7d evolution-data-server-1.0.1.ebuild 869
-MD5 a84e92fc5bf3494e166a9a511af88752 evolution-data-server-1.0.2.ebuild 1033
+MD5 04737e1b992f334be0f6db73daed5756 evolution-data-server-1.0.2.ebuild 1050
 MD5 9d35355b61cdb08f0f918e3f106ce953 files/digest-evolution-data-server-1.0.1 81
 MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81
+MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBcorVRkyva5PS18kRAo1RAJ9BtFIAohUiMkGhs9qG0TR96GVsrwCfdI8y
-G05aSGcXKJZPwhGFEnFCD3Q=
-=uonm
+iD8DBQFBcqg9Rkyva5PS18kRAq2MAJ9AERtLrUfxas6fVkZO3P1/FpFuAwCfVdeo
+1xf+zaPIs58ApELbpqSis2E=
+=mZkr
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.0.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.0.2.ebuild
index 9ed09a70725a4dd2d718548b2a77053a4db3f2c1..69d607ce8685c14ae053ba649e440498c7679488 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.0.2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.0.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.0.2.ebuild,v 1.2 2004/10/17 14:45:35 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.0.2.ebuild,v 1.3 2004/10/17 17:11:37 liquidx Exp $
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="http://www.ximian.com/"
@@ -34,7 +34,8 @@ USE_DESTDIR=1
 
 src_unpack() {
        unpack ${A}
-       use amd64 && rm ${S}/libdb/dbinc/mutex.h
+       cd ${S}
+       epatch ${FILESDIR}/${P}-amd64_mutex.patch
 }
 
 src_compile() {

diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.0.2-amd64_mutex.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.0.2-amd64_mutex.patch
new file mode 100644 (file)
index 0000000..de82443
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.0.2-amd64_mutex.patch
@@ -0,0 +1,34 @@
+--- evolution-data-server-1.0.2/libdb/dbinc/mutex.h.old        2004-10-17 17:56:45.286185136 +0100
++++ evolution-data-server-1.0.2/libdb/dbinc/mutex.h    2004-10-17 17:57:11.438209424 +0100
+@@ -754,31 +754,6 @@
+ #endif
+ 
+ /*********************************************************************
+- * x86_64/gcc assembly.
+- *********************************************************************/
+-#ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
+-typedef unsigned char tsl_t;
+-
+-#ifdef LOAD_ACTUAL_MUTEX_CODE
+-/*
+- * For gcc/x86-64, 0 is clear, 1 is set.
+- */
+-#define       MUTEX_SET(tsl) ({                                               \
+-      register tsl_t *__l = (tsl);                                    \
+-      int __r;                                                        \
+-      asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
+-          : "=&a" (__r), "=m" (*__l)                                  \
+-          : "1" (*__l)                                                \
+-          );                                                          \
+-      __r & 1;                                                        \
+-})
+-
+-#define       MUTEX_UNSET(tsl)        (*(tsl) = 0)
+-#define       MUTEX_INIT(tsl)         MUTEX_UNSET(tsl)
+-#endif
+-#endif
+-
+-/*********************************************************************
+  * alphalinux/gcc assembly.
+  *********************************************************************/
+ #ifdef HAVE_MUTEX_ALPHA_LINUX_ASSEMBLY