Latest Qt version

3 files changed, 208 insertions, 1 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index f8e3d7f749e2..35b32d108972 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.159 2004/08/16 13:52:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.160 2004/08/16 14:57:58 caleb Exp $
+
+*qt-3.3.3 (16 Aug 2004)
+
+  16 Aug 2004; Caleb Tennis <caleb@gentoo.org> qt-3.3.3.ebuild:
+  New version
 
   16 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> qt-3.3.2.ebuild:
   Updated immodule patch.
diff --git a/x11-libs/qt/files/digest-qt-3.3.3 b/x11-libs/qt/files/digest-qt-3.3.3
new file mode 100644
index 000000000000..4d86db2e2cbb
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.3.3
@@ -0,0 +1 @@
+MD5 3e0a0c8429b0a974b39b5f535ddff01c qt-x11-free-3.3.3.tar.bz2 14424812
diff --git a/x11-libs/qt/qt-3.3.3.ebuild b/x11-libs/qt/qt-3.3.3.ebuild
new file mode 100644
index 000000000000..46817c55231a
--- /dev/null
+++ b/x11-libs/qt/qt-3.3.3.ebuild
@@ -0,0 +1,201 @@
+# 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-3.3.3.ebuild,v 1.1 2004/08/16 14:57:58 caleb Exp $
+
+inherit eutils
+
+SRCTYPE="free"
+DESCRIPTION="QT version ${PV}"
+HOMEPAGE="http://www.trolltech.com/"
+
+IMMQT_P="qt-x11-immodule-unified-qt3.3.2-20040814"
+# If you want to build qt-immodule against Qt 3.3.3, you will also need
+# qt-x11-free-3.3.3-complemental-patch-for-immodule-20040814.diff
+
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
+	cjk? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )"
+
+LICENSE="QPL-1.0 | GPL-2"
+SLOT="3"
+KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~sparc ~hppa ~mips ~ppc64"
+IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib cjk"
+
+DEPEND="virtual/x11 virtual/xft
+	media-libs/libpng media-libs/jpeg media-libs/libmng
+	>=media-libs/freetype-2
+	gif? ( media-libs/giflib media-libs/libungif )
+	nas? ( >=media-libs/nas-1.5 )
+	odbc? ( dev-db/unixODBC )
+	mysql? ( dev-db/mysql )
+	sqlite? ( =dev-db/sqlite-2* )
+	firebird? ( dev-db/firebird )
+	opengl? ( virtual/opengl virtual/glu )
+	postgres? ( dev-db/postgresql )
+	cups? ( net-print/cups )
+	zlib? ( sys-libs/zlib )
+	icc? ( dev-lang/icc )"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+
+QTBASE=/usr/qt/3
+export QTDIR=${S}
+export PLATFORM=linux-g++
+
+src_unpack() {
+	unpack ${A}
+
+	export QTDIR=${S}
+	cd ${S}
+
+	cp configure configure.orig
+	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
+
+	epatch ${FILESDIR}/qt-no-rpath-uic.patch
+
+	if use cjk ; then
+		epatch ../${IMMQT_P}.diff
+		sh make-symlinks.sh || die "make symlinks failed"
+	fi
+
+	# mips requires this patch to pass a CFLAG to gcc/g++ (which passes it to the assembler).
+	# It tells the assembler to relax branches on mips, otherwise we get build errors.
+	use mips && epatch ${FILESDIR}/${P}-mips-relax-branches.patch
+
+#	use icc && export PLATFORM=linux-icc
+}
+
+src_compile() {
+	export QTDIR=${S}
+	export SYSCONF=${D}${QTBASE}/etc/settings
+
+	# Let's just allow writing to these directories during Qt emerge
+	# as it makes Qt much happier.
+	addwrite "${QTBASE}/etc/settings"
+	addwrite "$HOME/.qt"
+
+	use nas		&& myconf="${myconf} -system-nas-sound"
+	use gif		&& myconf="${myconf} -qt-gif"
+	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql" || myconf="${myconf} -no-sql-mysql"
+	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"
+	use firebird    && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
+	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
+	use odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
+	use cups	&& myconf="${myconf} -cups" || myconf="${myconf} -no-cups"
+	use opengl	&& myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
+	use debug	&& myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
+	use xinerama    && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama"
+	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
+	use ipv6        && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
+	use cjk		&& myconf="${myconf} -im"
+
+	export YACC='byacc -d'
+
+	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
+		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
+		-system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \
+		${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \
+		-dlopen-opengl || die
+
+	export QTDIR=${S}
+
+	emake src-qmake src-moc sub-src || die
+	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-tools || die
+}
+
+src_install() {
+	export QTDIR=${S}
+
+	# binaries
+	into $QTBASE
+	dobin bin/*
+
+	# libraries
+
+	dolib lib/libqt-mt.so.3.3.3 lib/libqui.so.1.0.0
+	dolib lib/lib{editor,qassistantclient,designercore}.a lib/libqt-mt.la
+
+	cd ${D}/$QTBASE/lib
+	for x in libqui.so ; do
+		ln -s $x.1.0.0 $x.1.0
+		ln -s $x.1.0 $x.1
+		ln -s $x.1 $x
+	done
+
+	# version symlinks - 3.3.3->3.3->3->.so
+	ln -s libqt-mt.so.3.3.3 libqt-mt.so.3.3
+	ln -s libqt-mt.so.3.3 libqt-mt.so.3
+	ln -s libqt-mt.so.3 libqt-mt.so
+
+	# libqt -> libqt-mt symlinks
+	ln -s libqt-mt.so.3.3.3 libqt.so.3.3.3
+	ln -s libqt-mt.so.3.3 libqt.so.3.3
+	ln -s libqt-mt.so.3 libqt.so.3
+	ln -s libqt-mt.so libqt.so
+
+	# includes
+	cd ${S}
+	dodir ${QTBASE}/include/private
+	cp include/* ${D}/${QTBASE}/include/
+	cp include/private/* ${D}/${QTBASE}/include/private/
+
+	# misc
+	insinto /etc/env.d
+	doins ${FILESDIR}/{45qt3,50qtdir3}
+
+	dodir ${QTBASE}/tools/designer/templates
+	cd ${S}
+	cp tools/designer/templates/* ${D}/${QTBASE}/tools/designer/templates
+
+	dodir ${QTBASE}/translations
+	cd ${S}
+	cp translations/* ${D}/${QTBASE}/translations
+
+	dodir ${QTBASE}/etc
+	keepdir ${QTBASE}/etc/settings
+
+	dodir ${QTBASE}/doc
+
+	if use doc; then
+		cp -r ${S}/doc ${D}/${QTBASE}
+
+		cd ${S}/examples
+		find . -name Makefile | while read MAKEFILE
+		do
+			cp ${MAKEFILE} ${MAKEFILE}.old
+			sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE}
+			rm -f ${MAKEFILE}.old
+		done
+
+		cp -r ${S}/examples ${D}/${QTBASE}
+
+		cd ${S}/tutorial
+		find . -name Makefile | while read MAKEFILE
+		do
+			cp ${MAKEFILE} ${MAKEFILE}.old
+			sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE}
+			rm -f ${MAKEFILE}.old
+		done
+
+		cp -r ${S}/tutorial ${D}/${QTBASE}
+	fi
+
+	# misc build reqs
+	dodir ${QTBASE}/mkspecs
+	cp -R ${S}/mkspecs/${PLATFORM} ${D}/${QTBASE}/mkspecs/
+
+	sed -e "s:${S}:${QTBASE}:g" \
+		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
+
+	# plugins
+	cd ${S}
+	plugins=`find plugins -name "lib*.so" -print`
+	for x in $plugins; do
+		insinto ${QTBASE}/`dirname $x`
+		doins $x
+	done
+
+	# needed to fix lib64 issues on amd64, see bug #45669
+	use amd64 && ln -s ${QTBASE}/lib ${D}/${QTBASE}/lib64
+}