Remove some older beta1s, add in beta2 (still heavily under development)

(Portage version: 2.0.51.19)

7 files changed, 61 insertions, 232 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 1cc4706a4366..e587ab8749c4 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.206 2005/04/03 08:09:13 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.207 2005/04/08 15:27:26 caleb Exp $
+
+*qt-4.0.0_beta2 (08 Apr 2005)
+
+  08 Apr 2005; Caleb Tennis <caleb@gentoo.org> -qt-4.0.0_beta1-r3.ebuild,
+  -qt-4.0.0_beta1-r4.ebuild, +qt-4.0.0_beta2.ebuild:
+  Remove some older beta1s, add in beta2 (still heavily under development)
 
   03 Apr 2005; Mamoru KOMACHI <usata@gentoo.org>
   +files/qt-3.3.4-immodule-focus.patch, qt-3.3.4-r2.ebuild,
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index ce332f7c21b4..7345287b53cf 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,55 +1,47 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7575f873651c882ffe871697f7356923 ChangeLog 34614
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 f48889277f11c39d5f2160b262e7c314 qt-2.3.2-r1.ebuild 2289
-MD5 7daec76f47482903184ed2b6d6d5640f qt-3.3.3-r1.ebuild 8039
 MD5 d19bb3e74e4a955fd9d7a580440f1780 qt-3.3.4-r3.ebuild 8696
-MD5 2a5d402b9d5ceff465069a1651f3b329 qt-2.3.2-r2.ebuild 2765
+MD5 7daec76f47482903184ed2b6d6d5640f qt-3.3.3-r1.ebuild 8039
+MD5 f48889277f11c39d5f2160b262e7c314 qt-2.3.2-r1.ebuild 2289
 MD5 048c159df273b9caf9ab683e542c3c4f qt-4.0.0_beta1-r3.ebuild 5840
-MD5 75d091f0ffbbb610e4f93f1e7e19fcfc qt-4.0.0_beta1-r4.ebuild 5880
-MD5 dc7eab137481c73dca4e2ea75795fa9f qt-4.0.0_beta1-r5.ebuild 5880
+MD5 534505e713aa3f38fc370c4abb06ba7f qt-4.0.0_beta2.ebuild 5802
 MD5 404ab84e0b37823cbcbbe0c72a5758f5 qt-3.3.4-r2.ebuild 8388
+MD5 dc7eab137481c73dca4e2ea75795fa9f qt-4.0.0_beta1-r5.ebuild 5880
+MD5 7575f873651c882ffe871697f7356923 ChangeLog 34614
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
-MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
-MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
-MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
-MD5 0c2c86fd45ff3cd7036dcd7cf941d3b0 files/qt4b1_20050302.patch 305
-MD5 9e806a56da0d48f62aab37291e910d0e files/qt4b1_nomkdir.patch 2485
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 2a5d402b9d5ceff465069a1651f3b329 qt-2.3.2-r2.ebuild 2765
+MD5 75d091f0ffbbb610e4f93f1e7e19fcfc qt-4.0.0_beta1-r4.ebuild 5880
+MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
+MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
-MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
-MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r2 65
-MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
+MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
+MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
 MD5 bbc93b26dddb70c7709d8d579b489a4c files/digest-qt-4.0.0_beta1-r3 99
-MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
-MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
 MD5 9ac242bd35ccb451ab12b4fe9878d8b0 files/digest-qt-4.0.0_beta1-r4 99
-MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
-MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
-MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
 MD5 9207a8f92e32bd42c37464f13abc7b3c files/digest-qt-4.0.0_beta1-r5 99
-MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
-MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
-MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
+MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
+MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
+MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
+MD5 9e806a56da0d48f62aab37291e910d0e files/qt4b1_nomkdir.patch 2485
+MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
+MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
+MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
+MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
 MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
+MD5 0c2c86fd45ff3cd7036dcd7cf941d3b0 files/qt4b1_20050302.patch 305
+MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
+MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r2 65
 MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCT6JaVWNWqTUmv+0RAiIzAJ9UfPBbQ2P69uZ+zB/GgVF91iC4FACgjCH4
-4FH56szQTbeIKFrgHzjrcyo=
-=Me00
------END PGP SIGNATURE-----
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 9833940419f474391d908dfcfc2bda85 files/digest-qt-4.0.0_beta2 75
+MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
+MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
+MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
diff --git a/x11-libs/qt/files/digest-qt-4.0.0_beta1-r3 b/x11-libs/qt/files/digest-qt-4.0.0_beta1-r3
deleted file mode 100644
index 1d8940026b11..000000000000
--- a/x11-libs/qt/files/digest-qt-4.0.0_beta1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5cf94fe4b7b04f50bfceb6f8548388a qt-x11-opensource-4.0.0-b2-snapshot-20050131.tar.bz2 11193470
diff --git a/x11-libs/qt/files/digest-qt-4.0.0_beta1-r4 b/x11-libs/qt/files/digest-qt-4.0.0_beta1-r4
deleted file mode 100644
index ea784cfe6df3..000000000000
--- a/x11-libs/qt/files/digest-qt-4.0.0_beta1-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d1a79cb1c38f2b8b17d35cbfd847fa8 qt-x11-opensource-4.0.0-b2-snapshot-20050302.tar.bz2 11993798
diff --git a/x11-libs/qt/files/digest-qt-4.0.0_beta2 b/x11-libs/qt/files/digest-qt-4.0.0_beta2
new file mode 100644
index 000000000000..67d57864d53f
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.0.0_beta2
@@ -0,0 +1 @@
+MD5 30cb566dc96a42a9c177c6045e44bc19 qt-x11-beta-4.0.0-b2.tar.bz2 11698082
diff --git a/x11-libs/qt/qt-4.0.0_beta1-r3.ebuild b/x11-libs/qt/qt-4.0.0_beta1-r3.ebuild
deleted file mode 100644
index 66bb2565c5d6..000000000000
--- a/x11-libs/qt/qt-4.0.0_beta1-r3.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2005 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-r3.ebuild,v 1.3 2005/02/10 01:53:32 caleb Exp $
-
-inherit eutils flag-o-matic
-
-SRCTYPE="opensource"
-SNAPSHOT="20050131"
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/snapshots/qt-x11-${SRCTYPE}-${PV/_beta1/-b2}-snapshot-${SNAPSHOT}.tar.bz2"
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="-*"
-IUSE="accessibility cups debug doc firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama zlib"
-
-DEPEND="virtual/x11 virtual/xft
-	media-libs/libpng media-libs/jpeg media-libs/libmng
-	>=media-libs/freetype-2
-	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 )"
-
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV/_beta1/-b2}-snapshot-${SNAPSHOT}
-
-pkg_setup() {
-	QTBASEDIR=/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=${S}
-	QTBINDIR=/usr/libexec/qt4
-	QTLIBDIR=/usr/$(get_libdir)/qt4
-	QTDOCDIR=/usr/share/qt4/doc
-	QTDATADIR=/usr/share/qt4
-	QTHEADERDIR=/usr/include/qt4
-	QTPLUGINDIR=/usr/$(get_libdir)/qt4/plugins
-	QTSYSCONFDIR=/etc/qt4
-	QTTRANSDIR=/usr/share/qt4/translations
-
-	export QTDIR=${S}
-	export PLATFORM=linux-g++
-}
-
-qt_use() {
-	useq ${1} && echo "-${1}" || echo "-no-${1}"
-	return 0
-}
-
-src_unpack() {
-	unpack ${A}
-
-	export QTDIR=${S}
-	cd ${S}
-
-	cp configure configure.orig
-	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-
-	cd mkspecs/linux-g++
-	# set c/xxflags and ldflags
-	strip-flags
-
-	# Qt4 moc does not work with -O3, unfortunately.
-	replace-flags -O3 -O2
-	filter-flags -finline-functions
-
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		qmake.conf
-	cd ${S}
-
-	epatch ${FILESDIR}/qt4b1_20041228.patch
-	epatch ${FILESDIR}/qt4-rpath.patch
-
-	sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
-}
-
-src_compile() {
-	export QTDIR=${S}
-	export SYSCONF=${D}${QTPREFIXDIR}/etc/settings
-	export PATH="${S}/bin:${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"
-
-	myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
-	myconf="${myconf} $(qt_use opengl) $(qt_use nis)"
-
-	use nas		&& myconf="${myconf} -system-nas-sound"
-	use gif		&& myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
-	use debug	&& myconf="${myconf} -debug" || myconf="${myconf} -release"
-	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
-
-	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/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"
-
-	export YACC='byacc -d'
-
-	./configure -stl -verbose -largefile \
-		-qt-imgfmt-{jpeg,png} -system-lib{jpeg,png} \
-		-platform ${PLATFORM} -xplatform ${PLATFORM} \
-		-tablet -xft -xrender -xrandr -xkb -xshape -sm \
-		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
-		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
-		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} ${myconf} || die
-
-	emake sub-tools-all-ordered || die
-	# emake sub-demos sub-examples || die
-	# use doc && emake sub-tutorial
-}
-
-src_install() {
-	export QTDIR=${S}
-	export SYSCONF=${D}${QTPREFIXDIR}/etc/settings
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	# make INSTALL_ROOT=${D} sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered || die
-	# make INSTALL_ROOT=${D} install_qmake sub-tools-install_subtargets-ordered || die
-	# Using install_qmake forces lots of other things to build.  Bypass it for now.
-
-	make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
-	install -c ${S}/bin/qmake ${D}${QTBINDIR}/qmake
-	use doc && make INSTALL_ROOT=${D} install_htmldocs
-
-	# sub-tutorial-install_subtargets-ordered
-
-	dodir /etc/env.d
-	dodir ${QTDATADIR}/mkspecs/linux-g++
-	dodir ${QTDATADIR}/mkspecs/features/unix
-
-	install -c ${S}/qt.conf ${D}${QTBASEDIR}/qt.conf
-	install -c ${S}/mkspecs/linux-g++/qmake.conf ${D}${QTDATADIR}/mkspecs/linux-g++
-	install -c ${S}/mkspecs/linux-g++/qplatformdefs.h ${D}${QTDATADIR}/mkspecs/linux-g++
-	install -c ${S}/mkspecs/features/unix/*.prf ${D}${QTDATADIR}/mkspecs/features/unix
-	install -c ${S}/mkspecs/features/*.prf ${D}${QTDATADIR}/mkspecs/features
-	install -c ${S}/mkspecs/default ${D}${QTDATADIR}/mkspecs/default
-	install -c ${S}/mkspecs/.qt.config ${D}${QTDATADIR}/mkspecs
-
-	sed -i -e "s:${S}:${QTBASEDIR}:g" ${D}/${QTBASEDIR}/qt.conf
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/${libdir}/qt4"
-	done
-	cat > ${D}/etc/env.d/44qt4 << EOF
-PATH=${QTBINDIR}
-ROOTPATH=${QTBINDIR}
-LDPATH=${libdirs:1}
-QMAKESPEC=linux-g++
-EOF
-}
diff --git a/x11-libs/qt/qt-4.0.0_beta1-r4.ebuild b/x11-libs/qt/qt-4.0.0_beta2.ebuild
index af49e213cd38..1ff1a54436a4 100644
--- a/x11-libs/qt/qt-4.0.0_beta1-r4.ebuild
+++ b/x11-libs/qt/qt-4.0.0_beta2.ebuild
@@ -1,40 +1,40 @@
 # Copyright 1999-2005 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-r4.ebuild,v 1.1 2005/03/03 17:18:29 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta2.ebuild,v 1.1 2005/04/08 15:27:26 caleb Exp $
 
 inherit eutils flag-o-matic
 
-SRCTYPE="opensource"
-SNAPSHOT="20050302"
+SRCTYPE="beta"
+#SNAPSHOT="20050317"
 DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
 
-SRC_URI="ftp://ftp.trolltech.com/qt/snapshots/qt-x11-${SRCTYPE}-${PV/_beta1/-b2}-snapshot-${SNAPSHOT}.tar.bz2"
+SRC_URI="ftp://ftp.trolltech.com/qt/snapshots/qt-x11-${SRCTYPE}-${PV/_beta2/-b2}.tar.bz2"
 
 LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="4"
 KEYWORDS="-*"
-IUSE="accessibility cups debug doc firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama zlib"
+IUSE="accessibility cups debug doc examples firebird gif ipv6 jpeg mng mysql nas nis odbc opengl postgres png sqlite X xinerama zlib"
 
-DEPEND="virtual/x11 virtual/xft
-	media-libs/libpng media-libs/jpeg media-libs/libmng
-	>=media-libs/freetype-2
+DEPEND="X? ( virtual/x11 virtual/xft >=media-libs/freetype-2 )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	mng? ( media-libs/libmng )
 	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 )"
 
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV/_beta1/-b2}-snapshot-${SNAPSHOT}
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV/_beta2/-b2}
 
 pkg_setup() {
 	QTBASEDIR=/usr/$(get_libdir)/qt4
 	QTPREFIXDIR=${S}
-	QTBINDIR=/usr/libexec/qt4
+	QTBINDIR=/usr/bin
 	QTLIBDIR=/usr/$(get_libdir)/qt4
 	QTDOCDIR=/usr/share/qt4/doc
 	QTDATADIR=/usr/share/qt4
@@ -98,28 +98,26 @@ src_compile() {
 
 	use nas		&& myconf="${myconf} -system-nas-sound"
 	use gif		&& myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
+	use png		&& myconf="${myconf} -system-libpng" || myconf="${myconf} -qt-libpng"
+	use jpeg	&& myconf="${myconf} -system-libjpeg" || myconf="${myconf} -qt-libjpeg"
 	use debug	&& myconf="${myconf} -debug" || myconf="${myconf} -release"
 	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
+	use X		&& myconf="${myconf} -tablet -xft -xrender -xrandr -xkb -xshape -sm"
 
 	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/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 postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/pgsql" || 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"
 
-	export YACC='byacc -d'
-
-	./configure -stl -verbose -largefile \
-		-qt-imgfmt-{jpeg,png} -system-lib{jpeg,png} \
+	./configure -stl -verbose -largefile -qt-imgfmt-{jpeg,png} \
 		-platform ${PLATFORM} -xplatform ${PLATFORM} \
-		-tablet -xft -xrender -xrandr -xkb -xshape -sm \
 		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
 		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
 		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} ${myconf} || die
 
 	emake sub-tools-all-ordered || die
-	# emake sub-demos sub-examples || die
-	# use doc && emake sub-tutorial
+	use examples && emake sub-demos sub-examples sub-tutorial || die
 }
 
 src_install() {
@@ -133,6 +131,7 @@ src_install() {
 	# Using install_qmake forces lots of other things to build.  Bypass it for now.
 
 	make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
+	use examples && make INSTALL_ROOT=${D} sub-tutorial-install_subtargets-ordered
 	install -c ${S}/bin/qmake ${D}${QTBINDIR}/qmake
 	use doc && make INSTALL_ROOT=${D} install_htmldocs