Update amd64 patch for 1.0.3 and add ~amd64.

(Portage version: 2.1_pre7-r4)

3 files changed, 99 insertions, 3 deletions

diff --git a/media-libs/libemf/ChangeLog b/media-libs/libemf/ChangeLog
index 015365bd67de..f39f181bbb47 100644
--- a/media-libs/libemf/ChangeLog
+++ b/media-libs/libemf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libemf
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libemf/ChangeLog,v 1.16 2006/03/29 19:00:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libemf/ChangeLog,v 1.17 2006/04/12 19:13:36 chutzpah Exp $
+
+  12 Apr 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/libEMF-1.0.3-amd64.patch, libemf-1.0.3.ebuild:
+  Update amd64 patch for 1.0.3 and add ~amd64.
 
   29 Mar 2006; Markus Rothe <corsair@gentoo.org> libemf-1.0.3.ebuild:
   Added ~ppc64; bug #127328
diff --git a/media-libs/libemf/files/libEMF-1.0.3-amd64.patch b/media-libs/libemf/files/libEMF-1.0.3-amd64.patch
new file mode 100644
index 000000000000..ea7b9657e3b5
--- /dev/null
+++ b/media-libs/libemf/files/libEMF-1.0.3-amd64.patch
@@ -0,0 +1,87 @@
+diff -ur libEMF-1.0.3-orig/include/libEMF/wine/winnt.h libEMF-1.0.3/include/libEMF/wine/winnt.h
+--- libEMF-1.0.3-orig/include/libEMF/wine/winnt.h	2006-04-12 14:49:11.000000000 -0400
++++ libEMF-1.0.3/include/libEMF/wine/winnt.h	2006-04-12 15:07:05.000000000 -0400
+@@ -41,6 +41,10 @@
+ # define WORDS_BIGENDIAN
+ # define BITFIELDS_BIGENDIAN
+ # undef  ALLOW_UNALIGNED_ACCESS
++#elif defined(__x86_64__)
++# undef  WORDS_BIGENDIAN
++# undef  BITFIELDS_BIGENDIAN
++# define ALLOW_UNALIGNED_ACCESS
+ #elif !defined(RC_INVOKED)
+ # error Unknown CPU architecture!
+ #endif
+@@ -222,8 +226,13 @@
+ typedef unsigned short  WORD,       *PWORD,    *LPWORD;
+ typedef int             INT,        *PINT,     *LPINT;
+ typedef unsigned int    UINT,       *PUINT,    *LPUINT;
++#if !defined(__x86_64__)
+ typedef unsigned long   DWORD,      *PDWORD,   *LPDWORD;
+ typedef unsigned long   ULONG,      *PULONG,   *LPULONG;
++#else /* defined(__x86_64__) */
++typedef unsigned int   DWORD,      *PDWORD,   *LPDWORD;
++typedef unsigned int   ULONG,      *PULONG,   *LPULONG;
++#endif /* !defined(__x86_64__) */
+ typedef float           FLOAT,      *PFLOAT,   *LPFLOAT;
+ typedef double          DOUBLE,     *PDOUBLE,  *LPDOUBLE;
+ typedef double          DATE;
+@@ -263,7 +272,11 @@
+ typedef BYTE            BOOLEAN,    *PBOOLEAN;
+ typedef char            CHAR,       *PCHAR;
+ typedef short           SHORT,      *PSHORT;
++#if !defined(__x86_64__)
+ typedef long            LONG,       *PLONG,    *LPLONG;
++#else /* defined(__x86_64__) */
++typedef int             LONG,       *PLONG,    *LPLONG;
++#endif /* !defined(__x86_64__) */
+ 
+ /* Some systems might have wchar_t, but we really need 16 bit characters */
+ #ifndef WINE_WCHAR_DEFINED
+@@ -1047,6 +1060,11 @@
+ 
+ #endif  /* __sparc__ */
+ 
++#if defined(__x86_64__)
++#define CONTEXT_FULL 1
++typedef struct _CONTEXT CONTEXT;
++#endif
++
+ #if !defined(CONTEXT_FULL) && !defined(RC_INVOKED)
+ #error You need to define a CONTEXT for your CPU
+ #endif
+diff -ur libEMF-1.0.3-orig/libemf/libemf.h libEMF-1.0.3/libemf/libemf.h
+--- libEMF-1.0.3-orig/libemf/libemf.h	2006-04-12 14:49:11.000000000 -0400
++++ libEMF-1.0.3/libemf/libemf.h	2006-04-12 15:03:19.000000000 -0400
+@@ -340,6 +340,7 @@
+ 	fread( &dword, sizeof(DWORD), 1, fp_ );
+       return *this;
+     }
++#if !defined(__x86_64__)
+     /*!
+      * Output a long int to the stream (swabbed).
+      * \param long long int to output.
+@@ -374,6 +375,7 @@
+ 	fread( &long_, sizeof(LONG), 1, fp_ );
+       return *this;
+     }
++#endif
+     /*!
+      * Output a (long) int to the stream (swabbed).
+      * \param int_ (long) int to output.
+@@ -408,6 +410,7 @@
+ 	fread( &int_, sizeof(INT), 1, fp_ );
+       return *this;
+     }
++#if !defined(__x86_64__)
+     /*!
+      * Output a (long) unsigned int to the stream (swabbed).
+      * \param uint (long) unsigned int to output.
+@@ -442,6 +445,7 @@
+ 	fread( &uint, sizeof(UINT), 1, fp_ );
+       return *this;
+     }
++#endif
+     /*!
+      * Output a single precision float to the stream (swabbed).
+      * \param float_ single precision float to output.
diff --git a/media-libs/libemf/libemf-1.0.3.ebuild b/media-libs/libemf/libemf-1.0.3.ebuild
index 989fb0dfe401..fe47bebf813f 100644
--- a/media-libs/libemf/libemf-1.0.3.ebuild
+++ b/media-libs/libemf/libemf-1.0.3.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/media-libs/libemf/libemf-1.0.3.ebuild,v 1.3 2006/03/29 19:00:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libemf/libemf-1.0.3.ebuild,v 1.4 2006/04/12 19:13:36 chutzpah Exp $
 
 inherit eutils
 
@@ -11,13 +11,18 @@ SRC_URI="mirror://sourceforge/pstoedit/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${MY_P}-amd64.patch"
+}
+
 src_compile() {
 	econf --enable-editing || die
 	emake || die