Snapshot version, fixes some big bugs in beta1

5 files changed, 167 insertions, 2 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 203a8723c5da..b73fb1767404 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.178 2004/12/28 03:16:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.179 2004/12/28 17:21:02 caleb Exp $
+
+*qt-4.0.0_beta1-r1 (28 Dec 2004)
+
+  28 Dec 2004; Caleb Tennis <caleb@gentoo.org> +files/qt4b1_20041228.patch,
+  +qt-4.0.0_beta1-r1.ebuild:
+  Snapshot version, fixes some big bugs in beta1
 
 *qt-4.0.0_beta1 (27 Dec 2004)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index f3038744b423..7972a4ec89d0 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,9 +1,10 @@
+MD5 9ede125df904f85f7f857bc098c6643a qt-4.0.0_beta1-r1.ebuild 4881
 MD5 6e61efd43e5e4d7d3a18031b108a331b qt-3.3.3-r1.ebuild 8034
 MD5 a5c51d879fff01b6f6b8128088bbe3c4 qt-3.3.2.ebuild 6893
 MD5 f769105ec9340901a442a9e9880f504d qt-2.3.2-r1.ebuild 2287
 MD5 5d82c6565d0f7cd22378670d038b92fb qt-3.3.1-r2.ebuild 5743
 MD5 dd2582a706c85fae669ad6decfc5d8b0 qt-4.0.0_beta1.ebuild 4772
-MD5 67aa9f152c9c3428fa9698539690e837 ChangeLog 29893
+MD5 3fbc88057516d0a77e8b1bef2806ac07 ChangeLog 30082
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 569f680d545c45974e9b33297ffae90e qt-3.3.3.ebuild 6893
 MD5 143e75d55f6c24c66ab5d8f89bb7e4c7 qt-3.2.3-r1.ebuild 5154
@@ -13,6 +14,7 @@ MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
 MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165
 MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
 MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878
+MD5 5754b897216dcf52901cfb4de6770d6e files/digest-qt-4.0.0_beta1-r1 99
 MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
 MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
 MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
@@ -24,6 +26,7 @@ MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 68
 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 383147673319909aa3b692646be3c3dd files/qt4b1.patch 564
 MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
+MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
 MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
 MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761
diff --git a/x11-libs/qt/files/digest-qt-4.0.0_beta1-r1 b/x11-libs/qt/files/digest-qt-4.0.0_beta1-r1
new file mode 100644
index 000000000000..3c7d458b8c7b
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.0.0_beta1-r1
@@ -0,0 +1 @@
+MD5 29ec37c5865615e68d5abb902b27ba74 qt-x11-opensource-4.0.0-b2-snapshot-20041228.tar.bz2 10911084
diff --git a/x11-libs/qt/files/qt4b1_20041228.patch b/x11-libs/qt/files/qt4b1_20041228.patch
new file mode 100644
index 000000000000..e7aaf322a261
--- /dev/null
+++ b/x11-libs/qt/files/qt4b1_20041228.patch
@@ -0,0 +1,10 @@
+--- src/compat/widgets/q3groupbox.cpp.orig	2004-12-28 10:52:08.917838088 -0500
++++ src/compat/widgets/q3groupbox.cpp	2004-12-28 10:50:50.034830128 -0500
+@@ -39,6 +39,7 @@
+ #include "qcheckbox.h"
+ #include "qaccessible.h"
+ #include "qstyleoption.h"
++#include "qevent.h"
+ using namespace Qt;
+ 
+ /*!
diff --git a/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild b/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..12cbe5802cab
--- /dev/null
+++ b/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild
@@ -0,0 +1,145 @@
+# 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-4.0.0_beta1-r1.ebuild,v 1.1 2004/12/28 17:21:02 caleb Exp $
+
+inherit eutils flag-o-matic
+
+SRCTYPE="opensource"
+SNAPSHOT="20041228"
+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 icc 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
+	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 )"
+
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV/_beta1/-b2}-snapshot-${SNAPSHOT}
+
+QTPREFIXDIR=${S}
+QTBINDIR=/usr/lib/qt4/bin
+QTLIBDIR=/usr/lib/qt4
+QTDOCDIR=/usr/lib/qt4/doc
+QTHEADERDIR=/usr/include/qt4
+QTPLUGINDIR=/usr/lib/qt4/plugins
+QTSYSCONFDIR=/etc/qt4
+QTTRANSDIR=/usr/lib/qt4/translations
+
+export QTDIR=${S}
+export PLATFORM=linux-g++
+
+qt_use() {
+	if useq $1; then
+		echo "-${1}"
+	else
+		echo "-no-${1}"
+	fi
+	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
+
+#	epatch ${FILESDIR}/qt-no-rpath-uic.patch
+
+	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.patch
+	epatch ${FILESDIR}/qt4b1_20041228.patch
+}
+
+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"
+	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/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"
+
+	export YACC='byacc -d'
+
+	./configure -stl -verbose -largefile \
+		-qt-imgfmt-{jpeg,png} -system-lib{jpeg,png} -fast \
+		-platform ${PLATFORM} -xplatform ${PLATFORM} \
+		-tablet -xft -xrender -xrandr -xkb -xshape -sm \
+		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} \
+		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
+		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} ${myconf} || die
+
+	emake sub-tools-all-ordered sub-demos-all-ordered sub-examples-all-ordered || die
+	use doc && emake sub-tutorial-all-ordered
+}
+
+src_install() {
+	# Setup the symlinks if libdir isn't "lib"
+	if [ "$(get_libdir)" != "lib" ]; then
+		dodir ${QTBASE}/$(get_libdir)
+		dosym $(get_libdir) ${QTBASE}/lib
+	fi
+
+	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-src-install_subtargets-ordered sub-tools-install_subtargets-ordered || die
+	make INSTALL_ROOT=${D} sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered || die
+	use doc && make INSTALL_ROOT=${D} install_htmldocs sub-tutorial-install_subtargets-ordered
+
+#	dodir /usr/qt4/bin
+#	into /usr/qt4
+#	dobin assistant designer findtr linguist lrelease lupdate moc qm2ts qmake qt3to4 qtconfig rcc syncqt uic uic3
+
+#	insinto /etc/env.d
+#	doins ${FILESDIR}/{45qt3,50qtdir3}
+}