New snapshot version

Package-Manager: portage-2.0.51-r15

6 files changed, 258 insertions, 12 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index b11a9e77da9c..1083cc3b5f34 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.200 2005/03/01 16:24:07 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.201 2005/03/03 17:18:29 caleb Exp $
+
+*qt-4.0.0_beta1-r4 (03 Mar 2005)
+
+  03 Mar 2005; Caleb Tennis <caleb@gentoo.org> +files/qt4b1_20050302.patch,
+  +files/qt4b1_nomkdir.patch, +qt-4.0.0_beta1-r4.ebuild:
+  New snapshot version
 
   01 Mar 2005; Hardave Riar <hardave@gentoo.org> qt-3.3.4-r2.ebuild:
   Stable on mips, bug #75181.
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index f80249b8aead..619c5687ed2a 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,14 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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 8b326b9cd9d7f99e5a1f7e185de2e837 qt-3.3.4-r2.ebuild 8344
-MD5 cbfad52a81eef7ad144fc8a80c186964 ChangeLog 33520
+MD5 c06375097d3d912b3187a51d46851fa1 ChangeLog 33709
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
 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
@@ -17,9 +15,11 @@ 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 9ac242bd35ccb451ab12b4fe9878d8b0 files/digest-qt-4.0.0_beta1-r4 99
 MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 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
@@ -27,6 +27,7 @@ MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffer
 MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
 MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 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
@@ -35,10 +36,3 @@ MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
 MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCJJatM+I1L6GK/u4RAlWgAJ9yZlZnzoY+BRPTprEIy+MEDFr6xgCfS9AF
-IGrim87ymn7CKnzZmlzKYNE=
-=XIk4
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..ea784cfe6df3
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.0.0_beta1-r4
@@ -0,0 +1 @@
+MD5 1d1a79cb1c38f2b8b17d35cbfd847fa8 qt-x11-opensource-4.0.0-b2-snapshot-20050302.tar.bz2 11993798
diff --git a/x11-libs/qt/files/qt4b1_20050302.patch b/x11-libs/qt/files/qt4b1_20050302.patch
new file mode 100644
index 000000000000..ace0e6c928d5
--- /dev/null
+++ b/x11-libs/qt/files/qt4b1_20050302.patch
@@ -0,0 +1,10 @@
+--- src/qt3support/widgets/q3groupbox.cpp.orig	2004-12-28 10:52:08.917838088 -0500
++++ src/qt3support/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/files/qt4b1_nomkdir.patch b/x11-libs/qt/files/qt4b1_nomkdir.patch
new file mode 100644
index 000000000000..56bd30be78c6
--- /dev/null
+++ b/x11-libs/qt/files/qt4b1_nomkdir.patch
@@ -0,0 +1,67 @@
+--- configure	2005-03-03 08:54:03.345313552 -0500
++++ configure.nomkdir	2005-03-03 09:53:35.531258744 -0500
+@@ -1083,64 +1083,6 @@
+ # post process QT_INSTALL_* variables, and generate qt.conf
+ #-------------------------------------------------------------------------------
+ 
+-#prefix
+-[ -z "$QT_INSTALL_PREFIX" ] && QT_INSTALL_PREFIX=$outpath  #default
+-if mkdir -p "$QT_INSTALL_PREFIX" >/dev/null 2>&1; then
+-  QT_INSTALL_PREFIX=`(cd "$QT_INSTALL_PREFIX"; /bin/pwd)` #absolute
+-fi
+-
+-#docs
+-[ -z "$QT_INSTALL_DOCS" ] && QT_INSTALL_DOCS=$QT_INSTALL_PREFIX/doc #default
+-if mkdir -p "$QT_INSTALL_DOCS" >/dev/null 2>&1; then
+-  QT_INSTALL_DOCS=`(cd "$QT_INSTALL_DOCS"; /bin/pwd)` #absolute
+-fi
+-
+-#headers
+-[ -z "$QT_INSTALL_HEADERS" ] && QT_INSTALL_HEADERS=$QT_INSTALL_PREFIX/include #default
+-if mkdir -p "$QT_INSTALL_HEADERS" >/dev/null 2>&1; then
+-  QT_INSTALL_HEADERS=`(cd "$QT_INSTALL_HEADERS"; /bin/pwd)` #absolute
+-fi
+-
+-#libs
+-[ -z "$QT_INSTALL_LIBS" ] && QT_INSTALL_LIBS=$QT_INSTALL_PREFIX/lib #default
+-if mkdir -p "$QT_INSTALL_LIBS" >/dev/null 2>&1; then
+-  QT_INSTALL_LIBS=`(cd "$QT_INSTALL_LIBS"; /bin/pwd)` #absolute
+-fi
+-
+-#bins
+-[ -z "$QT_INSTALL_BINS" ] && QT_INSTALL_BINS=$QT_INSTALL_PREFIX/bin #default
+-if mkdir -p "$QT_INSTALL_BINS" >/dev/null 2>&1; then
+-  QT_INSTALL_BINS=`(cd "$QT_INSTALL_BINS"; /bin/pwd)` #absolute
+-fi
+-
+-#plugins
+-[ -z "$QT_INSTALL_PLUGINS" ] && QT_INSTALL_PLUGINS=$QT_INSTALL_PREFIX/plugins #default
+-if mkdir -p "$QT_INSTALL_PLUGINS" >/dev/null 2>&1; then
+-  QT_INSTALL_PLUGINS=`(cd "$QT_INSTALL_PLUGINS"; /bin/pwd)` #absolute
+-fi
+-
+-#data
+-[ -z "$QT_INSTALL_DATA" ] && QT_INSTALL_DATA=$QT_INSTALL_PREFIX #default
+-if mkdir -p "$QT_INSTALL_DATA" >/dev/null 2>&1; then
+-  QT_INSTALL_DATA=`(cd "$QT_INSTALL_DATA"; /bin/pwd)` #absolute
+-fi
+-
+-#translations
+-[ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS=$QT_INSTALL_PREFIX/translations #default
+-if mkdir -p "$QT_INSTALL_TRANSLATIONS" >/dev/null 2>&1; then
+-  QT_INSTALL_TRANSLATIONS=`(cd "$QT_INSTALL_TRANSLATIONS"; /bin/pwd)` #absolute
+-fi
+-
+-#settings
+-if [ "$PLATFORM_MAC" = "yes" ]; then
+-   [ -z "$QT_INSTALL_SETTINGS" ] && QT_INSTALL_SETTINGS=/Library/Preferences/Qt #default
+-else
+-   [ -z "$QT_INSTALL_SETTINGS" ] && QT_INSTALL_SETTINGS=/etc/xdg #default
+-fi
+-if mkdir -p "$QT_INSTALL_SETTINGS" >/dev/null 2>&1; then
+-  QT_INSTALL_SETTINGS=`(cd "$QT_INSTALL_SETTINGS"; /bin/pwd)` #absolute
+-fi
+-
+ cat > $outpath/qt.conf.new <<EOF
+ [Paths]
+ Prefix = $QT_INSTALL_PREFIX
diff --git a/x11-libs/qt/qt-4.0.0_beta1-r4.ebuild b/x11-libs/qt/qt-4.0.0_beta1-r4.ebuild
new file mode 100644
index 000000000000..af49e213cd38
--- /dev/null
+++ b/x11-libs/qt/qt-4.0.0_beta1-r4.ebuild
@@ -0,0 +1,168 @@
+# 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 $
+
+inherit eutils flag-o-matic
+
+SRCTYPE="opensource"
+SNAPSHOT="20050302"
+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}/qt4-rpath.patch
+	epatch ${FILESDIR}/qt4b1_20050302.patch
+	epatch ${FILESDIR}/qt4b1_nomkdir.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
+}