more fixes

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 4f974afd6c4e4e79a53f2bc5f3089e91ae6228bb..805a4960d6cc4eac8f78cdd8761de337e6018347 100644 (file)
--- 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 ed18f8c31bbb1e297b0fd87b01eb492e0cf89d71..fc16922e1e335cfcda70f21ae8a106ef4bc20b47 100644 (file)
--- 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
 }