diff options
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.2.1.ebuild | 29 |
3 files changed, 27 insertions, 11 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 753914ad288f..7d424a03486a 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.82 2003/09/08 02:15:54 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.83 2003/09/12 00:09:55 caleb Exp $ + + 11 Sep 2003; Caleb Tennis <caleb@gentoo.org> qt-3.2.1.ebuild: + Some fixes to make it compile and install mo betta for people 07 Aug 2003; Caleb Tennis <caleb@gentoo.org> qt-3.1.2-r4.ebuid: Add some complextext patches for cjk users (bug #27988) diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index a48872acfc92..8017f8b070f1 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,12 +1,12 @@ MD5 232c9a440f58d6f1a15c750ba4a25c48 qt-3.1.2-r3.ebuild 4979 MD5 3ea4b4de8bf408a89bad7560499c5517 qt-2.3.2-r1.ebuild 2274 -MD5 fff05a8ffe1dc01bffbae10c5f80132c qt-3.2.1.ebuild 4459 +MD5 28d14226473ef92ee49840989388831b qt-3.2.1.ebuild 4781 MD5 a3dd25c9f882f04df789dddc02ed3177 qt-3.0.5-r2.ebuild 3896 MD5 00e9d63f2373eecbf8d070845e3ed794 qt-3.1.0-r3.ebuild 4698 MD5 aff33d960efe2f7ef7782bd0a7cc9441 qt-3.1.2-r4.ebuild 5340 MD5 b1227e9708a51d583e96b533764e5f5c qt-3.1.1-r2.ebuild 4510 MD5 c2026904ef73059c2f6e8138d2d62caa qt-3.2.0.ebuild 4339 -MD5 cd35bc093649b16c54e9e4384c443e1d ChangeLog 13881 +MD5 f9f5c064997ef90074503306121f6a14 ChangeLog 14010 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 MD5 2d5b68b38185a30a28ffb2b652258cb8 files/45qt3 83 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63 diff --git a/x11-libs/qt/qt-3.2.1.ebuild b/x11-libs/qt/qt-3.2.1.ebuild index 41d402e86df4..b7861a873d5f 100644 --- a/x11-libs/qt/qt-3.2.1.ebuild +++ b/x11-libs/qt/qt-3.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.1.ebuild,v 1.4 2003/09/07 00:23:28 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.1.ebuild,v 1.5 2003/09/12 00:09:55 caleb Exp $ DESCRIPTION="QT version ${PV}" HOMEPAGE="http://www.trolltech.com/" @@ -18,14 +18,13 @@ DEPEND="virtual/x11 >=media-libs/libmng-1.0.0 >=media-libs/freetype-2 virtual/xft - !<kde-base/kdelibs-3.2 + !<kde-base/kdelibs-3.1.4 nas? ( >=media-libs/nas-1.4.1 ) odbc? ( >=dev-db/unixODBC-2.0 ) mysql? ( >=dev-db/mysql-3.2.10 ) opengl? ( virtual/opengl virtual/glu ) postgres? ( >=dev-db/postgresql-7.2 )" RDEPEND="${DEPEND}" - #doc? ( ~app-doc/qt-docs- )" S=${WORKDIR}/qt-x11-free-${PV} @@ -76,9 +75,11 @@ _EOF_ src_compile() { export QTDIR=${S} + export SYSCONF=${QTBASE}/etc/settings # fix #11144; qt wants to create lock files etc. in that directory [ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings" + [ ! -d "$QTBASE/etc/settings" ] && dodir ${QTBASE}/etc/settings export LDFLAGS="-ldl" @@ -93,7 +94,7 @@ src_compile() { use xinerama && mycong="${myconf} -xinerama" # avoid wasting time building things we won't install - rm -rf tutorial examples + #rm -rf tutorial examples export YACC='byacc -d' @@ -114,7 +115,7 @@ src_install() { dobin bin/* # libraries - dolib lib/libqt-mt.so.3.2.0 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designer}.a + dolib lib/libqt-mt.so.3.2.1 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designer}.a cd ${D}$QTBASE/lib for x in libqui.so ; do ln -s $x.1.0.0 $x.1.0 @@ -122,13 +123,13 @@ src_install() { ln -s $x.1 $x done - # version symlinks - 3.2.0->3.2->3->.so - ln -s libqt-mt.so.3.2.0 libqt-mt.so.3.2 + # version symlinks - 3.2.1->3.2->3->.so + ln -s libqt-mt.so.3.2.1 libqt-mt.so.3.2 ln -s libqt-mt.so.3.2 libqt-mt.so.3 ln -s libqt-mt.so.3 libqt-mt.so # libqt -> libqt-mt symlinks - ln -s libqt-mt.so.3.2.0 libqt.so.3.2.0 + ln -s libqt-mt.so.3.2.1 libqt.so.3.2.0 ln -s libqt-mt.so.3.2 libqt.so.3.2 ln -s libqt-mt.so.3 libqt.so.3 ln -s libqt-mt.so libqt.so @@ -143,6 +144,18 @@ src_install() { insinto /etc/env.d doins ${FILESDIR}/{45qt3,50qtdir3} + dodir ${QTBASE}/tools/designer/templates + + cd ${S}/doc + dodir ${QTBASE}/doc + for x in html flyers; do + cp -r $x ${D}/${QTBASE}/doc + done + + cp -r ${S}/doc/man ${D}/${QTBASE} + cp -r ${S}/examples ${D}/${QTBASE} + cp -r ${S}/tutorial ${D}/${QTBASE} + # misc build reqs dodir ${QTBASE}/mkspecs cp -R ${S}/mkspecs/linux-g++ ${D}/${QTBASE}/mkspecs/ |