added qt-4.6-nolibx11.diff patch

Package-Manager: portage-2.2_rc54/cvs/Linux x86_64

18 files changed, 168 insertions, 12 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 7fd0badfa5b1..a8bd800af802 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.80 2009/12/01 18:10:44 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.81 2009/12/03 17:22:07 wired Exp $
+
+  03 Dec 2009; Alex Alexander <wired@gentoo.org>
+  +files/qt-4.6-nolibx11.diff, qt-core-4.6.0.ebuild:
+  added qt-4.6-nolibx11.diff patch
 
   01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   -qt-core-4.6.0_rc1.ebuild:
diff --git a/x11-libs/qt-core/files/qt-4.6-nolibx11.diff b/x11-libs/qt-core/files/qt-4.6-nolibx11.diff
new file mode 100644
index 000000000000..d3c1d1f75121
--- /dev/null
+++ b/x11-libs/qt-core/files/qt-4.6-nolibx11.diff
@@ -0,0 +1,18 @@
+--- configure.old	2009-12-03 18:52:58.061117684 +0200
++++ configure	2009-12-03 18:53:09.065116496 +0200
+@@ -5010,15 +5010,6 @@
+         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
+     fi
+ 
+-    # Check we actually have X11 :-)
+-    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
+-    if [ $? != "0" ]; then
+-        echo "Basic XLib functionality test failed!"
+-        echo " You might need to modify the include and library search paths by editing"
+-        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
+-        exit 1
+-    fi
+-
+     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
+     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-core/qt-core-4.6.0.ebuild b/x11-libs/qt-core/qt-core-4.6.0.ebuild
index d3c7c628031b..1ca7628fc7b1 100644
--- a/x11-libs/qt-core/qt-core-4.6.0.ebuild
+++ b/x11-libs/qt-core/qt-core-4.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.0.ebuild,v 1.1 2009/12/01 14:45:44 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.0.ebuild,v 1.2 2009/12/03 17:22:07 wired Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -52,6 +52,10 @@ src/script
 tools/linguist/shared
 translations"
 
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.diff"
+)
+
 pkg_setup() {
 	qt4-build_pkg_setup
 
diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog
index 71a9e99fd6bc..c47ceba954df 100644
--- a/x11-libs/qt-dbus/ChangeLog
+++ b/x11-libs/qt-dbus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-dbus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.53 2009/12/01 18:13:33 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.54 2009/12/03 17:22:44 wired Exp $
+
+  03 Dec 2009; Alex Alexander <wired@gentoo.org>
+  +files/qt-4.6-nolibx11.diff, qt-dbus-4.6.0.ebuild:
+  added qt-4.6-nolibx11.diff patch
 
   01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   -qt-dbus-4.6.0_rc1.ebuild:
diff --git a/x11-libs/qt-dbus/files/qt-4.6-nolibx11.diff b/x11-libs/qt-dbus/files/qt-4.6-nolibx11.diff
new file mode 100644
index 000000000000..d3c1d1f75121
--- /dev/null
+++ b/x11-libs/qt-dbus/files/qt-4.6-nolibx11.diff
@@ -0,0 +1,18 @@
+--- configure.old	2009-12-03 18:52:58.061117684 +0200
++++ configure	2009-12-03 18:53:09.065116496 +0200
+@@ -5010,15 +5010,6 @@
+         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
+     fi
+ 
+-    # Check we actually have X11 :-)
+-    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
+-    if [ $? != "0" ]; then
+-        echo "Basic XLib functionality test failed!"
+-        echo " You might need to modify the include and library search paths by editing"
+-        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
+-        exit 1
+-    fi
+-
+     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
+     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-dbus/qt-dbus-4.6.0.ebuild b/x11-libs/qt-dbus/qt-dbus-4.6.0.ebuild
index b4e79c559870..c950f251e48d 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.6.0.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.6.0.ebuild,v 1.1 2009/12/01 14:48:57 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.6.0.ebuild,v 1.2 2009/12/03 17:22:44 wired Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -30,6 +30,10 @@ include/QtXml
 src/corelib
 src/xml"
 
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.diff"
+)
+
 src_configure() {
 	myconf="${myconf} -dbus-linked"
 	qt4-build_src_configure
diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog
index 53a5122ac334..85984a574efe 100644
--- a/x11-libs/qt-script/ChangeLog
+++ b/x11-libs/qt-script/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-script
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.56 2009/12/01 18:08:51 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.57 2009/12/03 17:23:22 wired Exp $
+
+  03 Dec 2009; Alex Alexander <wired@gentoo.org>
+  +files/qt-4.6-nolibx11.diff, qt-script-4.6.0.ebuild:
+  added qt-4.6-nolibx11.diff patch
 
   01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   -qt-script-4.6.0_rc1.ebuild:
diff --git a/x11-libs/qt-script/files/qt-4.6-nolibx11.diff b/x11-libs/qt-script/files/qt-4.6-nolibx11.diff
new file mode 100644
index 000000000000..d3c1d1f75121
--- /dev/null
+++ b/x11-libs/qt-script/files/qt-4.6-nolibx11.diff
@@ -0,0 +1,18 @@
+--- configure.old	2009-12-03 18:52:58.061117684 +0200
++++ configure	2009-12-03 18:53:09.065116496 +0200
+@@ -5010,15 +5010,6 @@
+         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
+     fi
+ 
+-    # Check we actually have X11 :-)
+-    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
+-    if [ $? != "0" ]; then
+-        echo "Basic XLib functionality test failed!"
+-        echo " You might need to modify the include and library search paths by editing"
+-        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
+-        exit 1
+-    fi
+-
+     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
+     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-script/qt-script-4.6.0.ebuild b/x11-libs/qt-script/qt-script-4.6.0.ebuild
index 70ac100a7693..7e35c3e46112 100644
--- a/x11-libs/qt-script/qt-script-4.6.0.ebuild
+++ b/x11-libs/qt-script/qt-script-4.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.6.0.ebuild,v 1.1 2009/12/01 14:58:10 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.6.0.ebuild,v 1.2 2009/12/03 17:23:22 wired Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -22,6 +22,10 @@ src/corelib/
 src/3rdparty/javascriptcore/
 "
 
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.diff"
+)
+
 src_configure() {
 	myconf="${myconf} $(qt_use iconv) -script -no-xkb  -no-fontconfig -no-xrender -no-xrandr
 		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index e77fd878b292..ac0e632a1f64 100644
--- a/x11-libs/qt-sql/ChangeLog
+++ b/x11-libs/qt-sql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-sql
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.65 2009/12/01 18:15:29 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.66 2009/12/03 17:23:59 wired Exp $
+
+  03 Dec 2009; Alex Alexander <wired@gentoo.org>
+  +files/qt-4.6-nolibx11.diff, qt-sql-4.6.0.ebuild:
+  added qt-4.6-nolibx11.diff patch
 
   01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   -qt-sql-4.6.0_rc1.ebuild:
diff --git a/x11-libs/qt-sql/files/qt-4.6-nolibx11.diff b/x11-libs/qt-sql/files/qt-4.6-nolibx11.diff
new file mode 100644
index 000000000000..d3c1d1f75121
--- /dev/null
+++ b/x11-libs/qt-sql/files/qt-4.6-nolibx11.diff
@@ -0,0 +1,18 @@
+--- configure.old	2009-12-03 18:52:58.061117684 +0200
++++ configure	2009-12-03 18:53:09.065116496 +0200
+@@ -5010,15 +5010,6 @@
+         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
+     fi
+ 
+-    # Check we actually have X11 :-)
+-    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
+-    if [ $? != "0" ]; then
+-        echo "Basic XLib functionality test failed!"
+-        echo " You might need to modify the include and library search paths by editing"
+-        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
+-        exit 1
+-    fi
+-
+     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
+     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-sql/qt-sql-4.6.0.ebuild b/x11-libs/qt-sql/qt-sql-4.6.0.ebuild
index a2574ab90715..b8c157d28887 100644
--- a/x11-libs/qt-sql/qt-sql-4.6.0.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.0.ebuild,v 1.1 2009/12/01 14:59:33 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.0.ebuild,v 1.2 2009/12/03 17:23:59 wired Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -31,6 +31,10 @@ src/sql
 src/3rdparty
 src/tools"
 
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.diff"
+)
+
 pkg_setup() {
 	if ! (use firebird || use mysql || use odbc || use postgres || use sqlite); then
 		ewarn "You need to enable at least one SQL driver. Enable at least"
diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog
index aa61cfae2809..d417da5b2db3 100644
--- a/x11-libs/qt-test/ChangeLog
+++ b/x11-libs/qt-test/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-test
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.54 2009/12/01 18:07:00 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.55 2009/12/03 17:24:38 wired Exp $
+
+  03 Dec 2009; Alex Alexander <wired@gentoo.org>
+  +files/qt-4.6-nolibx11.diff, qt-test-4.6.0.ebuild:
+  added qt-4.6-nolibx11.diff patch
 
   01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   -qt-test-4.6.0_rc1.ebuild:
diff --git a/x11-libs/qt-test/files/qt-4.6-nolibx11.diff b/x11-libs/qt-test/files/qt-4.6-nolibx11.diff
new file mode 100644
index 000000000000..d3c1d1f75121
--- /dev/null
+++ b/x11-libs/qt-test/files/qt-4.6-nolibx11.diff
@@ -0,0 +1,18 @@
+--- configure.old	2009-12-03 18:52:58.061117684 +0200
++++ configure	2009-12-03 18:53:09.065116496 +0200
+@@ -5010,15 +5010,6 @@
+         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
+     fi
+ 
+-    # Check we actually have X11 :-)
+-    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
+-    if [ $? != "0" ]; then
+-        echo "Basic XLib functionality test failed!"
+-        echo " You might need to modify the include and library search paths by editing"
+-        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
+-        exit 1
+-    fi
+-
+     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
+     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-test/qt-test-4.6.0.ebuild b/x11-libs/qt-test/qt-test-4.6.0.ebuild
index eaf10c2e06b7..a226dbb579f1 100644
--- a/x11-libs/qt-test/qt-test-4.6.0.ebuild
+++ b/x11-libs/qt-test/qt-test-4.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.6.0.ebuild,v 1.1 2009/12/01 15:01:57 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.6.0.ebuild,v 1.2 2009/12/03 17:24:38 wired Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -19,6 +19,10 @@ include/QtTest/
 include/QtCore/
 src/corelib/"
 
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.diff"
+)
+
 src_configure() {
 	myconf="${myconf} $(qt_use iconv) -no-xkb  -no-fontconfig -no-xrender -no-xrandr
 		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog
index 225756a6f264..f115b2b25a71 100644
--- a/x11-libs/qt-xmlpatterns/ChangeLog
+++ b/x11-libs/qt-xmlpatterns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-xmlpatterns
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.53 2009/12/01 18:09:49 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.54 2009/12/03 17:25:18 wired Exp $
+
+  03 Dec 2009; Alex Alexander <wired@gentoo.org>
+  +files/qt-4.6-nolibx11.diff, qt-xmlpatterns-4.6.0.ebuild:
+  added qt-4.6-nolibx11.diff patch
 
   01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   -qt-xmlpatterns-4.6.0_rc1.ebuild:
diff --git a/x11-libs/qt-xmlpatterns/files/qt-4.6-nolibx11.diff b/x11-libs/qt-xmlpatterns/files/qt-4.6-nolibx11.diff
new file mode 100644
index 000000000000..d3c1d1f75121
--- /dev/null
+++ b/x11-libs/qt-xmlpatterns/files/qt-4.6-nolibx11.diff
@@ -0,0 +1,18 @@
+--- configure.old	2009-12-03 18:52:58.061117684 +0200
++++ configure	2009-12-03 18:53:09.065116496 +0200
+@@ -5010,15 +5010,6 @@
+         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
+     fi
+ 
+-    # Check we actually have X11 :-)
+-    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
+-    if [ $? != "0" ]; then
+-        echo "Basic XLib functionality test failed!"
+-        echo " You might need to modify the include and library search paths by editing"
+-        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
+-        exit 1
+-    fi
+-
+     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
+     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
+         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0.ebuild
index dfa6c7a8ccc7..9bbbe84461f8 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0.ebuild,v 1.1 2009/12/01 15:03:59 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0.ebuild,v 1.2 2009/12/03 17:25:18 wired Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -26,6 +26,10 @@ src/corelib/"
 QCONFIG_ADD="xmlpatterns"
 QCONFIG_DEFINE="QT_XMLPATTERNS"
 
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.diff"
+)
+
 src_configure() {
 	myconf="${myconf} -xmlpatterns"
 	qt4-build_src_configure