Readd patch that was mistakenly removed.

(Portage version: 2.0.51.19)

7 files changed, 39 insertions, 30 deletions

diff --git a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.0-gl-kdesavers.patch b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.0-gl-kdesavers.patch
new file mode 100644
index 000000000000..11db68be20fe
--- /dev/null
+++ b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4.0-gl-kdesavers.patch
@@ -0,0 +1,11 @@
+--- kscreensaver/configure.in.in.orig	2004-08-13 15:19:49.000000000 +0200
++++ kscreensaver/configure.in.in	2005-02-19 14:10:21.233296888 +0100
+@@ -32,7 +32,7 @@
+ AC_HAVE_GL( have_gl=yes, have_gl=no )
+ 
+ AM_CONDITIONAL(COMPILE_GL_XSAVERS, test x$have_gl = xyes)
+-AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$ac_cv_kde_qt_has_opengl = xyes)
++AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$have_gl = xyes && test x$ac_cv_kde_qt_has_opengl = xyes)
+ AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
+ AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$have_arts = xyes)
+ 
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.0.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.0.ebuild
index 783574cece05..4463f5490cb8 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.0.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.0.ebuild,v 1.1 2005/03/13 21:19:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.0.ebuild,v 1.2 2005/03/17 11:39:48 greg_g Exp $
 
 KMMODULE=kscreensaver
 KMNAME=kdeartwork
@@ -15,7 +15,7 @@ DEPEND="$(deprange $PV $MAXKDEVER kde-base/kscreensaver)
 	opengl? ( virtual/opengl )
 	!ppc64? ( xscreensaver? ( x11-misc/xscreensaver ) )"
 
-PATCHES="${FILESDIR}/kdeartwork-3.4.0_beta2-gl-kdesavers.patch"
+PATCHES="${FILESDIR}/kdeartwork-3.4.0-gl-kdesavers.patch"
 
 src_compile() {
 	myconf="$myconf --with-dpms $(use_with opengl gl)"
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.0_rc1.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.0_rc1.ebuild
index 1eb078cc58f1..0aa55a93b0bb 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.0_rc1.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.0_rc1.ebuild,v 1.2 2005/03/08 02:39:43 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.0_rc1.ebuild,v 1.3 2005/03/17 11:39:48 greg_g Exp $
 
 KMMODULE=kscreensaver
 KMNAME=kdeartwork
@@ -15,7 +15,7 @@ DEPEND="$(deprange $PV $MAXKDEVER kde-base/kscreensaver)
 	opengl? ( virtual/opengl )
 	!ppc64? ( xscreensaver? ( x11-misc/xscreensaver ) )"
 
-PATCHES="${FILESDIR}/kdeartwork-3.4.0_beta2-gl-kdesavers.patch"
+PATCHES="${FILESDIR}/kdeartwork-3.4.0-gl-kdesavers.patch"
 
 src_compile() {
 	myconf="$myconf --with-dpms $(use_with opengl gl)"
diff --git a/kde-base/mpeglib/files/kdemultimedia-3.4.0-amd64.patch b/kde-base/mpeglib/files/kdemultimedia-3.4.0-amd64.patch
new file mode 100644
index 000000000000..7d019d1a575e
--- /dev/null
+++ b/kde-base/mpeglib/files/kdemultimedia-3.4.0-amd64.patch
@@ -0,0 +1,20 @@
+--- mpeglib/lib/input/cdromAccess.cpp.org	2005-02-02 14:06:28.000000000 +0100
++++ mpeglib/lib/input/cdromAccess.cpp	2005-02-02 14:07:30.000000000 +0100
+@@ -27,6 +27,9 @@
+   #include <sys/types.h>
+   #ifndef __u64
+   #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
++  #ifdef __x86_64__
++  typedef unsigned long long __u64;
++  #else
+   #include <bits/wordsize.h>
+   #if __WORDSIZE == 64
+   typedef unsigned long __u64;
+@@ -35,6 +38,7 @@
+   #endif 
+   #endif
+   #endif
++  #endif
+   #include "cdromAccess_Linux.cpp"
+ #endif
+ 
diff --git a/kde-base/mpeglib/files/kdemultimedia-64bit.patch b/kde-base/mpeglib/files/kdemultimedia-64bit.patch
deleted file mode 100644
index a2eb8cc89e28..000000000000
--- a/kde-base/mpeglib/files/kdemultimedia-64bit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mpeglib/lib/input/cdromAccess.cpp.orig	2004-12-17 19:48:52.348984280 +0000
-+++ mpeglib/lib/input/cdromAccess.cpp	2004-12-17 19:49:01.656900680 +0000
-@@ -26,9 +26,14 @@
-   #include <linux/version.h>
-   #include <sys/types.h>
-   #ifndef __u64
--  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
--  typedef unsigned long long __u64;
--  #endif
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
-+      #include <bits/wordsize.h>
-+      #if __WORDSIZE == 64
-+        typedef unsigned long __u64;
-+      #else
-+        typedef unsigned long long __u64;
-+      #endif
-+    #endif
-   #endif
-   #include "cdromAccess_Linux.cpp"
- #endif
diff --git a/kde-base/mpeglib/mpeglib-3.4.0.ebuild b/kde-base/mpeglib/mpeglib-3.4.0.ebuild
index 034c923e1410..c678120e513a 100644
--- a/kde-base/mpeglib/mpeglib-3.4.0.ebuild
+++ b/kde-base/mpeglib/mpeglib-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.4.0.ebuild,v 1.2 2005/03/14 15:18:14 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.4.0.ebuild,v 1.3 2005/03/17 11:43:04 greg_g Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -14,5 +14,4 @@ DEPEND="media-sound/cdparanoia"
 
 myconf="--with-cdparanoia --enable-cdparanoia"
 
-PATCHES="${FILESDIR}/kdemultimedia-3.4.0_beta1-amd64.patch"
-
+PATCHES="${FILESDIR}/kdemultimedia-3.4.0-amd64.patch"
diff --git a/kde-base/mpeglib/mpeglib-3.4.0_rc1.ebuild b/kde-base/mpeglib/mpeglib-3.4.0_rc1.ebuild
index 27385dceebd4..8cd6b3b4161c 100644
--- a/kde-base/mpeglib/mpeglib-3.4.0_rc1.ebuild
+++ b/kde-base/mpeglib/mpeglib-3.4.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.4.0_rc1.ebuild,v 1.1 2005/03/06 01:34:59 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.4.0_rc1.ebuild,v 1.2 2005/03/17 11:43:04 greg_g Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=3.4.0_rc1
@@ -16,6 +16,5 @@ myconf="--with-cdparanoia --enable-cdparanoia"
 
 src_unpack() {
 	kde-meta_src_unpack
-	epatch "${FILESDIR}/kdemultimedia-3.4.0_beta1-amd64.patch"
+	epatch "${FILESDIR}/kdemultimedia-3.4.0-amd64.patch"
 }
-