Backport upstream patch to fix the default numbering system for Slovak and some Indic locales, spotted by Milan Freml.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

3 files changed, 216 insertions, 16 deletions

diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog
index 335cbb853a62..0176d6eea1f6 100644
--- a/dev-qt/qtcore/ChangeLog
+++ b/dev-qt/qtcore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtcore
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.8 2013/03/23 13:26:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.9 2013/03/25 08:32:58 pesa Exp $
+
+*qtcore-4.8.4-r5 (25 Mar 2013)
+
+  25 Mar 2013; Davide Pesavento <pesa@gentoo.org> +qtcore-4.8.4-r5.ebuild:
+  Backport upstream patch to fix the default numbering system for Slovak and
+  some Indic locales, spotted by Milan Freml.
 
   23 Mar 2013; Agostino Sarubbo <ago@gentoo.org> qtcore-4.8.4-r4.ebuild:
   Stable for alpha, wrt bug #462636
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 3f50188bdd36..ef1533a7e1c6 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX CVE-2013-0254.patch 2694 SHA256 708714e387b607e4c28182420af42f9169c632c909feef6224190053da0c869f SHA512 227ed44a8e90eb63402cd6658bff1244e3684c4f9757aa9c3cf53e60127f6324a978d82f2de25e6a718b88392d51641e9b8010d313a25a0154f871c0dcc94182 WHIRLPOOL 472b5ca7da456ae9e6c62072be6f6c1fb71c13450d8108745a7f14d5f7511e299377a7cd88f6bf5e03b906259a0a6961115e7012e998878ba306d8a67b4fc935
 AUX blacklist-mis-issued-Turktrust-certs.patch 5939 SHA256 abf2632243cd5b82dfcb2f297908c37ee79e42240a5539eb4738713470658bc8 SHA512 5f4d5be5389b3b2423a33cb09ace4514b53fb96ad0d95e2d02dca7673a9a37b879f739e0988b4bd5e90976ca83ad802ce8179da7433e6ffc3f519a151b8aeec3 WHIRLPOOL ab4a4d61654aa159e82f66d6600a932296f5ee5c0778009dd69f899866a4f1bf3d7b6cb858092f75cd00582fcf357e963e4c7cf0a363ba9bab1cb2455b4fd9c5
@@ -8,24 +8,26 @@ AUX moc-workaround-for-BOOST_JOIN.patch 728 SHA256 4e39ec7fe8084c42ee09d14d2fe87
 AUX moc-workaround-for-boost-1.48.patch 571 SHA256 f8c10e753515cf77a606c88bc97e1536526b1b15431fd1c7c8eb78f28aa49771 SHA512 b192108be3328637bd30279e61104abbdaec8bcc66962a1081abde1188d4d2f67c0674ed12280bad630849d8d748cb9bbc4178878b96e87ae67d8531aae13701 WHIRLPOOL 5e9df8db26a2e4fe60cd8c0483ec39825deb520f9a370a3ccc2723bf6f017c23e8c3d86295f1e5d7fba44ea1d7f0465e6d039066622ebdb39f5d8524b0016cba
 AUX set-pkg-config-locations-directly-to-install-dir.patch 2048 SHA256 862b2be51a7bff1e97be70f1bcdc9b6bbbfbea3f7b7de5805e7320c401103cc5 SHA512 0cdc8ff580ee2b291764615dc9f05f0d8078e0baeedc8e5869f843c11db2755a2c2f2c757dca1ffccb8a3dc07cbdb9c46c1a2e9f6791edb4f1e20675c9bbd9d0 WHIRLPOOL 93da7613c1cc5004bee55dbe4decccebf1c10db2be695ddc80bc5407a097b7a18f58ec31d481d76d7f1ca71f4f7a8dbeeea5108aecea06d50f625896e1a742c6
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qtcore-4.8.4-update-defaultNumberingSystem.patch.gz 7719 SHA256 69e4be2ad4d08067a6bc8708a164822128a8fa8226d90a0be02e89ba537d90fb SHA512 a8d1501223ffbeeb9898afd5ce7fc4839a6155ae2612d796eed674a01bf8d53241d627a60a179bf93cf3e0d338de5468b1495c97843166245f295df559c52b12 WHIRLPOOL f8027c78f1691d1a50b30bcfe53c8750727a1d49dc45233ebeab5a1d7388a4291fe74a9b35bff5417b48fcfbdeadab3dc130fade17012c95ca751d73b2814b4f
 EBUILD qtcore-4.8.4-r2.ebuild 5107 SHA256 301a9502a239084dd24c45b3fb5494e2239c045dcb530961ffa5ff33451962e0 SHA512 468ede9ffb5de65a80f3790cca9806a3dc9773adfc9df17dac958a8f15698d55f9975dfcb956df492e4f5d8c6a239aac5f02e024ad3b20c431ba90d0f10b5f84 WHIRLPOOL 1406bcbf42f6b5f35d2ae1b0fa91234c2d8fa8dce76420c289af59ad441a72dcf1a1671e2d61ad55ac0edb0d3ab27dc8da13399d81ce99ebae940fb3ffc32322
 EBUILD qtcore-4.8.4-r4.ebuild 5242 SHA256 6ff7ea720b618c0d5b6d72dc80bed257470ed5645ac15828205d5e16d3acb584 SHA512 6b57950d7708b721021e3824dff5116ab9aea9078b43ad4b5ab2c6a6d9445761e3fd4325c6b8f9bd5253b57f87e5a7ecde5cf58f2df2a561bae9c17e3df468e2 WHIRLPOOL ee4d147a514134deac6cef8b436e71199bfefb505eeda37ef89b28140673bc16f96548c8683baa0d2753a6fc1a070a6194e964271691ec90202c5e6647d95efc
-MISC ChangeLog 30006 SHA256 6411147faf0344584963a4da6739b4f56161c23a0ea34db80da95ed5adfb954b SHA512 44ddf7af73bab335eb26505d3d35792df33f7cc85a34161a301ee80ce76611a99edf0f45862f35b6c3efc5ca3d40cd68830c6f24f9c2e9e60880c4c53b8905be WHIRLPOOL de09878d44ea378103c9b6c6116d166dd6124e8544a6bc172907e828b4285c704dc5ec446b4a6ce7bbab5eb728ec9ba26ce49c607c39eae98ca50f9c2dc11f53
+EBUILD qtcore-4.8.4-r5.ebuild 5490 SHA256 3b9864ac753f7f5613bf846d644e92038f6f5dc127672255a0f37ce57923aa4d SHA512 047ae8f27595351cb2bddd48062f5f6b4eb2b1df0555196377cdfd6d6ef1a44f4524437d0e6b7946487e42a881e159fd0df7f63e70d9861950f2eb34b270a8fb WHIRLPOOL c136121f35046e0abe304a25ec62f99a18eea4d6ecf9e05e376b1c5c57ff8b6ae04a98e9d207179aa5bcd8029edbc3b38fcaae056c680dec58829cd4f874b3fc
+MISC ChangeLog 30238 SHA256 cb6e136c11bcfca8adf5cd1f96b3b9190be221edda07f7c54ca00fef2add7e44 SHA512 cdbca622e9ca88231d5067041d88c7666a259aa343023e84756e5b3f2177e7142de2599081a3703b0ee6bdde420a8f38ae68102c559aa5124afa773799572df6 WHIRLPOOL de207202a50be14c1d32e5cf6ad921d517b7b10312e256d2233f800cfa7b027904feaa5e9c80b2c8749eaa1f7ada7d0d911246480c190bec97f8b8eaa5faf68a
 MISC metadata.xml 711 SHA256 999402a925dbe1f9d510372e9e03e5527e94e95e1cededaa01b2a8f7d89e2a61 SHA512 ac9f28c9efb0aeebb145c1cfc22d1a3c7ba25b141f5640249c914921138eb309c522392e750614a531bdedf0f4385738a840ea4591785d54cadeb2f1c74a4d5f WHIRLPOOL e2ac4864fcc8b665251fdce4203156f0bba2636d2a170a225c13005c656fce29f49e51dd6b8c6639fa48a11307522887ff26bc02603b676ec20aa826b2198824
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRTa0IAAoJELp701BxlEWfShoP/3VZcLUyiReu6VZiLhClQVch
-UF5ey81LOMs5XjgYRbjUHwn8BvQEUJ4o88/kQXOu0XRevo/NBs/vv4cb9d9E0UTf
-sf83/DJ9ZnfgKd7qX1Jma42rXlk4Dq2DTL7kZnuNEPuWBtAmSHmtQTByd9yQhfFK
-wCXsqF63BmewjB5JttpV8MWr0t7QzjkyyFRAHKctqtWJSy3QQ1aSBbBpsUNwtVrF
-AQOvewlu/QPkvd07HeHlz9Nrx1xYV13vTmPSNf0xp486XK9Cjysd8EpcflX4jvkr
-W9slprClS1i9oPU2EsOHy0nWBsk1Lq40FGxr2R5WQiFchcBxogoGfqIjYZWyXBl7
-cxugi39fjJfDZz6KaWT7MpAVJw+BrmenDf3lkBaQYUcHoMnR2ZklTNq3HsyA2pwn
-0ffUWtr0PgSjdx8qPr6J3ozs1r30h8WADX9wTHZLOIQ2T0gQQIV8KoreHrSk1jC6
-EXEGsD+m6C8XL46xMWsBeenbKiPdF6zCtQ3gPIJDV/4idlzsRVcgyyxvy1A37A3C
-lX/5drJ2WUxslxkebzVBh4MGTBz3TQ48+3FjQYL9SO6jP1S72n1aovUY2az2ONOw
-++7OfHiddEs9ofnW5c6AD0kfWhu2gy+FnLCYW0OTjhkbRAKk+UO61cVfOUSOowSS
-4LUgc2DwnEOMhohV9Pfn
-=2G8m
+iQIcBAEBCAAGBQJRUAvZAAoJENXLsxwXqFxyjSQQAKh+n5FitYKQbHtpiES6jvh/
+manzDIWHn5yHtKh8BsjcFeBppofZxGIxT7G8J5dlJHfAxgCkj6M9QtKZdqF9b8mt
+L19Wjtg3+Mw+AjpArJW78F9Uy4bWzZr2ro8GHdkokOP1lD0kzrQqjNWIq/bDW5zh
+nrK5wc8IfNZQsPP64KframiELkcSFD79JiXi4C4w1cz4pyJriG6lgcg8xBAAk32H
+pyoG1nJN/EgABU1uJjHnWpm1J4uu7fBwVJfWzs8KSCDgmltdjji5aS5WdCDQl13c
+r6Ep6xo9tJ8+xuhlNnQARycoUCVx9AtGpqs4eBzsWXdFVWkJjN3p88Uoa1Ip5+fy
+TNiuooKFEc+4qTJGtTw1uJ5VU7yvjgT1rG2t2Blsx9VtBqrM4eZnHbOoMcZdJ7Jt
+R2g3o63Zej18lvKObmxfR+KN5B+OhW4AD6UFHui+GPeEfy1+KYgbw8Z6ej5c18E5
+vC1OyEL1NFeEqkMs3xyYJUxySMXkByNQff6a5gSQAzxamTe1vTWR8ik7Xw0MAGQ5
+W5s6DXI0sY9J6enVlwWy+P+JT4D/xsz6hrV0iAeWZ22b9OKUhwsgIzxFoXg0yH9k
+jkFg50BM8Ad05QxPMr+rsZ+LvZSyOPmRvvpluwPgBvdM1YevplcrdLq8MghKd+Gd
+6BPrTqzd3w6F5g1BQtat
+=YAC7
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild b/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild
new file mode 100644
index 000000000000..6bc77efdfdfc
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild,v 1.1 2013/03/25 08:32:58 pesa Exp $
+
+EAPI=5
+
+inherit qt4-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${P}-update-defaultNumberingSystem.patch.gz"
+
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="+glib iconv icu 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
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
+"
+
+PATCHES=(
+	"${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch"
+	"${FILESDIR}/set-pkg-config-locations-directly-to-install-dir.patch"
+	"${FILESDIR}/blacklist-mis-issued-Turktrust-certs.patch"
+	"${FILESDIR}/CVE-2013-0254.patch"
+	"${FILESDIR}/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch"
+	"${WORKDIR}/${P}-update-defaultNumberingSystem.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_unpack() {
+	qt4-build_src_unpack
+	unpack ${P}-update-defaultNumberingSystem.patch.gz
+}
+
+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"
+
+	# bug 427782
+	sed -i -e "/^CPPFLAGS/s/-g//" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
+	sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
+		-e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
+		"${S}/configure" || die "sed configure setBootstrapVariable 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-openvg
+		-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)
+		$(use ssl && echo -openssl-linked || echo -no-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
+	prune_libtool_files
+
+	keepdir "${QTSYSCONFDIR#${EPREFIX}}"
+
+	# Framework magic
+	fix_includes
+}