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

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

5 files changed, 179 insertions, 6 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/Manifest b/x11-libs/qt-core/Manifest
index c0c12ff45cf6..320ebefdbb9a 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,14 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX moc.pro 2769 RMD160 42bd282eb8e24cf291a512766270e7afed6e56be SHA1 941513c6c83813992bb91f4584d3e015295baa07 SHA256 e0898c630e079db9693fe494bf37f6b395c291373ed7edbd0827ed7d1e085a2e
 AUX qt-4.5-nolibx11.diff 1167 RMD160 da983a70bd436d35e325203dfe9390b2aee925ae SHA1 ee916596e422e91179458778b013fb103dc97cac SHA256 c6c686c1cfc07caefafe697eb8b02b6806f3845f20d3fd3839301d8a94259b0b
 AUX qt-4.5.3-glib-event-loop.patch 770 RMD160 0b854962f1b46958e8b969f949fe5e0d6e66b5ff SHA1 26543a05f894678fd1357d7b0fca217dac6b1a0c SHA256 83f010690d3a7220f5bd559b2aa82d9135d31a2c04bf9d6b12ed78a2dd3da6bb
 AUX qt-4.6-nolibx11.patch 1037 RMD160 a32338fa24ca2f99b0f3b679b1fabb88ac9b0ec1 SHA1 b7b2a430147a746a6a52f05a495be6262f2925ef SHA256 2b1d4e7df4918cafa50476e911f4c8e3e79e09fa702d756236ad2308e1c9bc69
+AUX qt-4.6-nox11r6.patch 5191 RMD160 60bac3e843addd91427ada9e4e4d7a94dc8f0430 SHA1 7534d6838426b86101ac8fc5ced829c5d5035a04 SHA256 b6db19c5b1de5e86628d37ca467f293b3ab3cf48272df93dae7ad5755ffa79cd
 AUX rcc.pro 3440 RMD160 42e65efa8dc027f8a2b6c933243a91c1cac96092 SHA1 017ea0aea74a27012608f8be8f301d3cda3dd2b7 SHA256 b09c74046a97ec87b19a05abfe08d959040b737430e498269fb0d0c00bf0a38d
 AUX uic.pro 3671 RMD160 b6d3c392a67b66f6996134975e99db03a9987baf SHA1 f87fff37256b5c966e4d21b0fb6cb64b717f3d07 SHA256 904084b6d936fb9bab33d3592ec69dc9872708a74834f0cb498e8153f784c7fc
 DIST qt-everywhere-opensource-src-4.6.1.tar.gz 160197277 RMD160 7365dfe3c688df36002d2c9aaef6b79ba8175402 SHA1 d3b44ae6d9bc9c44fc57f32e545b92daf0b54775 SHA256 4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5
 DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba274c4150b02162bba40b65a872 SHA1 977c10b88a2230e96868edc78a9e3789c0fcbf70 SHA256 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
 DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 SHA1 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 SHA256 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6
 EBUILD qt-core-4.5.3-r2.ebuild 6335 RMD160 01bd4db0a278e5d4c24d9cecf0f5f426ff2167d2 SHA1 ff1a6e61074859165f33153097c3c133fd1caec3 SHA256 bbe3fd373407e0616bc960f6ea277b044c1a0785a7401d7973292aa8b39ad4e4
-EBUILD qt-core-4.6.1.ebuild 4976 RMD160 1d56986d511b9acf19e8e478f321d21ecf5ff0bb SHA1 eda7b27bc005b639fd36d56ffe580be506a89b81 SHA256 77eedfa6bd863a7eb4d292cb3ca9023945134128f005af6db3c96154b1921786
-EBUILD qt-core-4.6.2.ebuild 4976 RMD160 51315587d28cfda99af65d8eec54a6c8cab06a30 SHA1 46f03f804bb2ae610284c1c78f512e3f6a2bcb21 SHA256 3a6c87581eb920c0cff6f41d275f0f3e7822eb5de2a438d9be4ca9cc202c1dd3
-MISC ChangeLog 12481 RMD160 50d9eb433cfcb95cd494f7e0a228d76809e3dfb7 SHA1 fb3186e31b97af586a0efcd56d57e92a1758e00f SHA256 d2ab91dd829fdfc65e9ca1b7969f92d3476da50d66b30499a279997dcbeca0f7
+EBUILD qt-core-4.6.1-r1.ebuild 5014 RMD160 18d44d7063a1bef8081b1258e6ed992d4a384b94 SHA1 d12c4d30768fac2a51fb798f0836708350373d89 SHA256 95379ddfb20ad1aacae4af0fa049904d8ba6129a861528c56980fad3007990c5
+EBUILD qt-core-4.6.2-r1.ebuild 5014 RMD160 bc829d92ddc49335508bd8c7d867b68ecc7f6fcb SHA1 4829e3671ea37a2e90916e603b350733fd24b498 SHA256 6bf9a59d614131e975d238477cefe8aea80d6bd2f3a2144730b6549365ddf2cb
+MISC ChangeLog 12796 RMD160 41d36ad9276acb0ca0a93e2f86729661c3cf9021 SHA1 d13011cdc27d07fbefe0ec7854f8c573494caf84 SHA256 5c6114f8c9b86abb2117cdf03551a1ed403acbdfa4043449a758ed7329ffd9a0
 MISC metadata.xml 592 RMD160 1abeb1c56686d23b3f6935303aa40efe6946dd61 SHA1 ed92160594449e2607addd6f90e33d98cb1ce11e SHA256 6ce0551ba99f011c46552a13f145fc0176c45ca39dc4053650745a519e36e145
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt/sYYACgkQ+CZEqwt+F6ZV4wCgh7Dbgzq6UWFxW3WqTqcJEqFC
+4ekAnRIGpNO+2BTYkppjyZ+wSRG8hTWk
+=rRlx
+-----END PGP SIGNATURE-----
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() {