summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-05-27 15:46:55 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-05-27 15:46:55 +0000
commitbec8bbc4df8e913f244d9a7ac33fe35bc26e7141 (patch)
tree1fae4e0183812a16c453751206f27abad2ef5c66 /x11-libs
parentbuild the jar again when use=doc, fixes #94189 (diff)
downloadgentoo-2-bec8bbc4df8e913f244d9a7ac33fe35bc26e7141.tar.gz
gentoo-2-bec8bbc4df8e913f244d9a7ac33fe35bc26e7141.tar.bz2
gentoo-2-bec8bbc4df8e913f244d9a7ac33fe35bc26e7141.zip
Improved rpath fixes to work on every platform.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt/ChangeLog5
-rw-r--r--x11-libs/qt/qt-3.3.4-r4.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 9b010c81b3e3..5c44e14688df 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.219 2005/05/27 14:59:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.220 2005/05/27 15:46:55 flameeyes Exp $
+
+ 27 May 2005; Diego Pettenò <flameeyes@gentoo.org> qt-3.3.4-r4.ebuild:
+ Improved rpath fixes to work on every platform.
27 May 2005; Diego Pettenò <flameeyes@gentoo.org> qt-3.3.4-r4.ebuild:
Added patch to allow compilation of qt on non-linux systems (specifically
diff --git a/x11-libs/qt/qt-3.3.4-r4.ebuild b/x11-libs/qt/qt-3.3.4-r4.ebuild
index 73b791f48989..0c878ef3c5c4 100644
--- a/x11-libs/qt/qt-3.3.4-r4.ebuild
+++ b/x11-libs/qt/qt-3.3.4-r4.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-3.3.4-r4.ebuild,v 1.2 2005/05/27 14:59:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r4.ebuild,v 1.3 2005/05/27 15:46:55 flameeyes Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -82,8 +82,8 @@ src_unpack() {
sed -i -e 's:read acceptance:acceptance=yes:' configure
- epatch ${FILESDIR}/qt-no-rpath-uic.patch
- epatch ${FILESDIR}/qt-no-rpath.patch
+ find ${S}/mkspecs -name qmake.conf | xargs \
+ sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
# fix freeze caused by bad interaction with kde klipper (kde bug 80072)
epatch ${FILESDIR}/${P}-qclipboard-hack.patch