diff options
| author |   Dror Levin <spatz@gentoo.org> | 2009-11-20 00:00:35 +0000 |
|---|---|---|
| committer | Dror Levin <spatz@gentoo.org> | 2009-11-20 00:00:35 +0000 |
| commit | 4c07647f2e13db29119c3ddfecf99e52334be4c6 (patch) | |
| tree | 5449d27abe0a21d71beb156f95d137b2872fcf30 /x11-libs | |
| parent | Remove KDE 3.5.10. (diff) | |
| download | historical-4c07647f2e13db29119c3ddfecf99e52334be4c6.tar.gz historical-4c07647f2e13db29119c3ddfecf99e52334be4c6.tar.bz2 historical-4c07647f2e13db29119c3ddfecf99e52334be4c6.zip | |
Revert /etc/env.d/44qt4 removal, seems like it's still needed.
Package-Manager: portage-2.2_rc50/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt-core/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt-core/Manifest | 18 | ||||
| -rw-r--r-- | x11-libs/qt-core/qt-core-4.6.0_rc1.ebuild | 7 |
3 files changed, 19 insertions, 11 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/Manifest b/x11-libs/qt-core/Manifest index cafbc9c38093..48f461009363 100644 --- a/x11-libs/qt-core/Manifest +++ b/x11-libs/qt-core/Manifest @@ -9,17 +9,17 @@ AUX uic.pro 3671 RMD160 b6d3c392a67b66f6996134975e99db03a9987baf SHA1 f87fff3725 DIST qt-everywhere-opensource-src-4.6.0-rc1.tar.gz 153619571 RMD160 9ba13ba9aa99d3674b3bbc34601c7a34812c0701 SHA1 2fb07479c639fc2f98be0f9b65b0d179e4c637f7 SHA256 28649e0bd086783f3c960d9427298e1231c9eb44cb2c9ddad20cb3e60475c527 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.0_rc1.ebuild 6179 RMD160 8b66e78da4dcc712045260c9be2287e4bc04732f SHA1 fde8438f8f2aac822e9e63c6c199374713251eb5 SHA256 05bb8a28d29ea5666f4aecf0fe52ecab2fa2d75dca6d8fda945551edf5b742d5 -MISC ChangeLog 10357 RMD160 039afeb5b3ba24d89868c6b8a4146f14fa2e0119 SHA1 60cfdd7081a2ec79db4d978b8b0dc205c6882597 SHA256 b028b3e9b2d8c396285ed4b7e33537d13d3071016b11f23db1d9dd41b7f71549 +EBUILD qt-core-4.6.0_rc1.ebuild 6254 RMD160 4d41d7026d7a92e0da08f675448207fbcdce3950 SHA1 5c627b481bb719a5b7729e68359a255accb31339 SHA256 c98a84da275c31fe8d64529bd5c7b59bbead807213da71e8f4443de0e708f455 +MISC ChangeLog 10494 RMD160 5b32438ba47ac7d1081c1bd7f17429066a448441 SHA1 84521306513b645bc0e128605f2e8fca65f24417 SHA256 321cbe7b26bf1177bf9f7d35b1f8b4766a82020ed49dc86184f8e1a79f071cc1 MISC metadata.xml 470 RMD160 7dc5ec7f048e133b09e49c3827fc3f6e682cf525 SHA1 dd88b7e0472eeecf74b4d0540c41430043cb0c20 SHA256 1969f53b62a1256e028cfdf28a1e99e8e4dd9d415b1dc72a558b1dd17ec0a77b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) -iQEcBAEBCgAGBQJLBGsXAAoJEAWF714uGAc63CkIAIDwGgLhnb842QabsDpbRurS -KRiosHMCswwZcp58ynKcUhrWLLbGSBttTrRvrQofBbjKaG9NRw1k645YCQEs5KmD -RsEhDnUwFtrK5CSPyFCmbvpoOgJlXbKF3oza+/RnMC0ajXouh4+HaDq7zfQBxw+z -RTcZgw2fty7ZTOnm9qMwwBJX7K3V6e78Ah2VcCu/XROwR8rD7WfIbJFN6jaNIZau -7cMfGHpmYzG8HIU3hrnnj9px+KTmxdkR9lXAjOxBTUYwAPgGRuL9pcSiU54rlmyT -WTC1z0MUszaIaZ09rQWAU3O6ekkOXCqUH0aUfD2hUEY2togw8TJENp/jxQk7KIA= -=eVef +iQEcBAEBCgAGBQJLBdwtAAoJEAWF714uGAc6hrUH/3/TRKmRuFH0sxlYPOqTEqZU +Xt9GotK0A4luvKG6db6J49KUcw7SDnzpwwiTREBWdxjwAVprMpDeNBPIhya97re3 +1STkiC7l/oFan1A5dngCmZVyvSTpMkrmJA8ZJTm4KB6K/AkyxX3q+q/dVWX4k9ya +bYtbIbGd4KSGRWNIZfqpPu0mnGzFQorFq4ZGgEIQ1bYw/vtmevc7gCgpuTSJDAQL +KXVvjyl/2fPnpMEDXr4NIFVn+wODaeX0GhFsP/XBwKcrc4FfV8Dk88GevL7lpQCE +L4sexDbxleRgOdYOM2nqnp9epRGgDVfqxc+U2NNhUGEhGWffx3i897XaRCEgYIw= +=SAdY -----END PGP SIGNATURE----- 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" |