Fix compilation when using --without-gl (#46775).

(Portage version: 2.0.51-r15)

5 files changed, 48 insertions, 4 deletions

diff --git a/kde-base/kdeartwork/ChangeLog b/kde-base/kdeartwork/ChangeLog
index 06d450e7b218..471ee9321813 100644
--- a/kde-base/kdeartwork/ChangeLog
+++ b/kde-base/kdeartwork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeartwork
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.113 2005/02/16 02:05:02 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.114 2005/02/19 13:51:18 greg_g Exp $
+
+  19 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeartwork-3.3.2-gl-kdesavers.patch,
+  +files/kdeartwork-3.4.0_beta2-gl-kdesavers.patch, kdeartwork-3.3.2.ebuild,
+  kdeartwork-3.4.0_beta2.ebuild:
+  Fix compilation when using --without-gl (#46775).
 
   15 Feb 2005; Jason Wever <weeve@gentoo.org> kdeartwork-3.4.0_beta2.ebuild:
   Added ~sparc keyword.
diff --git a/kde-base/kdeartwork/files/kdeartwork-3.3.2-gl-kdesavers.patch b/kde-base/kdeartwork/files/kdeartwork-3.3.2-gl-kdesavers.patch
new file mode 100644
index 000000000000..32ad3ceff47d
--- /dev/null
+++ b/kde-base/kdeartwork/files/kdeartwork-3.3.2-gl-kdesavers.patch
@@ -0,0 +1,12 @@
+diff -uNr kdeartwork-3.3.2.orig/kscreensaver/configure.in.in kdeartwork-3.3.2/kscreensaver/configure.in.in
+--- kdeartwork-3.3.2.orig/kscreensaver/configure.in.in	2005-02-19 12:41:29.073908328 +0100
++++ kdeartwork-3.3.2/kscreensaver/configure.in.in	2005-02-19 12:44:47.535737544 +0100
+@@ -33,7 +33,7 @@
+ 
+ AM_CONDITIONAL(COMPILE_GL_XSAVERS, test x$have_gl = xyes)
+ AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = 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)
+ 
+ LIBART=
diff --git a/kde-base/kdeartwork/files/kdeartwork-3.4.0_beta2-gl-kdesavers.patch b/kde-base/kdeartwork/files/kdeartwork-3.4.0_beta2-gl-kdesavers.patch
new file mode 100644
index 000000000000..8e3a1c3994d2
--- /dev/null
+++ b/kde-base/kdeartwork/files/kdeartwork-3.4.0_beta2-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.3.2.ebuild b/kde-base/kdeartwork/kdeartwork-3.3.2.ebuild
index 685ea66b3b74..0f084ffbdedb 100644
--- a/kde-base/kdeartwork/kdeartwork-3.3.2.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.3.2.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.3.2.ebuild,v 1.9 2005/01/25 00:05:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.3.2.ebuild,v 1.10 2005/02/19 13:51:18 greg_g Exp $
 
 inherit kde-dist eutils
 
@@ -15,7 +15,12 @@ DEPEND="opengl? ( virtual/opengl )
 
 src_unpack() {
 	kde_src_unpack
-	sed -ie "s:X11R6/lib\(/X11\)\?:lib:g" kscreensaver/kxsconfig/Makefile.in
+	sed -ie "s:X11R6/lib\(/X11\)\?:lib:g" kscreensaver/kxsconfig/Makefile.am
+
+	# Fix compilation with --without-gl. See bug #46775 and kde bug 89387.
+	epatch ${FILESDIR}/${P}-gl-kdesavers.patch
+
+	make -f admin/Makefile.common
 }
 
 src_compile() {
diff --git a/kde-base/kdeartwork/kdeartwork-3.4.0_beta2.ebuild b/kde-base/kdeartwork/kdeartwork-3.4.0_beta2.ebuild
index b53bda805999..627902bfeb3f 100644
--- a/kde-base/kdeartwork/kdeartwork-3.4.0_beta2.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.4.0_beta2.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_beta2.ebuild,v 1.2 2005/02/16 02:05:02 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.4.0_beta2.ebuild,v 1.3 2005/02/19 13:51:18 greg_g Exp $
 
 inherit kde-dist
 
@@ -13,6 +13,15 @@ DEPEND="~kde-base/kdebase-${PV}
 	opengl? ( virtual/opengl )
 	xscreensaver? ( x11-misc/xscreensaver )"
 
+src_unpack() {
+	kde_src_unpack
+
+	# Fix compilation with --without-gl. See bug #46775 and kde bug 89387.
+	epatch ${FILESDIR}/${P}-gl-kdesavers.patch
+
+	make -f admin/Makefile.common
+}
+
 src_compile() {
 	myconf="$myconf --with-dpms $(use_with opengl gl)"
 	kde_src_compile