newest qt version - install at your own risk

5 files changed, 233 insertions, 41 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 0366eb32b749..0a9c18edc291 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,10 +1,16 @@
 # 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.97 2003/12/11 00:01:25 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.98 2003/12/11 13:34:58 caleb Exp $
 
   10 Dec 2003; Jon Portnoy <avenj@gentoo.org> qt-2.3.2-r1.ebuild :
   AMD64 keyworded.
 
+*qt-3.3.0_beta1 (11 Dec 2003)
+
+  11 Dec 2003; Caleb Tennis <caleb@gentoo.org> qt-3.3.0_beta1.ebuild:
+  New beta version.  Sweeping changes to the ebuild with more to
+  follow.  Install this version at your own risk.
+
   05 Dec 2003; Caleb Tennis <caleb@gentoo.org> qt-3.2.3.ebuild,
   files/qt-3.2.3-qfontdatabase-i18n-20031024.patch,
   files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch,
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 5ee46a1fc9e1..5b86077f66b0 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,57 +1,60 @@
-MD5 deeab3fbfc79cdc462e8ce62a2c61613 ChangeLog 16158
+MD5 232c9a440f58d6f1a15c750ba4a25c48 qt-3.1.2-r3.ebuild 4979
+MD5 9de36830c26a229b68dee7cf3442f287 qt-3.2.2-r1.ebuild 6277
 MD5 8d694ee5132993e415b040eff6ad298e qt-2.3.2-r1.ebuild 2277
-MD5 a3dd25c9f882f04df789dddc02ed3177 qt-3.0.5-r2.ebuild 3896
 MD5 c47d4bd47ef74b87a7eaa1c5969ec48e qt-3.2.1.ebuild 4937
-MD5 9de36830c26a229b68dee7cf3442f287 qt-3.2.2-r1.ebuild 6277
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 aff33d960efe2f7ef7782bd0a7cc9441 qt-3.1.2-r4.ebuild 5340
+MD5 a3dd25c9f882f04df789dddc02ed3177 qt-3.0.5-r2.ebuild 3896
 MD5 e2f7b604f119049e8be072fd959e805f qt-3.2.3.ebuild 5391
-MD5 232c9a440f58d6f1a15c750ba4a25c48 qt-3.1.2-r3.ebuild 4979
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
+MD5 8981a906e10dc45484c0db4415a5b666 qt-3.3.0_beta1.ebuild 4731
+MD5 aff33d960efe2f7ef7782bd0a7cc9441 qt-3.1.2-r4.ebuild 5340
+MD5 426f285688a31d84aa524c4415983a06 ChangeLog 16375
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 f036a81a9440e146ca67fb23dbb2b535 files/0013-qtabwidget-less_flicker.patch 2785
+MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
+MD5 5716cdfbdcb04ba8e3a25c7e1c49a9cc files/0026-netwm-fullscreen.patch 8243
+MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
+MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
-MD5 024632ca815ede1ccdd13cacea10e64a files/qt-3.1.2-thai-complextext.patch 528
-MD5 c8a8d41028d22397dcc86041f1856a79 files/digest-qt-3.0.5-r2 71
+MD5 65c6cd464a60955c85a85b1dfd487c04 files/0004-qiconview_etc_ctrl_selecting.patch 2207
 MD5 b79277b535797e854be75d1c396de0f2 files/digest-qt-3.2.1 72
-MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r4 72
-MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
 MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3 72
-MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
-MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
-MD5 1fd4137cd6f3d062dfd25523ee18468d files/digest-qt-3.2.2-r1 72
-MD5 905e62743eb9d6304dc70510c5d3ee69 files/0027-dnd-leak.patch 345
-MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
-MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
-MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
+MD5 8fd2bb8fe0c4752252d064ff62257f9a files/0028-fix_sub_popup_crash.patch 302
+MD5 e4054a5914b182318d548c53beea9590 files/0020-designer-deletetabs.patch 3493
 MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
-MD5 bf7aed227565288222ea889c81b1e363 files/qt-3.1.2-qlistview-dnd.diff 469
+MD5 0c06df8bd83ccf54e9045ef5703a1703 files/0024-fix_enter_leave_notify.patch 1374
 MD5 04fdd1779f4aca06b809528a2d0bad7a files/qt-3.1.2-coreutils-fixup.patch 4203
-MD5 953be971128fb1a5ad7d9893f657e13c files/qt-3.1.2-korean-xim.patch 4285
-MD5 8c9b47edf5949643d8dbeb3fecc40e7c files/qt-3.1.2-qfont-jp-family-subst-20030421.patch 22730
 MD5 b87df8ba9bf813ffe5e280fa2d79da25 files/qt-3.1.2-qpsprinter-ttc-otf-italic-20030429.patch 19286
-MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
-MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
+MD5 08fa63b47b7a7cf4886c151e1ce0e33f files/0022-qdragobject-hotspot.patch 1266
+MD5 905e62743eb9d6304dc70510c5d3ee69 files/0027-dnd-leak.patch 345
+MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
+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 1fd4137cd6f3d062dfd25523ee18468d files/digest-qt-3.2.2-r1 72
+MD5 024632ca815ede1ccdd13cacea10e64a files/qt-3.1.2-thai-complextext.patch 528
+MD5 1a268563c150260e99ed24dd4d2f5fd0 files/0021-qiconview-dragalittle.patch 2341
+MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
+MD5 1629e8691d2921d8651788fc0499379e files/0015-qiconview-finditem.patch 1496
+MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
 MD5 cb961de2c2123caa01b045da33a3da21 files/0003-qmenubar_fitts_law.patch 979
-MD5 65c6cd464a60955c85a85b1dfd487c04 files/0004-qiconview_etc_ctrl_selecting.patch 2207
+MD5 f203b47b8d1425047e0e301cb7d68eed files/0023-qstring-crash.patch 950
 MD5 ac9d015b2aca3f99a110d486b5232fad files/0009-window_group.patch 4156
-MD5 3b9e1d14819114b64b8bf770e1a474cd files/0011-listview_keys.patch 2520
-MD5 f036a81a9440e146ca67fb23dbb2b535 files/0013-qtabwidget-less_flicker.patch 2785
-MD5 5469328b9b6197e8bbfbe3e1528e61ca files/0014-qiconview-autoscroll.patch 1915
-MD5 1629e8691d2921d8651788fc0499379e files/0015-qiconview-finditem.patch 1496
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 2ba63844ecf426956135397f5eb845b4 files/0016-qiconview-rebuildcontainer.patch 1211
 MD5 91372ac45b85140af55a26498293e4ff files/0017-qiconview-ctrl_rubber.patch 3443
-MD5 cf7fad8d582c6b517b3555aba4e26fd1 files/0018-qlistview-paintcell.patch 1442
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
+MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
+MD5 953be971128fb1a5ad7d9893f657e13c files/qt-3.1.2-korean-xim.patch 4285
 MD5 3caa2fcd52c019652d8f73cd957ad85c files/0019-qlistview-adjustcolumn.patch 1508
-MD5 e4054a5914b182318d548c53beea9590 files/0020-designer-deletetabs.patch 3493
-MD5 1a268563c150260e99ed24dd4d2f5fd0 files/0021-qiconview-dragalittle.patch 2341
-MD5 08fa63b47b7a7cf4886c151e1ce0e33f files/0022-qdragobject-hotspot.patch 1266
-MD5 f203b47b8d1425047e0e301cb7d68eed files/0023-qstring-crash.patch 950
-MD5 0c06df8bd83ccf54e9045ef5703a1703 files/0024-fix_enter_leave_notify.patch 1374
-MD5 5716cdfbdcb04ba8e3a25c7e1c49a9cc files/0026-netwm-fullscreen.patch 8243
-MD5 8fd2bb8fe0c4752252d064ff62257f9a files/0028-fix_sub_popup_crash.patch 302
+MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
+MD5 3b9e1d14819114b64b8bf770e1a474cd files/0011-listview_keys.patch 2520
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
+MD5 8c9b47edf5949643d8dbeb3fecc40e7c files/qt-3.1.2-qfont-jp-family-subst-20030421.patch 22730
+MD5 bf7aed227565288222ea889c81b1e363 files/qt-3.1.2-qlistview-dnd.diff 469
+MD5 911441657af4920cc73a05abdd04d2a8 files/digest-qt-3.3.0_beta1 74
 MD5 e6052859850285f5334e722a73b2645b files/qt-3.2.2-crash-fix.patch 1035
+MD5 f7c2e87383c3888af1404e8024815acb files/qt-3.3.0_beta1-freetype.patch 748
+MD5 cf7fad8d582c6b517b3555aba4e26fd1 files/0018-qlistview-paintcell.patch 1442
 MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
-MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
-MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
+MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
+MD5 5469328b9b6197e8bbfbe3e1528e61ca files/0014-qiconview-autoscroll.patch 1915
diff --git a/x11-libs/qt/files/digest-qt-3.3.0_beta1 b/x11-libs/qt/files/digest-qt-3.3.0_beta1
new file mode 100644
index 000000000000..b0d5176e0782
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.3.0_beta1
@@ -0,0 +1 @@
+MD5 061a042218010bc1c90a1bda44977ad1 qt-x11-free-3.3.0b1.tar.bz2 14381448
diff --git a/x11-libs/qt/files/qt-3.3.0_beta1-freetype.patch b/x11-libs/qt/files/qt-3.3.0_beta1-freetype.patch
new file mode 100644
index 000000000000..f0506040887d
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.0_beta1-freetype.patch
@@ -0,0 +1,14 @@
+--- config.tests/x11/xfreetype.test	2003-12-08 12:19:14 -0000
++++ config.tests/x11/xfreetype.test	2003-12-08 12:19:14 -0000
+
+@@ -129,7 +129,9 @@
+ 	    FREETYPE_PATCH=`grep "#define FREETYPE_PATCH" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'`
+ 	    [ "$VERBOSE" = "yes" ] && \
+ 		echo "  Found Freetype version $FREETYPE_MAJOR.$FREETYPE_MINOR.$FREETYPE_PATCH"
+-	    if [ "$FREETYPE_MAJOR" -eq "2" -a "$FREETYPE_MINOR" -ge "0" -a "$FREETYPE_PATCH" -ge "9" ]; then
++	    if [ "$FREETYPE_MAJOR" -eq "2" ] \
++               && [ "$FREETYPE_MINOR" -ge "0" -a "$FREETYPE_PATCH" -ge "9" ] \
++               || [ "$FREETYPE_MINOR" -ge "1" ]; then
+ 		F=yes
+ 		FREETYPE2_INCDIR=$INCDIR/freetype2
+ 		[ "$VERBOSE" = "yes" ] && echo "  Found $INC in $INCDIR"
diff --git a/x11-libs/qt/qt-3.3.0_beta1.ebuild b/x11-libs/qt/qt-3.3.0_beta1.ebuild
new file mode 100644
index 000000000000..a608b38dcd92
--- /dev/null
+++ b/x11-libs/qt/qt-3.3.0_beta1.ebuild
@@ -0,0 +1,168 @@
+# 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.3.0_beta1.ebuild,v 1.1 2003/12/11 13:34:58 caleb Exp $
+
+SRCTYPE="free"
+DESCRIPTION="QT version ${PV}"
+HOMEPAGE="http://www.trolltech.com/"
+
+MY_PV=${PV/_beta1/b1}
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.bz2"
+
+LICENSE="QPL-1.0 | GPL-2"
+SLOT="3"
+KEYWORDS="x86"
+IUSE="cups nas postgres opengl mysql odbc gif doc firebird zlib icc sqlite"
+
+DEPEND="virtual/x11
+	virtual/xft
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/libmng
+	>=media-libs/freetype-2
+	cups? ( net-print/cups )
+	zlib? ( sys-libs/zlib )
+	icc? ( dev-lang/icc )
+	nas? ( media-libs/nas )
+	odbc? ( dev-db/unixODBC )
+	mysql? ( dev-db/mysql )
+	sqlite? ( dev-db/sqlite )
+	firdbird? ( dev-db/firebird )
+	postgres? ( dev-db/postgresql )
+	opengl? ( virtual/opengl virtual/glu )"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_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
+
+	epatch ${FILESDIR}/${P}-freetype.patch
+
+	export PLATFORM=linux-g++
+	use icc && export PLATFORM=linux-icc
+	use amd64 && export PLATFORM=linux-g++-64
+	use ia64 && export PLATFORM=linux-g++-64
+}
+
+src_compile() {
+	export QTDIR=${S}
+	export SYSCONF=${QTBASE}/etc/settings
+	LD_LIBRARY_PATH_OLD=${LD_LIBRARY_PATH}
+	export LD_LIBRARY_PATH=${S}/lib:${LD_LIBRARY_PATH}
+
+	# 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
+
+	use cups	|| myconf="${myconf} -no-cups"
+	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"
+	use odbc	&& myconf="${myconf} -plugin-sql-odbc"
+	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite"
+	use firebird    && myconf="${myconf} -plugin-sql-ibase"
+	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"
+	use ipv6        && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
+	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
+
+	export YACC='byacc -d'
+
+	./configure -sm -thread -stl -system-libjpeg -verbose \
+		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
+		-system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \
+		${PLATFORM} -xrender -prefix ${D}${QTBASE} -plugindir ${QTBASE}/plugins \
+		-docdir ${QTBASE}/doc -translationdir ${QTBASE}/translations \
+		-datadir ${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 lib/lib{editor,qassistantclient,designercore}.a
+	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}/doc
+
+	if [ `use doc` ]; then
+		cd ${S}/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}
+	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
+}