Remove X11R6 from include dirs and libdirs in mkspecs (bug #305001)

(Portage version: 2.2_rc62/cvs/Linux x86_64)

4 files changed, 165 insertions, 3 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 6d0f7f5d6f78..e381e42dbafc 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.91 2010/02/18 00:07:18 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.92 2010/02/20 09:55:06 ayoy Exp $
+
+*qt-core-4.6.2-r1 (20 Feb 2010)
+*qt-core-4.6.1-r1 (20 Feb 2010)
+
+  20 Feb 2010; Dominik Kapusta <ayoy@gentoo.org>
+  +files/qt-4.6-nox11r6.patch, -qt-core-4.6.1.ebuild,
+  +qt-core-4.6.1-r1.ebuild, -qt-core-4.6.2.ebuild, +qt-core-4.6.2-r1.ebuild:
+  Remove X11R6 from include dirs and libdirs in mkspecs (bug #305001)
 
   18 Feb 2010; Alex Alexander <wired@gentoo.org> metadata.xml:
   added exceptions USE flag description
diff --git a/x11-libs/qt-core/files/qt-4.6-nox11r6.patch b/x11-libs/qt-core/files/qt-4.6-nox11r6.patch
new file mode 100644
index 000000000000..ec5ef92fa441
--- /dev/null
+++ b/x11-libs/qt-core/files/qt-4.6-nox11r6.patch
@@ -0,0 +1,152 @@
+diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
+index 1ae5608..9c603a6 100644
+--- a/mkspecs/common/linux.conf
++++ b/mkspecs/common/linux.conf
+@@ -7,12 +7,12 @@ QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+ 
+ QMAKE_INCDIR          =
+ QMAKE_LIBDIR          =
+-QMAKE_INCDIR_X11      = /usr/X11R6/include
+-QMAKE_LIBDIR_X11      = /usr/X11R6/lib
++QMAKE_INCDIR_X11      = /usr/include
++QMAKE_LIBDIR_X11      = /usr/lib
+ QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
+ QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
++QMAKE_INCDIR_OPENGL   = /usr/include
++QMAKE_LIBDIR_OPENGL   = /usr/lib
+ QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
+ QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
+ QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL
+diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
+index 633b738..a37c05b 100644
+--- a/mkspecs/linux-cxx/qmake.conf
++++ b/mkspecs/linux-cxx/qmake.conf
+@@ -37,12 +37,12 @@ QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+ 
+ QMAKE_INCDIR		=
+ QMAKE_LIBDIR		=
+-QMAKE_INCDIR_X11	= /usr/X11R6/include
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
++QMAKE_INCDIR_X11	= /usr/include
++QMAKE_LIBDIR_X11	= /usr/lib
+ QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+ QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
++QMAKE_INCDIR_OPENGL	= /usr/include
++QMAKE_LIBDIR_OPENGL	= /usr/lib
+ 
+ QMAKE_LINK		= cxx
+ QMAKE_LINK_SHLIB	= cxx
+diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
+index 359d44b..2d3f9a5 100644
+--- a/mkspecs/linux-ecc-64/qmake.conf
++++ b/mkspecs/linux-ecc-64/qmake.conf
+@@ -39,12 +39,12 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+ 
+ QMAKE_INCDIR		=
+ QMAKE_LIBDIR		=
+-QMAKE_INCDIR_X11	= /usr/X11R6/include
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
++QMAKE_INCDIR_X11	= /usr/include
++QMAKE_LIBDIR_X11	= /usr/lib
+ QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+ QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
++QMAKE_INCDIR_OPENGL	= /usr/include
++QMAKE_LIBDIR_OPENGL	= /usr/lib
+ 
+ QMAKE_LINK		= ecpc
+ QMAKE_LINK_SHLIB	= ecpc
+diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
+index 4f8794f..cf7be62 100644
+--- a/mkspecs/linux-g++-64/qmake.conf
++++ b/mkspecs/linux-g++-64/qmake.conf
+@@ -17,7 +17,7 @@ QMAKE_LFLAGS		= -m64
+ include(../common/g++.conf)
+ include(../common/linux.conf)
+ 
+-QMAKE_LIBDIR_X11      = /usr/X11R6/lib64
+-QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib64
++QMAKE_LIBDIR_X11      = /usr/lib64
++QMAKE_LIBDIR_OPENGL   = /usr/lib64
+ 
+ load(qt_config)
+diff --git a/mkspecs/linux-icc-64/qmake.conf b/mkspecs/linux-icc-64/qmake.conf
+index 7962026..9b4bade 100644
+--- a/mkspecs/linux-icc-64/qmake.conf
++++ b/mkspecs/linux-icc-64/qmake.conf
+@@ -12,5 +12,5 @@ include(../linux-icc/qmake.conf)
+ 
+ # Change the all LIBDIR variables to use lib64 instead of lib
+ 
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib64
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib64
++QMAKE_LIBDIR_X11	= /usr/lib64
++QMAKE_LIBDIR_OPENGL	= /usr/lib64
+diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
+index 965de0c..b778a89 100644
+--- a/mkspecs/linux-icc/qmake.conf
++++ b/mkspecs/linux-icc/qmake.conf
+@@ -45,12 +45,12 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+ 
+ QMAKE_INCDIR		=
+ QMAKE_LIBDIR		=
+-QMAKE_INCDIR_X11	= /usr/X11R6/include
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
++QMAKE_INCDIR_X11	= /usr/include
++QMAKE_LIBDIR_X11	= /usr/lib
+ QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+ QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
++QMAKE_INCDIR_OPENGL	= /usr/include
++QMAKE_LIBDIR_OPENGL	= /usr/lib
+ 
+ QMAKE_LINK		= icpc
+ QMAKE_LINK_SHLIB	= icpc
+diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
+index 009c486..0e3d301 100644
+--- a/mkspecs/linux-kcc/qmake.conf
++++ b/mkspecs/linux-kcc/qmake.conf
+@@ -48,12 +48,12 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+ 
+ QMAKE_INCDIR		=
+ QMAKE_LIBDIR		=
+-QMAKE_INCDIR_X11	= /usr/X11R6/include
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
++QMAKE_INCDIR_X11	= /usr/include
++QMAKE_LIBDIR_X11	= /usr/lib
+ QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+ QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
++QMAKE_INCDIR_OPENGL	= /usr/include
++QMAKE_LIBDIR_OPENGL	= /usr/lib
+ 
+ QMAKE_LINK		= KCC
+ QMAKE_LINK_SHLIB	= KCC
+diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
+index 756f1af..2c40635 100644
+--- a/mkspecs/linux-pgcc/qmake.conf
++++ b/mkspecs/linux-pgcc/qmake.conf
+@@ -39,12 +39,12 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+ 
+ QMAKE_INCDIR		=
+ QMAKE_LIBDIR		=
+-QMAKE_INCDIR_X11	= /usr/X11R6/include
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
++QMAKE_INCDIR_X11	= /usr/include
++QMAKE_LIBDIR_X11	= /usr/lib
+ QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+ QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
++QMAKE_INCDIR_OPENGL	= /usr/include
++QMAKE_LIBDIR_OPENGL	= /usr/lib
+ 
+ QMAKE_LINK		= pgCC
+ QMAKE_LINK_SHLIB	= pgCC
diff --git a/x11-libs/qt-core/qt-core-4.6.1.ebuild b/x11-libs/qt-core/qt-core-4.6.1-r1.ebuild
index b5f710e9c87d..52ec6601cf94 100644
--- a/x11-libs/qt-core/qt-core-4.6.1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.6.1-r1.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-core/qt-core-4.6.1.ebuild,v 1.5 2010/02/15 15:08:44 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.1-r1.ebuild,v 1.1 2010/02/20 09:55:06 ayoy Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -20,6 +20,7 @@ PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )"
 
 PATCHES=(
 	"${FILESDIR}/qt-4.6-nolibx11.patch"
+	"${FILESDIR}/qt-4.6-nox11r6.patch"
 )
 
 pkg_setup() {
diff --git a/x11-libs/qt-core/qt-core-4.6.2.ebuild b/x11-libs/qt-core/qt-core-4.6.2-r1.ebuild
index 0e7ff4b02516..cfd12856d840 100644
--- a/x11-libs/qt-core/qt-core-4.6.2.ebuild
+++ b/x11-libs/qt-core/qt-core-4.6.2-r1.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-core/qt-core-4.6.2.ebuild,v 1.1 2010/02/15 15:08:44 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.2-r1.ebuild,v 1.1 2010/02/20 09:55:06 ayoy Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -20,6 +20,7 @@ PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )"
 
 PATCHES=(
 	"${FILESDIR}/qt-4.6-nolibx11.patch"
+	"${FILESDIR}/qt-4.6-nox11r6.patch"
 )
 
 pkg_setup() {