Drop amd64 keyword from all revisions (see bug #127328). Also remove amd64 patch from 1.0.3. Leave the patch on 1.0 because it's stable on other arches.

(Portage version: 2.1_pre7-r4)

4 files changed, 11 insertions, 98 deletions

diff --git a/media-libs/libemf/ChangeLog b/media-libs/libemf/ChangeLog
index f39f181bbb47..563ba3775ff2 100644
--- a/media-libs/libemf/ChangeLog
+++ b/media-libs/libemf/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2006/04/12 19:13:36 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libemf/ChangeLog,v 1.18 2006/04/13 19:25:03 chutzpah Exp $
+
+  13 Apr 2006; Patrick McLean <chutzpah@gentoo.org>
+  -files/libEMF-1.0.3-amd64.patch, libemf-1.0.ebuild, libemf-1.0.3.ebuild:
+  Drop amd64 keyword from all revisions (see bug #127328). Also remove amd64
+  patch from 1.0.3. Leave the patch on 1.0 because it's stable on other arches.
 
   12 Apr 2006; Patrick McLean <chutzpah@gentoo.org>
   +files/libEMF-1.0.3-amd64.patch, libemf-1.0.3.ebuild:
diff --git a/media-libs/libemf/files/libEMF-1.0.3-amd64.patch b/media-libs/libemf/files/libEMF-1.0.3-amd64.patch
deleted file mode 100644
index ea7b9657e3b5..000000000000
--- a/media-libs/libemf/files/libEMF-1.0.3-amd64.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-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 fe47bebf813f..8f04f05e2ae2 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.4 2006/04/12 19:13:36 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libemf/libemf-1.0.3.ebuild,v 1.5 2006/04/13 19:25:03 chutzpah Exp $
 
 inherit eutils
 
@@ -11,18 +11,13 @@ SRC_URI="mirror://sourceforge/pstoedit/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~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
diff --git a/media-libs/libemf/libemf-1.0.ebuild b/media-libs/libemf/libemf-1.0.ebuild
index 43c53cdbd71e..f0763b9195d1 100644
--- a/media-libs/libemf/libemf-1.0.ebuild
+++ b/media-libs/libemf/libemf-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.ebuild,v 1.16 2005/06/22 16:45:49 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libemf/libemf-1.0.ebuild,v 1.17 2006/04/13 19:25:03 chutzpah Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""