Add a sed statement to make Qt use /usr/XXX instead of /usr/X11R6/XXX

(Portage version: 2.0.53)

3 files changed, 26 insertions, 20 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 4179da115238..8f9d61104cde 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.266 2005/12/04 03:56:28 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.267 2005/12/08 19:46:16 caleb Exp $
+
+  08 Dec 2005; Caleb Tennis <caleb@gentoo.org> qt-4.1.0_rc1.ebuild:
+  Add a sed statement to make Qt use /usr/XXX instead of /usr/X11R6/XXX
 
   04 Dec 2005; Mamoru KOMACHI <usata@gentoo.org> qt-3.3.5.ebuild:
   Updated immodule patch. This closes bug #106386.
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 62b368967c45..1f25daa3908a 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,25 +1,25 @@
 MD5 df381ff8c4df4a1380080d2853d24b44 ChangeLog 3192
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 72c3db1196133df4d2699bf677da8923 qt-4.1.0_rc1.ebuild 5779
-MD5 aeb3cd64b68372f53b26d25f88d6fb6f qt-4.0.1.ebuild 5724
-MD5 c2589d23d5f129c79f4c9e603ab09fb9 qt-3.3.4-r8.ebuild 10045
-MD5 444d3e2808bd881191e77cadd7c646aa qt-3.3.5.ebuild 9960
+MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
+MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
+MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
+MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r8 166
+MD5 7c3ccffe55767c77fab3a32c5bb296ac files/digest-qt-3.3.5 166
+MD5 ee2de925bc2929fe4404483c0eca556b files/digest-qt-4.0.1 81
 MD5 80e462c816f7784088a6395aedcf6de9 files/digest-qt-4.1.0_rc1 85
-MD5 dda33293dab89d46ad43994002aae1da files/qt-3.3.5-macos.patch 18154
-MD5 f23686dab01383c584bb16c69e36b68e files/qt-3.3.4-gcc4-volatile.patch 2480
 MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
 MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
-MD5 ee2de925bc2929fe4404483c0eca556b files/digest-qt-4.0.1 81
-MD5 0495f1d3f467a2972feccba453135258 files/qt-4.1.0-configure-no-mysql.diff 11142
+MD5 f23686dab01383c584bb16c69e36b68e files/qt-3.3.4-gcc4-volatile.patch 2480
 MD5 33975d39870dca02e85664411a93eae1 files/qt-3.3.4-gcc4.patch 1002
-MD5 7e6cdd22e2c697769754db9d6b3ae963 files/qt-3.3.4-macos.patch 18798
-MD5 7c3ccffe55767c77fab3a32c5bb296ac files/digest-qt-3.3.5 166
 MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
-MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r8 166
+MD5 7e6cdd22e2c697769754db9d6b3ae963 files/qt-3.3.4-macos.patch 18798
+MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
+MD5 dda33293dab89d46ad43994002aae1da files/qt-3.3.5-macos.patch 18154
 MD5 08ed7e5a6f33e7f88c7e86f13898fca2 files/qt-3.3.5-uic-fix.patch 711
+MD5 0495f1d3f467a2972feccba453135258 files/qt-4.1.0-configure-no-mysql.diff 11142
 MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
-MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
-MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
-MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
-MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 c2589d23d5f129c79f4c9e603ab09fb9 qt-3.3.4-r8.ebuild 10045
+MD5 444d3e2808bd881191e77cadd7c646aa qt-3.3.5.ebuild 9960
+MD5 aeb3cd64b68372f53b26d25f88d6fb6f qt-4.0.1.ebuild 5724
+MD5 dc84597d1e86c2760a53b15ff26d40ab qt-4.1.0_rc1.ebuild 5876
diff --git a/x11-libs/qt/qt-4.1.0_rc1.ebuild b/x11-libs/qt/qt-4.1.0_rc1.ebuild
index f9874724b401..2d50907eb97c 100644
--- a/x11-libs/qt/qt-4.1.0_rc1.ebuild
+++ b/x11-libs/qt/qt-4.1.0_rc1.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/x11-libs/qt/qt-4.1.0_rc1.ebuild,v 1.2 2005/11/28 15:25:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.0_rc1.ebuild,v 1.3 2005/12/08 19:46:16 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -86,8 +86,11 @@ src_unpack() {
 	# Do not link with -rpath. See bug #75181.
 	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" \
 		qmake.conf
-	cd ${S}
 
+	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
+	sed -i -e "s:X11R6/::" qmake.conf
+
+	cd ${S}
 	epatch ${FILESDIR}/qt4-nomkdir.patch
 	epatch ${FILESDIR}/qt-4.1.0-configure-no-mysql.diff