Remake nolibx11 patch for 4.6.1.

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

15 files changed, 125 insertions, 15 deletions

diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog
index 85fb3de19211..dbf08544f4fe 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.57 2010/01/19 14:48:38 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.58 2010/01/20 12:30:20 spatz Exp $
+
+  20 Jan 2010; Dror Levin <spatz@gentoo.org> qt-dbus-4.6.1.ebuild,
+  +files/qt-4.6.1-nolibx11.patch:
+  Remake nolibx11 patch for 4.6.1.
 
 *qt-dbus-4.6.1 (19 Jan 2010)
 
diff --git a/x11-libs/qt-dbus/files/qt-4.6.1-nolibx11.patch b/x11-libs/qt-dbus/files/qt-4.6.1-nolibx11.patch
new file mode 100644
index 000000000000..e5d13327b8ce
--- /dev/null
+++ b/x11-libs/qt-dbus/files/qt-4.6.1-nolibx11.patch
@@ -0,0 +1,18 @@
+--- configure-orig	2010-01-20 14:18:32.466798257 +0200
++++ configure	2010-01-20 14:18:58.516799116 +0200
+@@ -5059,15 +5059,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.1.ebuild b/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild
index de3107d3ce06..fe8557450555 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.1.ebuild,v 1.1 2010/01/19 14:48:39 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild,v 1.2 2010/01/20 12:30:20 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -31,7 +31,7 @@ src/corelib
 src/xml"
 
 PATCHES=(
-	"${FILESDIR}/qt-4.6-nolibx11.diff"
+	"${FILESDIR}/qt-${PV}-nolibx11.patch"
 )
 
 src_configure() {
diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog
index 7294ecc5027d..730b38a244e7 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.59 2010/01/19 14:55:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.60 2010/01/20 12:34:37 spatz Exp $
+
+  20 Jan 2010; Dror Levin <spatz@gentoo.org> qt-script-4.6.1.ebuild,
+  +files/qt-4.6.1-nolibx11.patch:
+  Remake nolibx11 patch for 4.6.1.
 
 *qt-script-4.6.1 (19 Jan 2010)
 
diff --git a/x11-libs/qt-script/files/qt-4.6.1-nolibx11.patch b/x11-libs/qt-script/files/qt-4.6.1-nolibx11.patch
new file mode 100644
index 000000000000..e5d13327b8ce
--- /dev/null
+++ b/x11-libs/qt-script/files/qt-4.6.1-nolibx11.patch
@@ -0,0 +1,18 @@
+--- configure-orig	2010-01-20 14:18:32.466798257 +0200
++++ configure	2010-01-20 14:18:58.516799116 +0200
+@@ -5059,15 +5059,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.1.ebuild b/x11-libs/qt-script/qt-script-4.6.1.ebuild
index ce7bc453f7da..9e19c114875e 100644
--- a/x11-libs/qt-script/qt-script-4.6.1.ebuild
+++ b/x11-libs/qt-script/qt-script-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.1.ebuild,v 1.1 2010/01/19 14:55:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.6.1.ebuild,v 1.2 2010/01/20 12:34:37 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -23,7 +23,7 @@ src/3rdparty/javascriptcore/
 "
 
 PATCHES=(
-	"${FILESDIR}/qt-4.6-nolibx11.diff"
+	"${FILESDIR}/qt-${PV}-nolibx11.patch"
 )
 
 src_configure() {
diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index 1b0f90a8eae1..f33f705e6f3c 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.69 2010/01/19 14:56:46 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.70 2010/01/20 12:32:37 spatz Exp $
+
+  20 Jan 2010; Dror Levin <spatz@gentoo.org> qt-sql-4.6.1.ebuild,
+  +files/qt-4.6.1-nolibx11.patch:
+  Remake nolibx11 patch for 4.6.1.
 
 *qt-sql-4.6.1 (19 Jan 2010)
 
diff --git a/x11-libs/qt-sql/files/qt-4.6.1-nolibx11.patch b/x11-libs/qt-sql/files/qt-4.6.1-nolibx11.patch
new file mode 100644
index 000000000000..e5d13327b8ce
--- /dev/null
+++ b/x11-libs/qt-sql/files/qt-4.6.1-nolibx11.patch
@@ -0,0 +1,18 @@
+--- configure-orig	2010-01-20 14:18:32.466798257 +0200
++++ configure	2010-01-20 14:18:58.516799116 +0200
+@@ -5059,15 +5059,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.1.ebuild b/x11-libs/qt-sql/qt-sql-4.6.1.ebuild
index c2893eede2db..efaf6cae0584 100644
--- a/x11-libs/qt-sql/qt-sql-4.6.1.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.1.ebuild,v 1.1 2010/01/19 14:56:46 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.1.ebuild,v 1.2 2010/01/20 12:32:37 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -32,7 +32,7 @@ src/3rdparty
 src/tools"
 
 PATCHES=(
-	"${FILESDIR}/qt-4.6-nolibx11.diff"
+	"${FILESDIR}/qt-${PV}-nolibx11.patch"
 )
 
 pkg_setup() {
diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog
index 718e875b9bfd..9bb1d2f5cfa5 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.57 2010/01/19 14:58:23 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.58 2010/01/20 12:36:38 spatz Exp $
+
+  20 Jan 2010; Dror Levin <spatz@gentoo.org> qt-test-4.6.1.ebuild,
+  +files/qt-4.6.1-nolibx11.patch:
+  Remake nolibx11 patch for 4.6.1.
 
 *qt-test-4.6.1 (19 Jan 2010)
 
diff --git a/x11-libs/qt-test/files/qt-4.6.1-nolibx11.patch b/x11-libs/qt-test/files/qt-4.6.1-nolibx11.patch
new file mode 100644
index 000000000000..e5d13327b8ce
--- /dev/null
+++ b/x11-libs/qt-test/files/qt-4.6.1-nolibx11.patch
@@ -0,0 +1,18 @@
+--- configure-orig	2010-01-20 14:18:32.466798257 +0200
++++ configure	2010-01-20 14:18:58.516799116 +0200
+@@ -5059,15 +5059,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.1.ebuild b/x11-libs/qt-test/qt-test-4.6.1.ebuild
index 0fc10bb06c9b..4ee0abfedc7e 100644
--- a/x11-libs/qt-test/qt-test-4.6.1.ebuild
+++ b/x11-libs/qt-test/qt-test-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.1.ebuild,v 1.1 2010/01/19 14:58:23 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.6.1.ebuild,v 1.2 2010/01/20 12:36:38 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -20,7 +20,7 @@ include/QtCore/
 src/corelib/"
 
 PATCHES=(
-	"${FILESDIR}/qt-4.6-nolibx11.diff"
+	"${FILESDIR}/qt-${PV}-nolibx11.patch"
 )
 
 src_configure() {
diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog
index 82a8c0669c53..439a5385cdcc 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.57 2010/01/19 15:01:05 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.58 2010/01/20 12:38:09 spatz Exp $
+
+  20 Jan 2010; Dror Levin <spatz@gentoo.org> qt-xmlpatterns-4.6.1.ebuild,
+  +files/qt-4.6.1-nolibx11.patch:
+  Remake nolibx11 patch for 4.6.1.
 
 *qt-xmlpatterns-4.6.1 (19 Jan 2010)
 
diff --git a/x11-libs/qt-xmlpatterns/files/qt-4.6.1-nolibx11.patch b/x11-libs/qt-xmlpatterns/files/qt-4.6.1-nolibx11.patch
new file mode 100644
index 000000000000..e5d13327b8ce
--- /dev/null
+++ b/x11-libs/qt-xmlpatterns/files/qt-4.6.1-nolibx11.patch
@@ -0,0 +1,18 @@
+--- configure-orig	2010-01-20 14:18:32.466798257 +0200
++++ configure	2010-01-20 14:18:58.516799116 +0200
+@@ -5059,15 +5059,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.1.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.1.ebuild
index 72e376d89524..d91344201336 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.1.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.1.ebuild,v 1.1 2010/01/19 15:01:05 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.1.ebuild,v 1.2 2010/01/20 12:38:09 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -27,7 +27,7 @@ QCONFIG_ADD="xmlpatterns"
 QCONFIG_DEFINE="QT_XMLPATTERNS"
 
 PATCHES=(
-	"${FILESDIR}/qt-4.6-nolibx11.diff"
+	"${FILESDIR}/qt-${PV}-nolibx11.patch"
 )
 
 src_configure() {