diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-08-23 23:12:58 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-08-23 23:12:58 +0000 |
| commit | 72ee77fa35051b88f937c8451ab64f0cde565c1b (patch) | |
| tree | 4d746d7b82cfef9dca08c28699e1fad5cfe08993 /x11-libs/qt | |
| parent | Marked ~amd64. (diff) | |
| download | gentoo-2-72ee77fa35051b88f937c8451ab64f0cde565c1b.tar.gz gentoo-2-72ee77fa35051b88f937c8451ab64f0cde565c1b.tar.bz2 gentoo-2-72ee77fa35051b88f937c8451ab64f0cde565c1b.zip | |
Fix detection of gcc-4. Replace 'cp -a' for bug #103487.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'x11-libs/qt')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.0.1.ebuild | 19 |
2 files changed, 11 insertions, 13 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 66ac083467a8..886d3f0510c1 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.242 2005/08/22 13:22:01 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.243 2005/08/23 23:12:58 greg_g Exp $ + + 23 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> qt-4.0.1.ebuild: + Fix detection of gcc-4. Replace 'cp -a' for bug #103487. 22 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> qt-4.0.1.ebuild: Fix bug #75181 in a more generic way, that does not make assumptions on the diff --git a/x11-libs/qt/qt-4.0.1.ebuild b/x11-libs/qt/qt-4.0.1.ebuild index e4e0f60c44e1..cc2b89645d0d 100644 --- a/x11-libs/qt/qt-4.0.1.ebuild +++ b/x11-libs/qt/qt-4.0.1.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.0.1.ebuild,v 1.2 2005/08/22 13:22:01 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.1.ebuild,v 1.3 2005/08/23 23:12:58 greg_g Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -64,7 +64,6 @@ qt_mkspecs_dir() { src_unpack() { unpack ${A} - cd ${S} sed -i -e 's:read acceptance:acceptance=yes:' configure @@ -89,7 +88,7 @@ src_unpack() { epatch ${FILESDIR}/qt4-nomkdir.patch - if [[ $(gcc-major-version = "4") ]]; then + if [[ "$(gcc-major-version)" == "4" ]]; then einfo "Visibility support: auto" else einfo "Visibility support: disabled" @@ -98,7 +97,6 @@ src_unpack() { } src_compile() { - export SYSCONF=${D}${QTPREFIXDIR}/etc/settings export PATH="${S}/bin:${PATH}" export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" @@ -134,7 +132,6 @@ src_compile() { } src_install() { - export SYSCONF=${D}${QTPREFIXDIR}/etc/settings export PATH="${S}/bin:${PATH}" export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" @@ -153,14 +150,13 @@ src_install() { fi # The QtAssistant header files aren't installed..not sure why - cp -a ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant + cp -pPR ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant - mkdir -p ${D}/${QTSYSCONFDIR} + keepdir "${QTSYSCONFDIR}" sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl - sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc - sed -i -e "s:${S}:${QTBASEDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc + sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.pc # List all the multilib libdirs local libdirs @@ -168,12 +164,11 @@ src_install() { libdirs="${libdirs}:/usr/${libdir}/qt4" done - mkdir -p ${D}/etc/env.d - - cat > ${D}/etc/env.d/44qt4 << EOF + cat > "${T}/44qt4" << EOF PATH=${QTBINDIR} ROOTPATH=${QTBINDIR} LDPATH=${libdirs:1} QMAKESPEC=$(qt_mkspecs_dir) EOF + doenvd "${T}/44qt4" } |