Version bump.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

6 files changed, 196 insertions, 90 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 38baad714763..7132fd81a82c 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.89 2010/02/10 20:11:28 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.90 2010/02/15 15:08:44 spatz Exp $
+
+*qt-core-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> -files/qt-4.6-nolibx11.diff,
+  -files/qt-core-4.6.0-hebrew.patch, qt-core-4.6.1.ebuild,
+  +files/qt-4.6-nolibx11.patch, -files/qt-core-4.6.1-nolibx11.patch,
+  +qt-core-4.6.2.ebuild:
+  Version bump, rename patch.
 
   10 Feb 2010; Ben de Groot <yngwin@gentoo.org> qt-core-4.6.1.ebuild:
   Move QT4_EXTRACT_DIRECTORIES stuff to pkg_setup, to fix compilation on
diff --git a/x11-libs/qt-core/files/qt-4.6-nolibx11.diff b/x11-libs/qt-core/files/qt-4.6-nolibx11.diff
deleted file mode 100644
index d3c1d1f75121..000000000000
--- a/x11-libs/qt-core/files/qt-4.6-nolibx11.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.old	2009-12-03 18:52:58.061117684 +0200
-+++ configure	2009-12-03 18:53:09.065116496 +0200
-@@ -5010,15 +5010,6 @@
-         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
-     fi
- 
--    # Check we actually have X11 :-)
--    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
--    if [ $? != "0" ]; then
--        echo "Basic XLib functionality test failed!"
--        echo " You might need to modify the include and library search paths by editing"
--        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
--        exit 1
--    fi
--
-     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
-         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-core/files/qt-core-4.6.1-nolibx11.patch b/x11-libs/qt-core/files/qt-4.6-nolibx11.patch
index e5d13327b8ce..e5d13327b8ce 100644
--- a/x11-libs/qt-core/files/qt-core-4.6.1-nolibx11.patch
+++ b/x11-libs/qt-core/files/qt-4.6-nolibx11.patch
diff --git a/x11-libs/qt-core/files/qt-core-4.6.0-hebrew.patch b/x11-libs/qt-core/files/qt-core-4.6.0-hebrew.patch
deleted file mode 100644
index 5275fbbf4561..000000000000
--- a/x11-libs/qt-core/files/qt-core-4.6.0-hebrew.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From ddf34f39efcbe679f1a8216df58da0c61e98ec79 Mon Sep 17 00:00:00 2001
-From: Lars Knoll <lars.knoll@nokia.com>
-Date: Mon, 21 Dec 2009 14:30:40 +0100
-Subject: [PATCH] update harfbuzz to 2b78f0d78ad3075fd1657d1260b31219e1a5155
-
-Fix a regression in Hebrew text rendering that got introduced
-in Harfbuzz.
-Fix some uninitialized variables.
-
-Task-number: http://bugreports.qt.nokia.com/browse/QTBUG-6436
-Reviewed-by: Simon Hausmann
----
- src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c   |    4 +---
- src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp |    3 +++
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c b/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c
-index 2bda386..67029be 100644
---- a/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c
-+++ b/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c
-@@ -56,8 +56,6 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)
- 
-     assert(shaper_item->item.script == HB_Script_Hebrew);
- 
--    HB_HeuristicSetGlyphAttributes(shaper_item);
--
- #ifndef NO_OPENTYPE
-     if (HB_SelectScript(shaper_item, hebrew_features)) {
- 
-@@ -65,7 +63,7 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)
-         if (!HB_ConvertStringToGlyphIndices(shaper_item))
-             return FALSE;
- 
--
-+        HB_HeuristicSetGlyphAttributes(shaper_item);
-         HB_OpenTypeShape(shaper_item, /*properties*/0);
-         return HB_OpenTypePosition(shaper_item, availableGlyphs, /*doLogClusters*/TRUE);
-     }
-diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
-index bfb03ab..bfc7bd4 100644
---- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
-+++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
-@@ -980,6 +980,7 @@ HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc)
-     HB_Stream gdefStream;
- 
-     gdefStream = getTableStream(font, tableFunc, TTAG_GDEF);
-+    error = HB_Err_Not_Covered;
-     if (!gdefStream || (error = HB_Load_GDEF_Table(gdefStream, &face->gdef))) {
-         //DEBUG("error loading gdef table: %d", error);
-         face->gdef = 0;
-@@ -987,6 +988,7 @@ HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc)
- 
-     //DEBUG() << "trying to load gsub table";
-     stream = getTableStream(font, tableFunc, TTAG_GSUB);
-+    error = HB_Err_Not_Covered;
-     if (!stream || (error = HB_Load_GSUB_Table(stream, &face->gsub, face->gdef, gdefStream))) {
-         face->gsub = 0;
-         if (error != HB_Err_Not_Covered) {
-@@ -998,6 +1000,7 @@ HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc)
-     _hb_close_stream(stream);
- 
-     stream = getTableStream(font, tableFunc, TTAG_GPOS);
-+    error = HB_Err_Not_Covered;
-     if (!stream || (error = HB_Load_GPOS_Table(stream, &face->gpos, face->gdef, gdefStream))) {
-         face->gpos = 0;
-         DEBUG("error loading gpos table: %d", error);
--- 
-1.6.6.rc4
-
diff --git a/x11-libs/qt-core/qt-core-4.6.1.ebuild b/x11-libs/qt-core/qt-core-4.6.1.ebuild
index 321421ca8dc3..b5f710e9c87d 100644
--- a/x11-libs/qt-core/qt-core-4.6.1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.1.ebuild,v 1.4 2010/02/10 20:11:28 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.1.ebuild,v 1.5 2010/02/15 15:08:44 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}
 PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-nolibx11.patch"
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
 )
 
 pkg_setup() {
diff --git a/x11-libs/qt-core/qt-core-4.6.2.ebuild b/x11-libs/qt-core/qt-core-4.6.2.ebuild
new file mode 100644
index 000000000000..0e7ff4b02516
--- /dev/null
+++ b/x11-libs/qt-core/qt-core-4.6.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.2.ebuild,v 1.1 2010/02/15 15:08:44 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc +glib iconv optimized-qmake qt3support ssl"
+
+RDEPEND="sys-libs/zlib
+	glib? ( dev-libs/glib )
+	ssl? ( dev-libs/openssl )
+	!<x11-libs/qt-4.4.0:4"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )"
+
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/tools/bootstrap
+		src/tools/moc
+		src/tools/rcc
+		src/tools/uic
+		src/corelib
+		src/xml
+		src/network
+		src/plugins/codecs
+		tools/linguist/lconvert
+		tools/linguist/lrelease
+		tools/linguist/lupdate"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include/Qt
+		include/QtCore
+		include/QtNetwork
+		include/QtScript
+		include/QtXml
+		src/plugins/plugins.pro
+		src/plugins/qpluginbase.pri
+		src/src.pro
+		src/3rdparty/des
+		src/3rdparty/harfbuzz
+		src/3rdparty/md4
+		src/3rdparty/md5
+		src/3rdparty/sha1
+		src/3rdparty/easing
+		src/script
+		tools/linguist/shared
+		translations"
+
+	if use doc; then
+		QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES}
+			doc/"
+		QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+			tools/qdoc3"
+	fi
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+				${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	# Don't pre-strip, bug 235026
+	for i in kr jp cn tw ; do
+		echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
+	done
+
+	qt4-build_src_prepare
+
+	# bug 172219
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
+	sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
+}
+
+src_configure() {
+	unset QMAKESPEC
+
+	myconf="${myconf}
+		$(qt_use glib)
+		$(qt_use iconv)
+		$(qt_use optimized-qmake)
+		$(qt_use ssl openssl)
+		$(qt_use qt3support)"
+
+	myconf="${myconf} -no-xkb  -no-fontconfig -no-xrender -no-xrandr
+		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
+		-no-nas-sound -no-dbus -no-cups -no-gif -no-libpng
+		-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
+		-no-freetype -no-libtiff  -no-accessibility -no-fontconfig -no-opengl
+		-no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools
+		-no-cups -no-xsync -no-xinput -no-multimedia"
+
+	if ! use doc; then
+		myconf="${myconf} -nomake docs"
+	fi
+
+	qt4-build_src_configure
+}
+
+src_compile() {
+	# bug 259736
+	unset QMAKESPEC
+	qt4-build_src_compile
+}
+
+src_install() {
+	dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
+
+	install_directories src/{corelib,xml,network,plugins/codecs}
+
+	emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
+
+	if use doc; then
+		emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed"
+	fi
+
+	# use freshly built libraries
+	local DYLD_FPATH=
+	[[ -d "${S}"/lib/QtCore.framework ]] \
+		&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
+	DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
+	LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \
+		|| die "generating translations faied"
+	insinto ${QTTRANSDIR#${EPREFIX}}
+	doins translations/*.qm || die "doins translations failed"
+
+	setqtenv
+	fix_library_files
+
+	# List all the multilib libdirs
+	local libdirs=
+	for libdir in $(get_all_libdirs); do
+		libdirs+=:${EPREFIX}/usr/${libdir}/qt4
+	done
+
+	cat <<-EOF > "${T}/44qt4"
+	LDPATH="${libdirs:1}"
+	EOF
+	doenvd "${T}/44qt4"
+
+	dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
+	mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
+		|| die "Failed to move qconfig.pri"
+
+	# Framework hacking
+	if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then
+		#TODO do this better
+		sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
+				"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
+			|| die "sed for qconfig.h failed."
+		dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
+	else
+		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
+				"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
+				"${D}${QTHEADERDIR}"/Qt/qconfig.h \
+			|| die "sed for qconfig.h failed"
+	fi
+
+	if use glib; then
+		QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
+				$(use ssl && echo QT_OPENSSL)"
+		install_qconfigs
+	fi
+
+	# remove some unnecessary headers
+	rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
+qatomic_windows.h,\
+qatomic_windowsce.h,\
+qt_windows.h}
+
+	keepdir "${QTSYSCONFDIR#${EPREFIX}}"
+
+	# Framework magic
+	fix_includes
+}