New technology preview. Keyworded -* until it has a bit more testing and the ebuild gets happier

Package-Manager: portage-2.1.1_pre1-r4

4 files changed, 227 insertions, 5 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 389743ca449a..45b592eff626 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.328 2006/06/22 19:50:18 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.329 2006/06/30 13:23:33 caleb Exp $
+
+*qt-4.2.0_pre1 (30 Jun 2006)
+
+  30 Jun 2006; Caleb Tennis <caleb@gentoo.org> +qt-4.2.0_pre1.ebuild:
+  New technology preview. Keyworded -* until it has a bit more testing and the
+  ebuild gets happier
 
 *qt-4.1.4 (22 Jun 2006)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 8b12a0fb9e89..5d9b95308a62 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -94,6 +94,7 @@ DIST qt-x11-opensource-src-4.1.1.tar.gz 27761487 RMD160 188d99f3ac2929038238229e
 DIST qt-x11-opensource-src-4.1.2.tar.gz 27924277 RMD160 b4a0031a7c8d72492d8afa1a1190493999cb17ff SHA1 a30ff8594b816528ab08ebcf349a31e244c4278d SHA256 025655971eef7f76ece9754346d6eb4e2dd44ddf569c4c84de27836aa24b04a3
 DIST qt-x11-opensource-src-4.1.3.tar.gz 32200887 RMD160 ecd103f99b2d1ca4b88e749faee5553b8c1c53e2 SHA1 6728b4891c5e24d4a9e1b7b66cc5915f89453b7c SHA256 1323af63fcb0b8aef52b90a6a2b81dbe1d7d929ba3ef02209940536c3ec06143
 DIST qt-x11-opensource-src-4.1.4.tar.gz 32174985 RMD160 a7e8558f275751b1a6217827784c3b81f84d6d5f SHA1 7924011d7fcc0c873b952670e0dac2c56fc6f0f5 SHA256 1687e40065023469fa308d47db6158a529ee42e740e38cb5c89e6f20ee68e59c
+DIST qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz 36914691 RMD160 97de87d0067a20e1cd9f864b2fe4f6d420f77cdb SHA1 0297fc09be7759f9f2a2d2fb8d1a5b08e90394a1 SHA256 2b9a36053f14ae860600375408526fcb26c0ee2c024ad370fa36c21b86ef3d7d
 EBUILD qt-3.3.4-r8.ebuild 10572 RMD160 f820e1e3a30b5b96ec15fa1f75b7fa2a82cfc2bc SHA1 d08dea35600a040ccb71dbe77948efb625b2e763 SHA256 5e4f4cbf3c2f5690dc6cb0a719510bb4876c35f0fa2cbb344d067818724fc15f
 MD5 e65e2e6ebd0b999e9fb53b067e4f6711 qt-3.3.4-r8.ebuild 10572
 RMD160 f820e1e3a30b5b96ec15fa1f75b7fa2a82cfc2bc qt-3.3.4-r8.ebuild 10572
@@ -126,10 +127,14 @@ EBUILD qt-4.1.4.ebuild 6319 RMD160 a26a3bcf50395e2a9b11c1500c0001b29f2c49be SHA1
 MD5 2a5f9c0c26427acdf9efefa5f683a768 qt-4.1.4.ebuild 6319
 RMD160 a26a3bcf50395e2a9b11c1500c0001b29f2c49be qt-4.1.4.ebuild 6319
 SHA256 0cde4eba22f2e19554ff6fbe36bdec550805c3b7bf5911bf1ed2efa9c323e519 qt-4.1.4.ebuild 6319
-MISC ChangeLog 11932 RMD160 a0a3f715005c503ed9db52db04276111a1b85488 SHA1 c64db77fc4e0f1775c2eecc35c0ae8742a69f197 SHA256 155d2742a45f29baef142efe51385314f48b9b168fd39b8ecefdf400d8d2526c
-MD5 32399c3718a10bae5487fc2bd856839a ChangeLog 11932
-RMD160 a0a3f715005c503ed9db52db04276111a1b85488 ChangeLog 11932
-SHA256 155d2742a45f29baef142efe51385314f48b9b168fd39b8ecefdf400d8d2526c ChangeLog 11932
+EBUILD qt-4.2.0_pre1.ebuild 6588 RMD160 7939a0ae0459baebdc183ca93931d62e3e22cb69 SHA1 d93f34c7f9fd8ab0ad0571112ac3789dd67f47aa SHA256 c9425329d2180545e779513f3a0d54310bc784fb186ef45f4cd606e1262c7009
+MD5 acb798584780c70d38f3ff874efeacfe qt-4.2.0_pre1.ebuild 6588
+RMD160 7939a0ae0459baebdc183ca93931d62e3e22cb69 qt-4.2.0_pre1.ebuild 6588
+SHA256 c9425329d2180545e779513f3a0d54310bc784fb186ef45f4cd606e1262c7009 qt-4.2.0_pre1.ebuild 6588
+MISC ChangeLog 12134 RMD160 78aba411617b95605f5989757afedcc7bf1df37a SHA1 1e03d05eb9e937faf174a72c9df7b04e4872d515 SHA256 521570b94de19ddd0d5e2e36960a7d4dd7c5c193d4026b615aa5467ebba0563d
+MD5 1c9921b12f9fa1521a6e5d855d60f899 ChangeLog 12134
+RMD160 78aba411617b95605f5989757afedcc7bf1df37a ChangeLog 12134
+SHA256 521570b94de19ddd0d5e2e36960a7d4dd7c5c193d4026b615aa5467ebba0563d ChangeLog 12134
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -158,3 +163,6 @@ SHA256 eb7e63724f276157c30d19bcfefbbdb6b66faa2be76dd6ce85d4dd454f2e3b57 files/di
 MD5 b9b9bc9b7b1b1958eb7763599b4e0855 files/digest-qt-4.1.4 289
 RMD160 4556fe65639da69c4df58db22e9fa1e31415a8bb files/digest-qt-4.1.4 289
 SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/digest-qt-4.1.4 289
+MD5 ba18424f299c95580e99ada8f48a3d21 files/digest-qt-4.2.0_pre1 325
+RMD160 f1a57c01d63d0efdcf3a24db1746b6df3f702347 files/digest-qt-4.2.0_pre1 325
+SHA256 d3de2d2c7c04abca2df6e794e03fc2e31f023b7c5036e9fdd9648900fe9ddb3f files/digest-qt-4.2.0_pre1 325
diff --git a/x11-libs/qt/files/digest-qt-4.2.0_pre1 b/x11-libs/qt/files/digest-qt-4.2.0_pre1
new file mode 100644
index 000000000000..07f15092e01b
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.2.0_pre1
@@ -0,0 +1,3 @@
+MD5 099a99d1b72b4be752fe0e211bc32dcf qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz 36914691
+RMD160 97de87d0067a20e1cd9f864b2fe4f6d420f77cdb qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz 36914691
+SHA256 2b9a36053f14ae860600375408526fcb26c0ee2c024ad370fa36c21b86ef3d7d qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz 36914691
diff --git a/x11-libs/qt/qt-4.2.0_pre1.ebuild b/x11-libs/qt/qt-4.2.0_pre1.ebuild
new file mode 100644
index 000000000000..383610bbd3dd
--- /dev/null
+++ b/x11-libs/qt/qt-4.2.0_pre1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.0_pre1.ebuild,v 1.1 2006/06/30 13:23:33 caleb Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+SRCTYPE="preview-opensource-src"
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
+HOMEPAGE="http://www.trolltech.com/"
+
+SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV/_pre/-tp}.tar.gz"
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV/_pre/-tp}
+
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+SLOT="4"
+#KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="-*"
+IUSE="accessibility cups debug dbus doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib"
+
+# need glib and dbus
+
+DEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libXcursor
+			x11-libs/libXi
+			x11-libs/libXfont
+			x11-libs/libSM
+			x11-proto/xextproto
+			x11-proto/inputproto
+			xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
+		)
+		virtual/x11
+	)
+	virtual/xft
+	>=media-libs/freetype-2
+	dbus? ( sys-apps/dbus )
+	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 )
+	firebird? ( dev-db/firebird )
+	opengl? ( virtual/opengl virtual/glu )
+	postgres? ( dev-db/libpq )
+	cups? ( net-print/cups )
+	zlib? ( sys-libs/zlib )
+	glib? ( sys-libs/glib )"
+
+pkg_setup() {
+	QTBASEDIR=/usr/$(get_libdir)/qt4
+	QTPREFIXDIR=/usr
+	QTBINDIR=/usr/bin
+	QTLIBDIR=/usr/$(get_libdir)/qt4
+	QTPCDIR=/usr/$(get_libdir)/pkgconfig
+	QTDATADIR=/usr/share/qt4
+	QTDOCDIR=/usr/share/doc/${PF}
+	QTHEADERDIR=/usr/include/qt4
+	QTPLUGINDIR=${QTLIBDIR}/plugins
+	QTSYSCONFDIR=/etc/qt4
+	QTTRANSDIR=${QTDATADIR}/translations
+	QTEXAMPLESDIR=${QTDATADIR}/examples
+	QTDEMOSDIR=${QTDATADIR}/demos
+
+	PLATFORM=$(qt_mkspecs_dir)
+}
+
+qt_use() {
+	useq ${1} && echo "-${1}" || echo "-no-${1}"
+	return 0
+}
+
+qt_mkspecs_dir() {
+	# Allows us to define which mkspecs dir we want to use.  Currently we only use
+	# linux-g++ or linux-g++-64, but others could be used for various platforms.
+
+	if [[ $(get_libdir) == "lib" ]]; then
+		echo "linux-g++"
+	else
+		echo "linux-g++-64"
+	fi
+}
+
+src_unpack() {
+
+	unpack ${A}
+#	epatch ${FILESDIR}/qt4-parisc-linux.diff
+	cd ${S}
+
+	sed -i -e 's:read acceptance:acceptance=yes:' configure
+
+	cd mkspecs/$(qt_mkspecs_dir)
+	# set c/xxflags and ldflags
+
+	# Don't let the user go too overboard with flags.  If you really want to, uncomment
+	# out the line below and give 'er a whirl.
+	strip-flags
+	replace-flags -O3 -O2
+
+	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
+
+	# Do not link with -rpath. See bug #75181.
+	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" \
+		qmake.conf
+
+	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
+	sed -i -e "s:X11R6/::" qmake.conf
+
+	cd ${S}
+
+	if [[ "$(gcc-major-version)" == "4" ]]; then
+		einfo "Visibility support: auto"
+	else
+		einfo "Visibility support: disabled"
+		sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
+	fi
+}
+
+src_compile() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+
+	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 png		&& myconf="${myconf} -system-libpng" || myconf="${myconf} -qt-libpng"
+	use jpeg	&& myconf="${myconf} -system-libjpeg" || myconf="${myconf} -qt-libjpeg"
+	use debug	&& myconf="${myconf} -debug-and-release" || 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/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"
+
+	use dbus	&& myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"
+	use glib	&& myconf="${myconf} -glib" || myconf="${myconf} -no-glib"
+
+	myconf="${myconf} -tablet -xrender -xrandr -xkb -xshape -sm"
+
+	./configure -stl -verbose -largefile \
+		-platform ${PLATFORM} -xplatform ${PLATFORM} \
+		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
+		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
+		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
+		-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf} || die
+
+	emake sub-tools-all-ordered || die
+	if use examples; then
+		emake sub-examples-all-ordered || die
+	fi
+}
+
+src_install() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
+
+	if use examples; then
+		make INSTALL_ROOT=${D} sub-examples-install_subtargets || die
+		make INSTALL_ROOT=${D} sub-demos-install_subtargets || die
+	fi
+
+	make INSTALL_ROOT=${D} install_qmake || die
+	make INSTALL_ROOT=${D} install_mkspecs || die
+
+	if use doc; then
+		make INSTALL_ROOT=${D} install_htmldocs || die
+	fi
+
+	# The private header files of QTestLib aren't installed, but are needed by the test library.
+	# This is supposedly fixed in Qt 4.1.1, so this can probably be removed when it is released
+	dodir ${QTHEADERDIR}/QtTest/private
+	cp -pPR ${S}/tools/qtestlib/src/*_p.h ${D}/${QTHEADERDIR}/QtTest/private
+
+	keepdir "${QTSYSCONFDIR}"
+
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.pc
+
+	# Move .pc files into the pkgconfig directory
+	dodir ${QTPCDIR}
+	mv ${D}/${QTLIBDIR}/*.pc ${D}/${QTPCDIR}
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:/usr/${libdir}/qt4"
+	done
+
+	cat > "${T}/44qt4" << EOF
+LDPATH=${libdirs:1}
+QMAKESPEC=$(qt_mkspecs_dir)
+EOF
+	doenvd "${T}/44qt4"
+}