Revbump introducing icu USE flag and forcing >=icu-49 to workaround bug #413541.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

3 files changed, 193 insertions, 15 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index e83d2b3aca27..cd8646a941d2 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.168 2012/05/20 13:30:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.169 2012/05/20 19:51:47 pesa Exp $
+
+*qt-core-4.8.1-r3 (20 May 2012)
+
+  20 May 2012; Davide Pesavento <pesa@gentoo.org> +qt-core-4.8.1-r3.ebuild:
+  Revbump introducing icu USE flag and forcing >=icu-49 to workaround bug
+  #413541.
 
   20 May 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Remove "jit" USE flag description from metadata, bug 416611.
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index c2c4a51c19d4..1135a43755d3 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -14,22 +14,23 @@ DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 RMD160 538e626fae80ca8c
 EBUILD qt-core-4.6.3-r1.ebuild 5128 RMD160 c4415638e41f79147a94c36f6e089654c5040874 SHA1 1169313a308c4b01a0b8a74742550704d6b5bb2e SHA256 e403781b7f9188ffaa8a58c5e82d2fb1c802e50a8d9fd4efea8e26f141ef1f97
 EBUILD qt-core-4.7.4-r1.ebuild 5173 RMD160 a8f8118c4df899024978d80e0339f9153c999dc6 SHA1 c4978513baafbac348a492a6082aef879aa0a906 SHA256 5bd26485ff70124ba2dd7f529f39c495f79d3577845b917d580b87371c9fa8be
 EBUILD qt-core-4.8.1-r2.ebuild 4754 RMD160 dd7b5dd9b2c632b093c70c0f26930e2ddda1cfc7 SHA1 312ef0e52db1f6a59f62d0264bf3618102d105fa SHA256 92a3e7fa7b8b0ac70854f92b7692d5396f593a75a9770bf962f44d2384ce7df9
-MISC ChangeLog 22783 RMD160 ae1db6db9b0ef932ca762da1aed05f7bcde9738c SHA1 bd2a06103c0863351b59cf7becfd607cea1c5ada SHA256 11ac0ebbe7d6c3adb66e540dd0af599f10cf4bfc2bda8b70be04b76eedf5adb7
+EBUILD qt-core-4.8.1-r3.ebuild 4672 RMD160 8e074609a3792d9b9c5229ac78b768a19fc8e549 SHA1 dfad46582f54b0c826023bfd365ddb58bb70d9bf SHA256 e69eca223bf5090bf790328dd38c480e91a7db5bf28cf71c2b0c14279b38deae
+MISC ChangeLog 22978 RMD160 7b5752c8c733ca691e4b2890fb6b819cb501c2ff SHA1 0571077bbe7d766d73ef0a57091cc01d148081da SHA256 473f19a89053de7b518513bbf9f9bc400b259a83833be74bced1058fb4a318db
 MISC metadata.xml 873 RMD160 4c7d20b393a6d27bb28a29d86dffa8b93ad22988 SHA1 d6dc0c9e3b2ac646ff67900ba730cdba17517255 SHA256 514106c8027d9334f964d6166c326f768a8e4ecb2a122683a8953bfd47322af6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPuPIBAAoJENXLsxwXqFxy3/4P/jqDqT2/2MWx7CpdZErQIdh/
-g7qdsqjPd3A3xXL2tIFgcvXSCnsho5ebRG5qLaOhGuvOr8bMHhe4nR5LmhDL2WX6
-0AvS21Tx5WtOimneeRzY1ZUGKf+Y51ALHjYLvR8EYDcNUnenluwp7/HYrfqAh83k
-jAhmab+aus6z34+Q2eba/QYrtSgCHROskByldhOFQOtOWJHiBXNHDbgqIbaceKnR
-jlpTzBPJxzbQ8nBTyi22itbeNzG+lo0Oqs4QOYREWNtMES39Y8JsFGzdP8m3WG4+
-38btFGRFPm0kT0Izi0BzdpQ2DOcClG0ato1lgRPJPQLdgm7mXMFYESMWe3kW+60H
-LI9IbvgAf7wJbJ2W3hgtAg/s8NaGT+XtTXxB3zdRLxpq3Xrlf9j+w8zcCqGuPyhw
-aei7r2TJAMRKh/wI7A2poxhd4FDpUW4C7skGAuDx/EP37Mm8F//N9M2XH0k/Gy5Z
-o4msJNSwZPM2Eu6Ci1TrXUHk6m/iFtq+SzwiICw7fs1gGq8r2O2eQJT+2RSYQ2VM
-cy+e24m26nGbLXHXZ7DCM4wZW5S9+7jSF7MbNj6CldiOFkns7NDrywB8egpVFsTO
-68RChbxuLkwR/Xq4Id4eJLAcWfU9ZcrQwM9GHNhOQGsnsgyy0tccAs/LpYT4lXIQ
-H74tJDaYSS6yrbtTAwqy
-=UHP7
+iQIcBAEBCgAGBQJPuUtrAAoJENXLsxwXqFxyZZgP/1uaGumBCGDd0LK2C5aBMsG/
+yNQ+dcL8miAUEt1yxJ9jiZ0valCiP+9bJCDygzuAU/fMR7pfYPjOpvVNEIeENvwa
+FseQVS6phIFYsBcgh1VXWomAHuMgsz3FYfF4LYS2Gb+O1MlvcrVPMmC7UQJ2q6iQ
+dEQGbXHHI86rwfgdvcZ8qs14aFgZehxTSBhxThbnIDANimYKJqUIluwkeR9O6OJK
+ovCMgvgk4vHwdDjebZaoQPQ2CMz/an5wqMoGdDnnHXL2SaKFVCQTnwu26cYHYxq0
+UiDrUBIqrPd+hLggeoSuBD06Hb+jt3bw45yQAwuZcGqDS40wCInrKlvRszbLXdIu
+gd9XcnNgzB69KXF6szW2ksXvngtkCjTD5UmkMgkJfHIGwUIUDIAlqhWwCE2+UVyI
+DBkyC95xqR26sy2WxcDi0UFM3KsFHpFtpdZv+LzMRyVj+5Q0etMjoeUm0Tw9NVuj
+Kw1iHXAteJ0oiH0cd8ge6eS5wTQDkiMEavmQYbcWzhTX0dH05TBmkDD09Dk5996v
+mN5uxeq1DKZiXZRf+6WH7uFR0PG65ws8UfZ4LYDSBpxxyUhid+e/PEvMs+YMANLm
+gqC1sMU13XnVgsq7/F1WFal/BK20qL5CFVx0RZs5Q/mj45gDI22t2qrpGSpIw5iT
+z+J6cqwlemUPMpEIBeH/
+=D1uu
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-core/qt-core-4.8.1-r3.ebuild b/x11-libs/qt-core/qt-core-4.8.1-r3.ebuild
new file mode 100644
index 000000000000..f3057464127d
--- /dev/null
+++ b/x11-libs/qt-core/qt-core-4.8.1-r3.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 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.8.1-r3.ebuild,v 1.1 2012/05/20 19:51:47 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="+glib iconv icu optimized-qmake qt3support ssl"
+
+DEPEND="
+	sys-libs/zlib
+	glib? ( dev-libs/glib:2 )
+	icu? ( >=dev-libs/icu-49 )
+	ssl? ( dev-libs/openssl )
+	!<x11-libs/cairo-1.10.2-r2
+	!<x11-libs/qt-4.4.0:4
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support] )
+"
+
+PATCHES=(
+	"${FILESDIR}/moc-workaround-for-boost-1.48.patch"
+	"${FILESDIR}/${P}-localized-time.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="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtDeclarative
+		include/QtGui
+		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/3rdparty/zlib_dependency.pri
+		src/declarative
+		src/gui
+		src/script
+		tools/shared
+		tools/linguist/shared
+		translations"
+
+	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() {
+	myconf+="
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+		$(qt_use glib)
+		$(qt_use iconv)
+		$(qt_use icu)
+		$(qt_use optimized-qmake)
+		$(qt_use ssl openssl)
+		$(qt_use qt3support)"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
+
+	install_directories src/{corelib,xml,network,plugins/codecs}
+
+	emake INSTALL_ROOT="${D}" install_mkspecs
+
+	# install private headers
+	insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
+	find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
+
+	# 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 failed"
+	insinto "${QTTRANSDIR#${EPREFIX}}"
+	doins translations/*.qm
+
+	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
+
+	QCONFIG_DEFINE="QT_ZLIB"
+	install_qconfigs
+
+	# remove .la files
+	find "${D}${QTLIBDIR}" -name "*.la" -print0 | xargs -0 rm
+
+	keepdir "${QTSYSCONFDIR#${EPREFIX}}"
+
+	# Framework magic
+	fix_includes
+}