Omit 64-bit patch for amd64 to close bug 74961.

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index bb19f00b48851e2862dceda9ebd4ef13c298aae3..007225e658d52d320efbb4face1987d05efe5827 100644 (file)
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.137 2004/12/18 22:29:00 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.138 2004/12/23 19:53:31 absinthe Exp $
+
+  23 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  kdemultimedia-3.3.2.ebuild:
+  Omit 64-bit patch for amd64 to close bug 74961.
 
   18 Dec 2004; Markus Rothe <corsair@gentoo.org>
   -files/kdemultimedia-3.3.2-64bit.patch, +files/kdemultimedia-64bit.patch,

diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index 6694199dd2395e52535e57113dc198ce0c1a0f2e..cac3a89986304152a206085e5b45487125ba0b24 100644 (file)
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,4 +1,4 @@
-MD5 74f66b1bf75fa78ad861d62b84340b5f ChangeLog 20350
+MD5 b9c5b3f193474476321a3fcbb8f37885 ChangeLog 20483
 MD5 c4e2811488f5b7057830a07c7372764e kdemultimedia-3.1.5.ebuild 2689
 MD5 78a5d756b72f651a8038451801e9bee6 kdemultimedia-3.2.0.ebuild 2255
 MD5 cb93ab2aa47f5cfa2918e4d596a3569a kdemultimedia-3.2.2-r1.ebuild 1460
@@ -6,7 +6,7 @@ MD5 f357275645a4a8346ee79dd77d66b222 kdemultimedia-3.2.3.ebuild 1544
 MD5 d14011222ca2e60526a7b1cf97f643c9 kdemultimedia-3.3.0.ebuild 1803
 MD5 2b9745329d4f8001ac61f810c5dad86f kdemultimedia-3.3.1.ebuild 1721
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 315b111635a2ca03ae06c0091a734a10 kdemultimedia-3.3.2.ebuild 1727
+MD5 4da0338327cf8af6e4ded22d26408fef kdemultimedia-3.3.2.ebuild 1782
 MD5 b9cce2b0015700be978730f7bba11352 files/3.2.3-Makefile-synth.am.diff 537
 MD5 b9cce2b0015700be978730f7bba11352 files/3.3.0-Makefile-synth.am.diff 537
 MD5 b7333a2e3e5c81a1c904c67f1a79c0ca files/3.3.0-Makefile.am.diff 459

diff --git a/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild
index f50d72d2749b3e1cf0442f8cc24f2faab0aa963f..f30647694b535c6c7fabb734554cc16157c055d1 100644 (file)
--- a/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild,v 1.3 2004/12/18 22:29:00 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild,v 1.4 2004/12/23 19:53:31 absinthe Exp $
 
 inherit kde-dist flag-o-matic eutils
 
@@ -25,7 +25,10 @@ DEPEND="~kde-base/kdebase-${PV}
 src_unpack() {
        kde_src_unpack
        cd ${S}
-       epatch ${FILESDIR}/${PN}-64bit.patch
+       # bug 74961
+       if [ "${ARCH}" != "amd64" ] ; then
+               epatch ${FILESDIR}/${PN}-64bit.patch
+       fi
 }
 
 src_compile() {