version bump, new technology preview. pmasked for now, as some of the configure options need to be tested/tweaked

Package-Manager: portage-2.1.3.16

4 files changed, 297 insertions, 15 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index a4023cc1f093..cc1b869e8ac1 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.508 2007/12/10 13:12:35 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.509 2007/12/19 18:05:12 caleb Exp $
+
+*qt-4.4.0_rc1 (19 Dec 2007)
+
+  19 Dec 2007; Caleb Tennis <caleb@gentoo.org> +qt-4.4.0_rc1.ebuild:
+  version bump
 
   10 Dec 2007; Robert Buchholz <rbu@gentoo.org> qt-4.3.2-r1.ebuild:
   amd64 stable (bug #201296)
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index bde5ff542baf..44f74f0d34dc 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623
@@ -124,6 +121,7 @@ DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f
 DIST qt-x11-opensource-src-4.3.1.tar.gz 43118858 RMD160 134c1f1a9e685a9519ff88a3afc59e7b8329a270 SHA1 ca59cfdcfc390cf16c6e6b503546e8bb2cc8e1e2 SHA256 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661
 DIST qt-x11-opensource-src-4.3.2.tar.gz 43462686 RMD160 b73a3d7a1edd11987544291cce80b56f5a499969 SHA1 265fb56ded2e7ff101ebd722bd2bc1638f96057d SHA256 70198d61d038007c787bab62700d35cbd3fc925b53fe920672f2a0afbae7e276
 DIST qt-x11-opensource-src-4.3.3.tar.gz 42341802 RMD160 410daca03b6802ba5cc6662219c2ba7a190bd292 SHA1 77d00e2438efa793f6c16c54b64c8ba440ee3228 SHA256 89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570
+DIST qt-x11-preview-opensource-src-4.4.0-tp1.tar.gz 56029137 RMD160 dd2dee9afaa9d16bdf5ca2bed82a3b9e2162bdd2 SHA1 e242dc542eb1424a51c47e7c80aaefd26668451c SHA256 1757416bda52c34ade3a49b5896bafe9e3cfe092d3180da32d520f94324c0b88
 EBUILD qt-3.3.4-r8.ebuild 10564 RMD160 ba215a278663c0a3eaa811c058eead8a684c5c95 SHA1 8791161e25b66d01d472c114f736d98818fbf0b3 SHA256 b40fc51531c3ed49487015fb3df92e2ab6982ceb76f1d742f5fb16f4dca35bf9
 MD5 acceb08717cf70be24569918164f3fbf qt-3.3.4-r8.ebuild 10564
 RMD160 ba215a278663c0a3eaa811c058eead8a684c5c95 qt-3.3.4-r8.ebuild 10564
@@ -148,10 +146,14 @@ EBUILD qt-4.3.3.ebuild 8699 RMD160 d57905d8855d470600b0221fbe88702deea3a635 SHA1
 MD5 ca8a3d1db94599efa2f75b9c53f6bb3a qt-4.3.3.ebuild 8699
 RMD160 d57905d8855d470600b0221fbe88702deea3a635 qt-4.3.3.ebuild 8699
 SHA256 cd069d68dd61838f67cccda04c349f2e9e26296c308a6c500914da1eabf1513a qt-4.3.3.ebuild 8699
-MISC ChangeLog 37129 RMD160 916120c09fd215e1127bf6fdebc14d5d52d70b81 SHA1 76cac8b2f1c3f484676520e994b2460db72494e9 SHA256 f8f951a152e87e4eb2913ae861c8d5dd1659d5b87c21ed15436d6923604989d2
-MD5 16429970fcd999b5518daa8c5204e3b8 ChangeLog 37129
-RMD160 916120c09fd215e1127bf6fdebc14d5d52d70b81 ChangeLog 37129
-SHA256 f8f951a152e87e4eb2913ae861c8d5dd1659d5b87c21ed15436d6923604989d2 ChangeLog 37129
+EBUILD qt-4.4.0_rc1.ebuild 8666 RMD160 aa3f30740b4b66d751ba714162c408c35f12a198 SHA1 49786d450fad379d690f22e56613bbac91aface1 SHA256 880bbcb2ac05f6038de87254a20d04fd238f805fffbc0cccc1a42b61279ec2bd
+MD5 e933eb9bed3deb5bfb09115ab1467c6f qt-4.4.0_rc1.ebuild 8666
+RMD160 aa3f30740b4b66d751ba714162c408c35f12a198 qt-4.4.0_rc1.ebuild 8666
+SHA256 880bbcb2ac05f6038de87254a20d04fd238f805fffbc0cccc1a42b61279ec2bd qt-4.4.0_rc1.ebuild 8666
+MISC ChangeLog 37245 RMD160 cd622e5ab13fe37c5f0afb0f22412c7ea52420b3 SHA1 8af8a22b2da1036fcf85c1ad74f4976faf9f306f SHA256 61841f18be7abc5dbd2c1ba6e4336b2f6bc32b3e69d9e2a0d11c361566fb1752
+MD5 cd916707ec696debfd0779f544850c23 ChangeLog 37245
+RMD160 cd622e5ab13fe37c5f0afb0f22412c7ea52420b3 ChangeLog 37245
+SHA256 61841f18be7abc5dbd2c1ba6e4336b2f6bc32b3e69d9e2a0d11c361566fb1752 ChangeLog 37245
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -174,10 +176,6 @@ SHA256 47f1e69a82b6e66d515566900675fb127edd7542d5846e16f8e047648d1820db files/di
 MD5 0280f757c93ff87a9573580c869065f7 files/digest-qt-4.3.3 289
 RMD160 1a2af42c69e0853730f1243bcc261fc215ec843a files/digest-qt-4.3.3 289
 SHA256 94283a9e5b829598f0cf6473f1292a7cd0d66ed670433fae75212caf31eb5dff files/digest-qt-4.3.3 289
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFHXTtJyZx3L/ph1soRAkw4AKDCu4DK7pvfUWav421q98FGiZhmvgCfbgWB
-pKBTZDQIPoJtz1Cd4iTHGNw=
-=/ux0
------END PGP SIGNATURE-----
+MD5 82e8a2d695216d8ed9d69b21cb2b06fc files/digest-qt-4.4.0_rc1 325
+RMD160 b82b94eb49ac3711f85f127b3b2d336ebc7e2711 files/digest-qt-4.4.0_rc1 325
+SHA256 76d5f09c74420bfa920616103da36e3bab698f3932f4db60db3d499ff34abf0e files/digest-qt-4.4.0_rc1 325
diff --git a/x11-libs/qt/files/digest-qt-4.4.0_rc1 b/x11-libs/qt/files/digest-qt-4.4.0_rc1
new file mode 100644
index 000000000000..2cd44a5faf48
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.4.0_rc1
@@ -0,0 +1,3 @@
+MD5 1c5a5533f885f331600951abd71bd00c qt-x11-preview-opensource-src-4.4.0-tp1.tar.gz 56029137
+RMD160 dd2dee9afaa9d16bdf5ca2bed82a3b9e2162bdd2 qt-x11-preview-opensource-src-4.4.0-tp1.tar.gz 56029137
+SHA256 1757416bda52c34ade3a49b5896bafe9e3cfe092d3180da32d520f94324c0b88 qt-x11-preview-opensource-src-4.4.0-tp1.tar.gz 56029137
diff --git a/x11-libs/qt/qt-4.4.0_rc1.ebuild b/x11-libs/qt/qt-4.4.0_rc1.ebuild
new file mode 100644
index 000000000000..ab0f01c8e360
--- /dev/null
+++ b/x11-libs/qt/qt-4.4.0_rc1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.4.0_rc1.ebuild,v 1.1 2007/12/19 18:05:12 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/"
+
+MY_PV=${PV/_rc/-tp}
+
+SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
+
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE_INPUT_DEVICES="input_devices_wacom"
+
+IUSE="accessibility cups dbus debug doc examples firebird glib jpeg mng mysql nas nis odbc opengl pch postgres qt3support sqlite sqlite3 ssl tiff xinerama ${IUSE_INPUT_DEVICES}"
+
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXfont
+	x11-libs/libSM
+	xinerama? ( x11-libs/libXinerama )
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/libpng
+	sys-libs/zlib
+	jpeg? ( media-libs/jpeg )
+	mng? ( >=media-libs/libmng-1.0.9 )
+	tiff? ( media-libs/tiff )
+	nas? ( >=media-libs/nas-1.5 )
+	odbc? ( dev-db/unixODBC )
+	mysql? ( virtual/mysql )
+	firebird? ( dev-db/firebird )
+	sqlite3? ( =dev-db/sqlite-3* )
+	sqlite? ( =dev-db/sqlite-2* )
+	opengl? ( virtual/opengl virtual/glu )
+	postgres? ( dev-db/libpq )
+	cups? ( net-print/cups )
+	glib? ( dev-libs/glib )
+	dbus? ( >=sys-apps/dbus-1.0.2 )
+	ssl? ( dev-libs/openssl )
+	input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )"
+
+DEPEND="${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/inputproto
+	dev-util/pkgconfig"
+
+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() {
+	local flag="$1"
+	local feature="$1"
+	local enableval=
+
+	[[ -n $2 ]] && feature=$2
+	[[ -n $3 ]] && enableval="-$3"
+
+	useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}"
+	return 0
+}
+
+qt_mkspecs_dir() {
+	 # Allows us to define which mkspecs dir we want to use.
+	local spec
+
+	case ${CHOST} in
+		*-freebsd*|*-dragonfly*)
+			spec="freebsd" ;;
+		*-openbsd*)
+			spec="openbsd" ;;
+		*-netbsd*)
+			spec="netbsd" ;;
+		*-darwin*)
+			spec="darwin" ;;
+		*-linux-*|*-linux)
+			spec="linux" ;;
+		*)
+			die "Unknown CHOST, no platform choosed."
+	esac
+
+	CXX=$(tc-getCXX)
+	if [[ ${CXX/g++/} != ${CXX} ]]; then
+		spec="${spec}-g++"
+	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
+		spec="${spec}-icc"
+	else
+		die "Unknown compiler ${CXX}."
+	fi
+
+	echo "${spec}"
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/qt-4.2.3-hppa-ldcw-fix.patch
+
+	cd "${S}"/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
+
+	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
+		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
+		append-flags -fno-stack-protector
+	fi
+
+	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}:" \
+		-e "/CONFIG/s:$: nostrip:" \
+		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
+
+	# The trolls moved the definitions of the above stuff for g++, so we need to edit those files
+	# separately as well.
+	cd "${S}"/mkspecs/common
+
+	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
+		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
+		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
+		g++.conf
+
+	# Do not link with -rpath. See bug #75181.
+	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf
+
+	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
+	sed -i -e "s:X11R6/::" linux.conf
+
+	cd "${S}"/qmake
+
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
+	-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" Makefile.unix
+
+	cd "${S}"
+
+}
+
+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)"
+
+	# Disable visibility explicitly if gcc version isn't 4
+	if [[ "$(gcc-major-version)" != "4" ]]; then
+		myconf="${myconf} -no-reduce-exports"
+	fi
+
+	# Add a switch that will attempt to use recent binutils to reduce relocations.  Should be harmless for other
+	# cases.  From bug #178535
+	myconf="${myconf} -reduce-relocations"
+
+	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"
+
+	myconf="${myconf} -qt-gif -system-libpng -system-zlib"
+	myconf="${myconf} $(qt_use jpeg libjpeg system) $(qt_use tiff libtiff system)"
+	myconf="${myconf} $(qt_use mng libmng system)"
+
+	use debug	&& myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
+
+	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 -I/opt/firebird/include" || myconf="${myconf} -no-sql-ibase"
+	use sqlite3	&& myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
+	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2"
+	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"
+	use qt3support		&& myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support"
+	use ssl		&& myconf="${myconf} -openssl" || myconf="${myconf} -no-openssl"
+
+	use pch		&& myconf="${myconf} -pch" || myconf="${myconf} -no-pch"
+
+	use input_devices_wacom	&& myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
+
+	myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
+
+	if ! use examples; then
+		myconf="${myconf} -nomake examples"
+	fi
+
+	myconf="-stl -verbose -largefile -confirm-license \
+		-platform ${PLATFORM} -xplatform ${PLATFORM} -no-rpath \
+		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
+		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
+		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
+		-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf}"
+
+	echo ./configure ${myconf}
+	./configure ${myconf} || die
+
+	emake all || die
+}
+
+src_install() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	emake INSTALL_ROOT="${D}" install_subtargets || die
+	emake INSTALL_ROOT="${D}" install_qmake || die
+	emake INSTALL_ROOT="${D}" install_mkspecs || die
+
+	if use doc; then
+		emake INSTALL_ROOT="${D}" install_htmldocs || die
+	fi
+
+	# Install the translations.	 This may get use flagged later somehow
+	emake INSTALL_ROOT="${D}" install_translations || die
+
+	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}/pkgconfig/*.pc
+
+	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
+	sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
+
+	# Move .pc files into the pkgconfig directory
+	dodir ${QTPCDIR}
+	mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
+
+	# Install .desktop files, from bug #174033
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/qt4/*.desktop
+
+	# 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}
+EOF
+	doenvd "${T}/44qt4"
+}