Revision bump making use of subslots for dev-libs/icu, to solve linkage issues like in bug #449250.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

3 files changed, 198 insertions, 16 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 3bc3bafe2795..23103647e9c4 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,13 @@
 # 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.202 2012/12/31 05:50:06 pesa Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.203 2013/01/03 15:30:58 kensington Exp $
+
+*qt-core-4.8.4-r1 (03 Jan 2013)
+
+  03 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+  +qt-core-4.8.4-r1.ebuild:
+  Revision bump making use of subslots for dev-libs/icu, to solve linkage issues
+  like in bug #449250.
 
   31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Cleanup metadata.
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index 80fe5fac7a59..6be5454f28ba 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -3,23 +3,18 @@ Hash: SHA256
 
 AUX moc-workaround-for-boost-1.48.patch 571 SHA256 f8c10e753515cf77a606c88bc97e1536526b1b15431fd1c7c8eb78f28aa49771 SHA512 b192108be3328637bd30279e61104abbdaec8bcc66962a1081abde1188d4d2f67c0674ed12280bad630849d8d748cb9bbc4178878b96e87ae67d8531aae13701 WHIRLPOOL 5e9df8db26a2e4fe60cd8c0483ec39825deb520f9a370a3ccc2723bf6f017c23e8c3d86295f1e5d7fba44ea1d7f0465e6d039066622ebdb39f5d8524b0016cba
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+EBUILD qt-core-4.8.4-r1.ebuild 5041 SHA256 8730c266c0159bc2284b4e94e7b4abd952e555ce46e9dfdf1b89f917009fc744 SHA512 c3841d85bee78f343b42e099df051fb29aa68863d1694a64277d387828e7fd8714343652b310c83a295e0a3b332a211d2cdf9a046e5c2c58d1dab3bbc263c879 WHIRLPOOL b24648ad7f34cce1429c5a15febe4d4477c831d465bb21e145c17b87459eb7e3c519b9074ad4708371d538b779182108271d889946bfb3172ef14359e60f1dc1
 EBUILD qt-core-4.8.4.ebuild 5021 SHA256 9044faf0d72c578556cc5da5888a62ed27be3b7218e41c69fc71d4d44320d1f7 SHA512 0d6477648c101316c367be1f02112186b0d903ee3f8ecd181f18beab30225f72b064fff545f70d6e71a60e4b6484fdc8d10dad5ffc289eb0ec7efd793b8ac1d5 WHIRLPOOL 8a789b414716edfd718e1c6a71a54b7273532a99fdebbe0089dfbe8f495d37489a3a611a8b9a2068e078c886277eb6c837c5f3450ac4ac37101ea179da33a0bf
-MISC ChangeLog 27080 SHA256 3ca93d1cbaa78cc49023c3329335207d0f5a9e7a4ba948b1fd66858f9eaa298a SHA512 55c7547a34b576fc3d1a550dfb4cbc583bb71fb3da6fd68972116e8ca8cf258e61585cae1d5f4297d7dd8f251cb0756a7213453fd917825eca01172ed8bdf027 WHIRLPOOL 1a7136c9f80c8ccd31543f553a311d5c5d189be43d0cb605f6f4c9bf71b7a554013cecb0fc2a31046fd377a08080533547928c2171f19b0645dda38879dd13ce
+MISC ChangeLog 27308 SHA256 405cdeb7267b8de3fe97e263c06272e8fa86c69e56e236a06c50bc7bcd5b016d SHA512 e1f70a94a7060afece7f0542f68326d609ad3fd2f79586bbed48d2cbe01812434bc4de69590c8806605e97016d593ad8897d5a6bb1ed149f1023e7ee8d7bfb89 WHIRLPOOL 85f805585db268dafc960151acc7dc9d768d5642f4df4ffd8b0173a43b53a2f11f6793d5887da2f186917a3e4f189be8397c640c0c81475d1070aea48cf1aa6f
 MISC metadata.xml 711 SHA256 999402a925dbe1f9d510372e9e03e5527e94e95e1cededaa01b2a8f7d89e2a61 SHA512 ac9f28c9efb0aeebb145c1cfc22d1a3c7ba25b141f5640249c914921138eb309c522392e750614a531bdedf0f4385738a840ea4591785d54cadeb2f1c74a4d5f WHIRLPOOL e2ac4864fcc8b665251fdce4203156f0bba2636d2a170a225c13005c656fce29f49e51dd6b8c6639fa48a11307522887ff26bc02603b676ec20aa826b2198824
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ4SeNAAoJENXLsxwXqFxyq4AP/AvuIO/EIKjlqgqpJRg2TfUP
-/8SYlgI3QpJuLK+rSUQW0ipv7Yff5hzbV27X6jxwXtYoIy9uDVH0bnoPsYqurpWP
-NQ2rirIXyvLYQasuFc6JwB3EqHzBB+rJkGPwka9iSBYQAZbafg+d8uCkd5uE4SLA
-5GUkIXaZ/Vo1VpLpe5AkQIZLr1EqqXwAIS6J51zbqMsdA0x5JHnKGwGBH73ZURJC
-w45UAZEfw1+D8rW5B/gbofWTnc7v8vIc8dLBhRsuJG5x0dVCiEbuFCrrmq+0g8zO
-K5RZuYFMRr7qF08qPeQfk+0ECw0iMbD3O6XgI+Wb/+0rgXWkEJOaTux4zvP9f5E1
-MmqWCGoR8CHPRPU2aAI0rIjnTrVjDLpDvjc8sdJk33nU+DyPrmvQexu3RDd8wzer
-fWEEP/Fui+hCZ2xt7jC8J20/hL37Fx7+rHv7dr5hiu3+b2w+MjuotyHHVVwKlNxL
-se4PNi0MveM8u9LONObvVCb7zVLOWmuKBwkYsPK7qNhKN3Cs6BKV4RA8XIORXtPl
-sUBHrjOw9etpkunONfcIRhwUPQ94nl1ahnKOeXH1OAH8bwkw8bgnDqJzaxwGGJkQ
-XycxPPx1qvC+DMHIHxN7w+X3+V8ZyjjNrNeEZCn27NhtU7RcqTn3PGA/nCCaF1aM
-n48Z0bol9/OBDeKEyLpN
-=OQEF
+iQEcBAEBCAAGBQJQ5aN1AAoJEMbwO6tnXQ0soFAH/3iTYwXy0vScKmGcHHgptdeQ
+PkaaEaR6MYdG8Bhnbih2KYoVWICLUjg0wQoP+4M7U3gBmI6SVScYTQ4AaIg8P3gZ
+oJfDusMYjZXkZXVmLsaobNP0h4z3WHHdhQKDgLZH/+REYCm2r/bG5XcsE64S9Cnj
+4ULZTlTcLRQIZkRk8+3TGkj9Io189FZaf4NLE2wbaOl1ATZ7/bBrxUlIGg46mLvx
+DnJIrAFviylwweZjISGFiQKPistaAJAilpqpoXu6LcHzgmU8OUxOvGgFBuFXu9Mq
+iu86odwJ8qfZC2p+t9BpADh3LA7LBLWMl11P5QXSqAbMiAkj+7igEL9dsM5rUsQ=
+=/nUF
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-core/qt-core-4.8.4-r1.ebuild b/x11-libs/qt-core/qt-core-4.8.4-r1.ebuild
new file mode 100644
index 000000000000..c37b952bca33
--- /dev/null
+++ b/x11-libs/qt-core/qt-core-4.8.4-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2013 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.4-r1.ebuild,v 1.1 2013/01/03 15:30:58 kensington Exp $
+
+EAPI=5
+
+inherit qt4-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+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
+	!x11-libs/qt:4
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support] )
+"
+
+PATCHES=(
+	"${FILESDIR}/moc-workaround-for-boost-1.48.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"
+
+	# 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
+}