Qt 4.8.4 version bump

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

3 files changed, 189 insertions, 12 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 87d276cfe638..87fa48362d45 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,11 @@
 # 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.190 2012/10/14 17:12:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.191 2012/12/05 03:14:14 yngwin Exp $
+
+*qt-core-4.8.4 (05 Dec 2012)
+
+  05 Dec 2012; Ben de Groot <yngwin@gentoo.org> +qt-core-4.8.4.ebuild:
+  Qt 4.8.4 version bump
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> qt-core-4.8.2.ebuild:
   alpha/ia64/sparc stable wrt #424625
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index 30e7167c95c3..bfbdf66aba3a 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
 AUX blacklist-diginotar-certs.diff 6153 SHA256 461a6c1b0618119251ab03ee668aaa93f6a8b8ba1298d8eb928f87df70c76d75 SHA512 ec8bcef856a1aeeccf3b3edaf08cb441ef46edadc8704c8898e115647abc83608f1b89cde72a0164e92638ff95b65b6e5a9c68c07f0b8b9ddc12db57d008315f WHIRLPOOL 011787e35e85239e69c5947ea9574fc8c66d52bd16bb5f5981fecb76496cc6b6c106f8ff09339170717cca6942a2088ae00292b56247aa2778063b541cc3540d
 AUX moc-workaround-for-boost-1.48.patch 571 SHA256 f8c10e753515cf77a606c88bc97e1536526b1b15431fd1c7c8eb78f28aa49771 SHA512 b192108be3328637bd30279e61104abbdaec8bcc66962a1081abde1188d4d2f67c0674ed12280bad630849d8d748cb9bbc4178878b96e87ae67d8531aae13701 WHIRLPOOL 5e9df8db26a2e4fe60cd8c0483ec39825deb520f9a370a3ccc2723bf6f017c23e8c3d86295f1e5d7fba44ea1d7f0465e6d039066622ebdb39f5d8524b0016cba
@@ -10,16 +7,11 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341
 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843
 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-core-4.7.4-r1.ebuild 5173 SHA256 5bd26485ff70124ba2dd7f529f39c495f79d3577845b917d580b87371c9fa8be SHA512 3327854c067605cb9f5bbdcf73844ff80bafca854b36a94e1f1903242d7b61b3f339b38f86cac01f5944d0225dc146f9edf58eba86c03cfb4c10223ee2da981a WHIRLPOOL 635f612d97faf210028d9edac8369b4b7decf7432e9ef83753b1e4e4506f08930fe15863a31c21cb1fe4b6525d0ed7d78a961518b517eb1aebe7328054513497
 EBUILD qt-core-4.8.1-r3.ebuild 4681 SHA256 aab21e25ea90adca35a99f4d7d09473d982ae6f20490d427d0dacc666325137b SHA512 9e2404c6856f1b4c61dec834444424846e42f574d1af1f84fabc2c83f915320f27bc337169508a342972d4fdb9d67abda7bac7c13590920de9d585c691a93b90 WHIRLPOOL 82b5b0677f32c753b61699370fc018edccc18a366b2357483eefbec044b0b1bed1f756591f4c14026cba01b68c38c2383d21d58a6d3f27701159152b279dd27b
 EBUILD qt-core-4.8.2.ebuild 4776 SHA256 22d379e52886cd7135b916e5410afed847e3f993668a017cff348429f895639c SHA512 3818291d64b93746a646fb71e7e245cadf11f257278e0ada043c62ee5f7639ef478943940e997f22d778c6b465f117d7967cb77aeb6efe299057e987af97efb1 WHIRLPOOL 2794d273c47f199b380c43b663c611a512145470f5ee05744ad8d4453d236fe0a4f48f70702bbffec113e53fa185aecddafef1ad8d48cf3d8b4bde6817101b99
 EBUILD qt-core-4.8.3-r1.ebuild 5115 SHA256 3e3406b94225ae501e5c6b4e3c9f5649000ff7253711dd50fce40834a642eb79 SHA512 b664bd28b62b6c2e75d3e0f5e1449824cd689a399af0c4122b4883378b1f02a876a2453b4b2bdd57d6041ee00c52b27d8f8b60e740b98d65c41deb784f50d575 WHIRLPOOL 7dee70d30a1d969694ffe62ee22a83fe3da703a119b5284d0425b1ed248d4f46af7b14fb1cfea60fb420d6850d1c4bbbf0d80197312d207ff04a29da57f47fe8
-MISC ChangeLog 25568 SHA256 c13e4344ba1d203653bd8158d81cd1bb6f7c069d022f12c59b70b83fcdf71a93 SHA512 ffc513cacc93a961a9db046a3ad4de0dc377509575d0f3296ab9a2bfe918e2778f918671228f0bddb98fd8a8092f356e6b5cf5ffcf660899f60ce472a21a9a57 WHIRLPOOL 65b6dcd785f26164fc66658864de4d40a35333a863f9ba8ea37b0748ae860c40d961ff6215a78b60d32f97618f6bf8900f4c2eb61c0d9cfc418757fa6d3b69f1
+EBUILD qt-core-4.8.4.ebuild 5032 SHA256 d26a7eefb6d13028025e94d50cdfe7d114e451f5e47380dc11f7320b905598bc SHA512 175e8e06e47b0ea5b12c96a77d5727c4cfb9329ce93f518561c9d0a3017d01b511644a031ad3c3f183ca153418cd44cd88c589598321a07a4feadbea3263670b WHIRLPOOL a0fe7ee95f6df6598234b19682e489d430e8d819747abf230d8354942e546b1fd43c8da4790eda1aff2ddf5f3d7fa1883937590f330ef1c2dba5928d0048a700
+MISC ChangeLog 25693 SHA256 1138a569aca3009d7fff9139e0417fe4970e4925f09b35f5743c12333f8d772e SHA512 8c92f000f08a1a727255c9829c8e7e659bbbd81968fa86d627613488282a3e5116562f5ab64ed271a27d906f715e7d809e58ed8ef2b3496ea928cce4be86c521 WHIRLPOOL b9ce73d5bc09959f5c2d239585c486b4d24d20b59d5f3902b8045894ba638f030eee5a68eed51f977322323c18390d19423ad0c05d925856d2e394150b1b0b87
 MISC metadata.xml 962 SHA256 5e48f820fb8a186626c8816f7f143667495a43bdc5e2765f628c2134c0034638 SHA512 c1598a11c993175dcc9fbb6c3af19bafca74a39122c1d769b6f0cfb73a168e729d14edc46adcb2ccb638c3eecb10dad5a58f9070c178b86447a6ccdd2eba5fa0 WHIRLPOOL f10d5b7a5f20535d3d7e410d9a923afb34e2fc8151c45aab8035a326127a3cd511f2ff843f0094495a53c200b2242635e8d8f52e9dd08d7850014957b872e812
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlB68ngACgkQuQc30/atMkDZ6wCdHC/fZ3xDJpnZC/E8kzHeA0IJ
-JSMAoLOgNJpz+dZ2raQb+HTD6cmbRben
-=FnTZ
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt-core/qt-core-4.8.4.ebuild b/x11-libs/qt-core/qt-core-4.8.4.ebuild
new file mode 100644
index 000000000000..88eb6ef9d9c3
--- /dev/null
+++ b/x11-libs/qt-core/qt-core-4.8.4.ebuild
@@ -0,0 +1,180 @@
+# 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.4.ebuild,v 1.1 2012/12/05 03:14:14 yngwin Exp $
+
+EAPI=4
+
+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
+}