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
commitbacfaaaf86b9d9bab070b025789eb2917633faeb (patch)
treedb3ee61d7e2bb37fdc6c08aabb06acb629e089d9
parentbuild the jar again when use=doc, fixes #94189 (diff)
downloadhistorical-bacfaaaf86b9d9bab070b025789eb2917633faeb.tar.gz
historical-bacfaaaf86b9d9bab070b025789eb2917633faeb.tar.bz2
historical-bacfaaaf86b9d9bab070b025789eb2917633faeb.zip
Improved rpath fixes to work on every platform.
Package-Manager: portage-2.0.51.22-r1
-rw-r--r--x11-libs/qt/ChangeLog5
-rw-r--r--x11-libs/qt/Manifest10
-rw-r--r--x11-libs/qt/qt-3.3.4-r4.ebuild6
3 files changed, 12 insertions, 9 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/Manifest b/x11-libs/qt/Manifest
index bcd05565936d..43892939171f 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 87d9a4bebb6e1c6f0f8051ddc7a69d60 ChangeLog 36616
+MD5 7f6857e1b203fd8c7db8f9644d01e96e ChangeLog 36740
MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
MD5 7daec76f47482903184ed2b6d6d5640f qt-3.3.3-r1.ebuild 8039
MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
@@ -11,7 +11,7 @@ MD5 08029b610ff355dafc7618ea1abaec61 qt-4.0.0_beta2-r1.ebuild 5985
MD5 f95213fd78b54c46551f61351142beb7 qt-4.0.0_beta2.ebuild 5982
MD5 417ad387ed16d015fdc15dd25deca382 qt-4.0.0_beta2-r2.ebuild 6098
MD5 173ea867f6e159b522b70af80f2e911c qt-3.3.4-r3.ebuild 8773
-MD5 df40e64163a7743056961190d2b0ebf1 qt-3.3.4-r4.ebuild 9473
+MD5 56cc8056dc7046e0ceefbe2564fa27b0 qt-3.3.4-r4.ebuild 9484
MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
@@ -55,7 +55,7 @@ MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r4 166
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFClzTXj5H05b2HAEkRAswNAJsFnNvdneM4RbeyutqoQ+rmdKlmMACdHwlE
-Q40nvnkhAnssEVN3n+x4f+o=
-=zWVP
+iD8DBQFCl0AAj5H05b2HAEkRAhoBAJ9Owx2E5ly+YgQgpHcGHJ9eobmojwCeKY3/
+a4crg+Ttk34ltL9njtTFsdk=
+=IL6e
-----END PGP SIGNATURE-----
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