Bumping to fix multilib issues after discussion with caleb.

4 files changed, 180 insertions, 5 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 060e00f0ff01..6db2b1e3964a 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.181 2005/01/08 10:36:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.182 2005/01/12 04:26:44 eradicator Exp $
+
+*qt-4.0.0_beta1-r2 (11 Jan 2005)
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +qt-4.0.0_beta1-r2.ebuild:
+  Bumping to fix multilib issues after discussion with caleb.
 
 *qt-3.3.3-r2 (08 Jan 2005)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 6a09c309a474..2ea55a7c3d8f 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4fdb9a51cc91e670e26f64e7bec359c4 ChangeLog 30394
+MD5 acdda55badd11c93c2d94c4c0c72760e ChangeLog 30577
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 f48889277f11c39d5f2160b262e7c314 qt-2.3.2-r1.ebuild 2289
 MD5 dd2127b3c7bc12b24621d172b6a075af qt-3.2.3-r1.ebuild 5159
@@ -13,6 +13,7 @@ MD5 6eabb11b45974186ee77341995c7b215 qt-4.0.0_beta1-r1.ebuild 5702
 MD5 13c659d1e84ee9edb8e9c64d08fb06a9 qt-4.0.0_beta1.ebuild 4777
 MD5 0ad44cc079ec84d426754d8821c4246e qt-3.3.3-r2.ebuild 8173
 MD5 df5a45237731feecaec3d1c0dd72e735 qt-2.3.2-r2.ebuild 2596
+MD5 71338b6ba782422f79354dae6a3336e0 qt-4.0.0_beta1-r2.ebuild 5761
 MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
@@ -43,10 +44,11 @@ MD5 383147673319909aa3b692646be3c3dd files/qt4b1.patch 564
 MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r2 65
 MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r2 238
+MD5 5754b897216dcf52901cfb4de6770d6e files/digest-qt-4.0.0_beta1-r2 99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB37e8ArHZZzCEUG0RAvAPAJ9R7Jel5Y9wCdFeUad/rhlktUg10QCfUsEg
-BN3PJ7R4ZFH0ZGSxyYCKVbs=
-=jThv
+iD8DBQFB5KcRArHZZzCEUG0RApm/AKCC+4wndmftDiNvHwaGJMw+g754iQCghuBy
+t0pQZHUuA6J70oTEwcQf45E=
+=Gbwc
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/digest-qt-4.0.0_beta1-r2 b/x11-libs/qt/files/digest-qt-4.0.0_beta1-r2
new file mode 100644
index 000000000000..3c7d458b8c7b
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.0.0_beta1-r2
@@ -0,0 +1 @@
+MD5 29ec37c5865615e68d5abb902b27ba74 qt-x11-opensource-4.0.0-b2-snapshot-20041228.tar.bz2 10911084
diff --git a/x11-libs/qt/qt-4.0.0_beta1-r2.ebuild b/x11-libs/qt/qt-4.0.0_beta1-r2.ebuild
new file mode 100644
index 000000000000..5b94e73b08ff
--- /dev/null
+++ b/x11-libs/qt/qt-4.0.0_beta1-r2.ebuild
@@ -0,0 +1,166 @@
+# 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-r2.ebuild,v 1.1 2005/01/12 04:26:44 eradicator 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}
+
+pkg_setup() {
+	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.patch
+	epatch ${FILESDIR}/qt4b1_20041228.patch
+	epatch ${FILESDIR}/qt4-rpath.patch
+	epatch ${FILESDIR}/qt4-qtprf.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"
+	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 ${QTDATADIR}/mkspecs/linux-g++
+	dodir ${QTDATADIR}/mkspecs/features/unix
+
+	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:${D}::g" ${D}/${QTLIBDIR}/*.la
+	sed -i -e "s:${D}::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 > /etc/env.d/44qt4 << EOF
+PATH=${QTBINDIR}
+ROOTPATH=${QTBINDIR}
+LDPATH=${libdirs:1}
+QMAKESPEC=linux-g++
+EOF
+}