diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2004-12-29 21:07:33 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2004-12-29 21:07:33 +0000 |
| commit | b5a489c83c487eaa61b56805896c739a3b36b316 (patch) | |
| tree | 1e01d54af6010b353f48cf2f5aec9d26117a6537 /x11-libs | |
| parent | Change encoding to UTF-8 for GLEP 31 compliance (diff) | |
| download | historical-b5a489c83c487eaa61b56805896c739a3b36b316.tar.gz historical-b5a489c83c487eaa61b56805896c739a3b36b316.tar.bz2 historical-b5a489c83c487eaa61b56805896c739a3b36b316.zip | |
more fixes
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt/Manifest | 2 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.0.0_beta1-r1.ebuild | 22 |
2 files changed, 17 insertions, 7 deletions
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 4f974afd6c4e..805a4960d6cc 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,4 +1,4 @@ -MD5 57df154deafc3dba0ed2d67c70aa0300 qt-4.0.0_beta1-r1.ebuild 4999 +MD5 c829685b7db6687715bda753ef7479b7 qt-4.0.0_beta1-r1.ebuild 5151 MD5 6e61efd43e5e4d7d3a18031b108a331b qt-3.3.3-r1.ebuild 8034 MD5 a5c51d879fff01b6f6b8128088bbe3c4 qt-3.3.2.ebuild 6893 MD5 f769105ec9340901a442a9e9880f504d qt-2.3.2-r1.ebuild 2287 diff --git a/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild b/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild index ed18f8c31bbb..fc16922e1e33 100644 --- a/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild +++ b/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild,v 1.5 2004/12/29 17:46:55 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild,v 1.6 2004/12/29 21:07:33 caleb Exp $ inherit eutils flag-o-matic @@ -114,8 +114,9 @@ src_compile() { -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \ -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} ${myconf} || die - emake sub-tools-all-ordered sub-demos-all-ordered sub-examples-all-ordered || die - use doc && emake sub-tutorial-all-ordered + emake sub-tools-all-ordered || die + # emake sub-demos sub-examples || die + # use doc && emake sub-tutorial } src_install() { @@ -130,15 +131,24 @@ src_install() { export PATH="${S}/bin:${PATH}" export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" - make INSTALL_ROOT=${D} sub-src-install_subtargets-ordered sub-tools-install_subtargets-ordered || die - make INSTALL_ROOT=${D} sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered || die - use doc && make INSTALL_ROOT=${D} install_htmldocs sub-tutorial-install_subtargets-ordered + make INSTALL_ROOT=${D} install_qmake sub-tools-install_subtargets || die + # make INSTALL_ROOT=${D} sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered || die + + use doc && make INSTALL_ROOT=${D} install_htmldocs + + # sub-tutorial-install_subtargets-ordered dodir /usr/lib/qt4/mkspecs cp -a ${S}/mkspecs/linux-g++ ${D}/usr/lib/qt4/mkspecs/linux-g++ cp -a ${S}/mkspecs/features ${D}/usr/lib/qt4/mkspecs/features cp -a ${S}/mkspecs/default ${D}/usr/lib/qt4/mkspecs/default + cp -a ${S}/mkspecs/.qt.config ${D}/usr/lib/qt4/mkspecs/.qt.config + cd ${S}/lib + sed -i -e "s:${D}:/usr/lib/qt4/:" *.la + cd ${S}/lib/pkgconfig + sed -i -e "s:${D}:/usr/lib/qt4/:" *.pc + insinto /etc/env.d doins ${FILESDIR}/44qt4 } |