summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDror Levin <spatz@gentoo.org>2009-11-20 00:00:35 +0000
committerDror Levin <spatz@gentoo.org>2009-11-20 00:00:35 +0000
commit37cac869653e464a5fe0002fab485671d0d035c7 (patch)
tree63613ac7fc86cf9d15c79b1bed2b5be0bf3e6d6e /x11-libs
parentRemove KDE 3.5.10. (diff)
downloadgentoo-2-37cac869653e464a5fe0002fab485671d0d035c7.tar.gz
gentoo-2-37cac869653e464a5fe0002fab485671d0d035c7.tar.bz2
gentoo-2-37cac869653e464a5fe0002fab485671d0d035c7.zip
Revert /etc/env.d/44qt4 removal, seems like it's still needed.
(Portage version: 2.2_rc50/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt-core/ChangeLog5
-rw-r--r--x11-libs/qt-core/qt-core-4.6.0_rc1.ebuild7
2 files changed, 10 insertions, 2 deletions
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 54c440cf091d..fd2fec45eeae 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-core
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.77 2009/11/18 21:45:50 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.78 2009/11/20 00:00:35 spatz Exp $
+
+ 20 Nov 2009; Dror Levin <spatz@gentoo.org> qt-core-4.6.0_rc1.ebuild:
+ Revert /etc/env.d/44qt4 removal, seems like it's still needed.
18 Nov 2009; Dror Levin <spatz@gentoo.org> qt-core-4.6.0_rc1.ebuild:
Don't install /etc/env.d/44qt4 anymore.
diff --git a/x11-libs/qt-core/qt-core-4.6.0_rc1.ebuild b/x11-libs/qt-core/qt-core-4.6.0_rc1.ebuild
index 9ef571238d2d..817aab6d5f36 100644
--- a/x11-libs/qt-core/qt-core-4.6.0_rc1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.6.0_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.0_rc1.ebuild,v 1.2 2009/11/18 21:45:50 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.0_rc1.ebuild,v 1.3 2009/11/20 00:00:35 spatz Exp $
EAPI="2"
inherit qt4-build
@@ -180,6 +180,11 @@ src_install() {
libdirs="${libdirs}:/usr/${libdir}/qt4"
done
+ cat <<-EOF > "${T}/44qt4"
+ LDPATH=${libdirs:1}
+ EOF
+ doenvd "${T}/44qt4"
+
dodir /${QTDATADIR}/mkspecs/gentoo
mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
|| die "Failed to move qconfig.pri"