Readd patch that was mistakenly removed.

Package-Manager: portage-2.0.51.19

4 files changed, 25 insertions, 12 deletions

diff --git a/kde-base/kdeartwork/Manifest b/kde-base/kdeartwork/Manifest
index b2b229f5f7a5..58f232009a5c 100644
--- a/kde-base/kdeartwork/Manifest
+++ b/kde-base/kdeartwork/Manifest
@@ -1,13 +1,14 @@
-MD5 29ab0a1e83eab176309fbe96ed1c105b kdeartwork-3.2.3.ebuild 606
-MD5 d720aab0d669beca41c57b080fe79fe3 kdeartwork-3.3.1.ebuild 674
-MD5 ae02a728a27faee89d7848d118e81318 kdeartwork-3.4.0_rc1.ebuild 733
+MD5 8253b597397edf6f34ece68974f4b2d4 kdeartwork-3.4.0_rc1.ebuild 727
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 e3a85b1a88aee0eca6b69dd4904e8f62 kdeartwork-3.3.2.ebuild 834
-MD5 f7a8729161bfece86286ab26ea385c87 kdeartwork-3.4.0.ebuild 721
 MD5 93f082ead7e542d5da70b34872b45732 ChangeLog 14293
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 29ab0a1e83eab176309fbe96ed1c105b kdeartwork-3.2.3.ebuild 606
+MD5 661e945ec9db64889b510bd0970e5b7e kdeartwork-3.4.0.ebuild 715
+MD5 d720aab0d669beca41c57b080fe79fe3 kdeartwork-3.3.1.ebuild 674
 MD5 750b31061cf39ebc204bbc9b012da76a files/digest-kdeartwork-3.2.3 71
-MD5 71ae2484985e5597a671357e5ccc6e72 files/digest-kdeartwork-3.3.1 71
-MD5 976327b55d73654f03a7c4545f59d516 files/digest-kdeartwork-3.3.2 71
-MD5 c9a45836420240177a502b8a0f421222 files/digest-kdeartwork-3.4.0 71
 MD5 1ec1ad161df28f166638bea5f4173bac files/digest-kdeartwork-3.4.0_rc1 75
 MD5 a78e3dcfd0504ff7a053ec4c918c845f files/kdeartwork-3.3.2-gl-kdesavers.patch 711
+MD5 c9a45836420240177a502b8a0f421222 files/digest-kdeartwork-3.4.0 71
+MD5 976327b55d73654f03a7c4545f59d516 files/digest-kdeartwork-3.3.2 71
+MD5 71ae2484985e5597a671357e5ccc6e72 files/digest-kdeartwork-3.3.1 71
+MD5 1dac579b66c3a32a80c57b7dc2c3ec9d files/kdeartwork-3.4.0-gl-kdesavers.patch 744
diff --git a/kde-base/kdeartwork/files/kdeartwork-3.4.0-gl-kdesavers.patch b/kde-base/kdeartwork/files/kdeartwork-3.4.0-gl-kdesavers.patch
new file mode 100644
index 000000000000..8e3a1c3994d2
--- /dev/null
+++ b/kde-base/kdeartwork/files/kdeartwork-3.4.0-gl-kdesavers.patch
@@ -0,0 +1,12 @@
+diff -uNr kdeartwork-3.3.92.orig/kscreensaver/configure.in.in kdeartwork-3.3.92/kscreensaver/configure.in.in
+--- kdeartwork-3.3.92.orig/kscreensaver/configure.in.in	2004-08-13 15:19:49.000000000 +0200
++++ kdeartwork-3.3.92/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/kdeartwork-3.4.0.ebuild b/kde-base/kdeartwork/kdeartwork-3.4.0.ebuild
index 8be01c562b7d..681bd52835ad 100644
--- a/kde-base/kdeartwork/kdeartwork-3.4.0.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-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/kdeartwork-3.4.0.ebuild,v 1.1 2005/03/14 21:47:05 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.4.0.ebuild,v 1.2 2005/03/17 11:17:18 greg_g Exp $
 
 inherit kde-dist
 
@@ -17,7 +17,7 @@ src_unpack() {
 	kde_src_unpack
 
 	# Fix compilation with --without-gl. See bug #46775 and kde bug 89387.
-	epatch ${FILESDIR}/kdeartwork-3.4.0_beta2-gl-kdesavers.patch
+	epatch ${FILESDIR}/kdeartwork-3.4.0-gl-kdesavers.patch
 
 	make -f admin/Makefile.common
 }
diff --git a/kde-base/kdeartwork/kdeartwork-3.4.0_rc1.ebuild b/kde-base/kdeartwork/kdeartwork-3.4.0_rc1.ebuild
index 3a86ef14859c..9e8fc0cb4981 100644
--- a/kde-base/kdeartwork/kdeartwork-3.4.0_rc1.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-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/kdeartwork-3.4.0_rc1.ebuild,v 1.1 2005/02/27 22:53:12 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.4.0_rc1.ebuild,v 1.2 2005/03/17 11:17:18 greg_g Exp $
 
 inherit kde-dist
 
@@ -17,7 +17,7 @@ src_unpack() {
 	kde_src_unpack
 
 	# Fix compilation with --without-gl. See bug #46775 and kde bug 89387.
-	epatch ${FILESDIR}/kdeartwork-3.4.0_beta2-gl-kdesavers.patch
+	epatch ${FILESDIR}/kdeartwork-3.4.0-gl-kdesavers.patch
 
 	make -f admin/Makefile.common
 }