Some directory fixes

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 174d2e51e2f925d86180e3a9fda70f29dcb4337c..8c73c2d6281ae0db214c0f7a62a76cd06e500b65 100644 (file)
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,4 +1,4 @@
-MD5 c4a6fc290e6f2ecf58f7dd42848a7a74 qt-4.0.0_beta1-r1.ebuild 4917
+MD5 2f457b461a5839260136dfb926997dfd qt-4.0.0_beta1-r1.ebuild 4958
 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
@@ -9,6 +9,7 @@ MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 569f680d545c45974e9b33297ffae90e qt-3.3.3.ebuild 6893
 MD5 143e75d55f6c24c66ab5d8f89bb7e4c7 qt-3.2.3-r1.ebuild 5154
 MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
+MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
 MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165

diff --git a/x11-libs/qt/files/44qt4 b/x11-libs/qt/files/44qt4
new file mode 100644 (file)
index 0000000..e16e500
--- /dev/null
+++ b/x11-libs/qt/files/44qt4
@@ -0,0 +1,5 @@
+#PATH=/usr/lib/qt4/bin
+#ROOTPATH=/usr/lib/qt4/bin
+LDPATH=/usr/lib/qt4/lib
+QMAKESPEC=linux-g++
+#MANPATH=/usr/qt/3/doc/man

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 73e811788c52097b649629ee790ac2656ebedfc4..fcf0ff50897cc423a41633930d56106e5784ee76 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.2 2004/12/28 18:33:46 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild,v 1.3 2004/12/28 20:56:28 caleb Exp $
 
 inherit eutils flag-o-matic
 
@@ -35,8 +35,9 @@ S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV/_beta1/-b2}-snapshot-${SNAPSHOT}
 
 QTPREFIXDIR=${S}
 QTBINDIR=/usr/lib/qt4/bin
-QTLIBDIR=/usr/lib/qt4
+QTLIBDIR=/usr/lib/qt4/lib
 QTDOCDIR=/usr/lib/qt4/doc
+QTDATADIR=/usr/lib/qt4
 QTHEADERDIR=/usr/include/qt4
 QTPLUGINDIR=/usr/lib/qt4/plugins
 QTSYSCONFDIR=/etc/qt4
@@ -113,7 +114,7 @@ src_compile() {
                -qt-imgfmt-{jpeg,png} -system-lib{jpeg,png} -fast \
                -platform ${PLATFORM} -xplatform ${PLATFORM} \
                -tablet -xft -xrender -xrandr -xkb -xshape -sm \
-               -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} \
+               -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
                -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
                -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} ${myconf} || die
 
@@ -137,10 +138,10 @@ src_install() {
        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/qt4/bin
-#      into /usr/qt4
-#      dobin assistant designer findtr linguist lrelease lupdate moc qm2ts qmake qt3to4 qtconfig rcc syncqt uic uic3
+       dodir /usr/lib/qt4/mkspecs
+       cp -a ${S}/mkspecs/linux-g++ ${D}/usr/lib/qt4/mkspecs/linux-g++
+       cp -a ${S}/mkspecs/default ${D}/usr/lib/qt4/mkspecs/default
 
-#      insinto /etc/env.d
-#      doins ${FILESDIR}/{45qt3,50qtdir3}
+       insinto /etc/env.d
+       doins ${FILESDIR}/44qt4
 }