Disable icc compilation as it breaks too many things. Also, revert to -prefix $QTBASE behavior from $D$QTBASE as it seems to break too many other things.

4 files changed, 188 insertions, 2 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index a47f6322bd23..ca056d54a55f 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.123 2004/02/14 15:44:00 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.124 2004/02/16 18:24:46 caleb Exp $
+
+*qt-3.3.0-r1 (16 Feb 2004)
+
+  16 Feb 2004; Caleb Tennis <caleb@gentoo.org> qt-3.3.0-r1.ebuild:
+  Ok, I'm reverting the behavior back to -prefix $QTBASE from $D$QTBASE.
+  It causes less breakage, at the expense of some linking problems during
+  the emerge.  We'll have to figure out how to work around those when
+  the time comes.
+  
+  Also, disable icc compilation as it seems to be totally broken.
 
   14 Feb 2004; Caleb Tennis <caleb@gentoo.org> qt-3.3.0.ebuild:
   Change back to the way it was with -libdir settings. I'll figure out a way
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 87f2fcd2f977..614698e9c28c 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,4 +1,5 @@
-MD5 c9c496912fe8e4b25bd5cf84645accdf qt-3.3.0.ebuild 5291
+MD5 2fdbc48fc2d79669b4a832ec2b8dd015 qt-3.3.0-r1.ebuild 5034
+MD5 6890c6fff19542cbbb2c7dbb0d73849e qt-3.3.0.ebuild 5312
 MD5 9e84006a240b69c02e0aa8b957d48662 qt-3.1.2-r3.ebuild 4984
 MD5 15cb67cf0a0a71f8c86c4aa91714360c qt-2.3.2-r1.ebuild 2285
 MD5 913367613ee452605a107179d5fa1c76 qt-3.0.5-r2.ebuild 3907
@@ -18,6 +19,7 @@ MD5 c8a8d41028d22397dcc86041f1856a79 files/digest-qt-3.0.5-r2 71
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r4 72
 MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
+MD5 c585d6ad02168e4645ea5ca46d237e1c files/digest-qt-3.3.0-r1 72
 MD5 024632ca815ede1ccdd13cacea10e64a files/qt-3.1.2-thai-complextext.patch 528
 MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
 MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
diff --git a/x11-libs/qt/files/digest-qt-3.3.0-r1 b/x11-libs/qt/files/digest-qt-3.3.0-r1
new file mode 100644
index 000000000000..b19f8ee750bc
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.3.0-r1
@@ -0,0 +1 @@
+MD5 7c628647126bb7bd957417f530ab04d4 qt-x11-free-3.3.0.tar.bz2 14401807
diff --git a/x11-libs/qt/qt-3.3.0-r1.ebuild b/x11-libs/qt/qt-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..c49fab1b1e76
--- /dev/null
+++ b/x11-libs/qt/qt-3.3.0-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.0-r1.ebuild,v 1.1 2004/02/16 18:24:46 caleb Exp $
+
+SRCTYPE="free"
+DESCRIPTION="QT version ${PV}"
+HOMEPAGE="http://www.trolltech.com/"
+
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2"
+
+LICENSE="QPL-1.0 | GPL-2"
+SLOT="3"
+KEYWORDS="x86 ~alpha ~ppc ~amd64"
+IUSE="cups nas postgres opengl mysql odbc gif doc firebird zlib icc sqlite ipv6"
+
+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 )
+	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}
+
+src_unpack() {
+	unpack ${A}
+
+	export QTDIR=${S}
+	cd ${S}
+
+	cp configure configure.orig
+	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
+
+	export PLATFORM=linux-g++
+#	use icc && export PLATFORM=linux-icc
+}
+
+src_compile() {
+	export QTDIR=${S}
+	export SYSCONF=${D}${QTBASE}/etc/settings
+	LD_LIBRARY_PATH_OLD=${LD_LIBRARY_PATH}
+	export LD_LIBRARY_PATH=${S}/lib:${LD_LIBRARY_PATH}
+
+	# 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"
+	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server"
+	use firebird    && myconf="${myconf} -plugin-sql-ibase"
+#	use oci8	&& myconf="${myconf} -plugin-sql-oci"
+	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite"
+	use odbc	&& myconf="${myconf} -plugin-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"
+
+	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 sub-tools || die
+	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH_OLD}
+}
+
+src_install() {
+	export QTDIR=${S}
+
+	# binaries
+	into $QTBASE
+	dobin bin/*
+
+	# libraries
+
+	dolib lib/libqt-mt.so.3.3.0 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.0->3.3->3->.so
+	ln -s libqt-mt.so.3.3.0 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.0 libqt.so.3.3.0
+	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}
+		cp -r ${S}/examples ${D}/${QTBASE}
+		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
+}
+
+pkg_postinst()
+{
+	einfo
+	einfo "If you are upgrading Qt from an earlier version, it's possible that"
+	einfo "your buildkey has changed (based on use flags).  This causes problems"
+	einfo "loading KDE plugins.  If you have problems with KDE styles, the"
+	einfo "simple solution is to re-emerge kdelibs (and kdeartwork if you have it)."
+	einfo
+}