gentoo resync : 29.10.2017

3 files changed, 111 insertions, 0 deletions

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index e5cd4e1c0476..4e206cdd19e8 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -3,6 +3,7 @@ AUX qtcore-4.8.5-qeventdispatcher-recursive.patch 4017 SHA256 5db36cbb0686b8a503
 AUX qtcore-4.8.6-QNAM-corruptions-fix.patch 17586 SHA256 5309c0f1ed0fc54799537b6d0a51b9682f52b4b40cc76e6fa71afc7273120e40 SHA512 4367974513b230d0395d0d0ebff5007255c257126309b614c37e8297981b833b397792fe9dede1960e0027a87d3fbc5eb252253a7ed73f4f9383531ea39cc874 WHIRLPOOL 8eded4f95d00f2ce572cf1956745d5a06e07f54a6ed6e67578914c0d2c9be63994cbf9177212d25c3c2678bf7328b2364b5977ebb8e8d7b8e4ad79009be6a7ae
 AUX qtcore-4.8.6-moc-boost-1.60.patch 884 SHA256 cf7417eb14641c0e4f65148f67cab2af74ef2f20cb245ef9e21b8a0b2d8f0c0d SHA512 f7375b444291cd0abf5324aa9150e3eb49e110713826e2aa03d8a149d6727c1ff2fe6f6b2e159f3a9e41c628a6d5f3e6ea161050722f58ca0e9ad269a27c052d WHIRLPOOL 7d86baf0ceeb2259fc319d7908f47d2c64f98e490e9bda3930137db5808c9cd0fb2877ac3731bfaaba7ed19a8c014904054b08545642588650b58504ec52e378
 AUX qtcore-4.8.7-libressl.patch 2161 SHA256 c01d0225d593a87d5764993be9a53b0adbf9493487ad7c5583ef3abcb35b1c4d SHA512 c84b827fd5f0c504c9ab95352677dc2cfe926c81aa012b454d8260385215b510835ba693830b3a3a6fa374b299995ec14cbb07711f41031788fc6c3bec396021 WHIRLPOOL 26274cc870721bcbb364a3e41aa95af0d7d5561b0882ca4bf058c036a063fe3fa77072f09a0d84ffb1f0a6dab2201d03c8602a2d5f7815752cfdb9180e2689a1
+AUX qtcore-4.8.7-moc.patch 926 SHA256 032978c364ed669842fc06f03f28b08ad8fd5a19afe49bd6e6f2b5b5ae262ebb SHA512 cb64e3e2271d3031c11d2c8afe1bcfd5263bcf8b8c787d03059b4bca25f3dd2d8a092c80cb396a1a466d2ef667697c31856c7c675aa7c48b5680f5e91db95f86 WHIRLPOOL 588f6fdaa43f8d65ece7ae2ec1e20d7f797d4dce6cdd67bd05d2c27d7facf28c598c7e191a118e1433cb1d1e5c7596073f552568d6683c69d07db9e9e79ebaf0
 AUX qtcore-5.6.2-plugins.patch 3264 SHA256 2e0e863830f457d597e608815e92c25e4e0924a7c13c80649547e8a9be6bb420 SHA512 0d50ba6cd94fc29158931e2e09ec21c48780ecfaa75443efd842cce05cc3030f81a02385714b42d5cede3b0cbf8efc24d3c660ac4438cdd428a24bf8a624bb2d WHIRLPOOL 9ea062360162c636f43d7b490a3ee3931496b05001f9f0c99d588494d344f0a7a9d0e989b5695e468ec754e7bc789b2c2961db221701d8adf984efd691ee2a92
 AUX qtcore-5.7.1-qipm.patch 5915 SHA256 a5fb3bee98d797ac5e34bec02bcc1b5b0834fa1092fa6d1e1ea3d490975ae42f SHA512 807c030c2059cddcd159cb537ba2e4be68d6f612f45e1e7b844fc045f661739aea7bc35743735cee364d692d51774e17edced1aac8d444abaa4e4435117a5b3d WHIRLPOOL e13e1a24b750fe7729b1d86214491358937344b7a39c6c2941d372f5ce9077ecc1c320a0be2e5a9c772e1b01d786e55176cdad252c317bc62215c9c7acfe0d6b
 AUX qtcore-5.7.1-qsfpm-1.patch 8922 SHA256 3376b4564d793e0bf3770a8ebcc474a03e7aa49a8a578c136bbcb1fa6e9e136a SHA512 3854fffa1181cebe4683c54d5e774301a8710bf784dcc18367d04d193a7ce76fc6f634096b6986af41c3f5e4432b702873181a8900fd18e7617ea472d23d6d92 WHIRLPOOL 0ae27f2596e8601a4717bf76d06a2c452f4a0f087355766e7ca9483c8959ddd2c0765a6154ee1dde612347fb69ddc28581121c64cfa6f97a3067b1112bdb86c3
@@ -14,6 +15,7 @@ DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201d
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
 EBUILD qtcore-4.8.6-r2.ebuild 2744 SHA256 968b23f5c563cd96ff65a62da9632e40dc64d1b6f44a8918109ff3be1fac2ff3 SHA512 d5ef3b214ea1c8569d56383b6c0400435f3244a5e22792cbdfaba5147c7b746f96b83dd8fb035c01e8dfe09474f414f516e8f80e8aea489184d9bf01d02f4949 WHIRLPOOL c96e51c2e79ee21b4c286a08ae21364b1a03cdc4b8efad290b8d7160a1f57f0d8ffe5760dcb2693c6ac55fdb8d70f452f42b8602e2d26c20614aac1e2247260c
 EBUILD qtcore-4.8.7-r2.ebuild 2864 SHA256 7461eb354f481eb54958681f620ffb3280ee77e032c7b458f942f44693092a47 SHA512 9d17ecbdc61d4a32313b57939b2791852a0e041bcf21ca3a2d1b1e64c2111d63085c161a50ecdf94cb2dafe3a724f2ef9e259a0f85e85ff43cd12d26a8527d51 WHIRLPOOL c2e11e085b11cd47da1e7925c3337f27b4ad5174e4333ad06cc7b7877fe18eb63953c8422b3b2f11600a0e2dbc7e813902afc4fb10beb364a73818c079e491bb
+EBUILD qtcore-4.8.7-r3.ebuild 2870 SHA256 0a7a3e4ce75813f2ffb5e27f4e0d94bb66eb9d9e0403cc1ab59ddad974dc6cc9 SHA512 b667ef5eaeb44dbb5d5b97017e5f5bfcd9d1a0b3ba821f0b2bb146430030cb8cfbfaeaa519cb5f4af9d35ce9125086da0010e94bc987769aeed1e5bd3ecd16c4 WHIRLPOOL a07628361e7ebf8e8f64eea07e3f960b1650abfe6c635ab5d1c8d4623fd2d9ba4e293519b878ab955eba2bfa0d1b5416a0a56b4260ef89fd28b65dd7f9d5e405
 EBUILD qtcore-5.6.2-r1.ebuild 783 SHA256 15cb9ff991a709c55bbd21215937034b519c8ff22bbdb05052ce8db3f914cb30 SHA512 3f3ff0c9abb107de70d9b4e2b0319652e58f5aeac2a91554fa92edcd71137e295075c456bfdaa5901c6ddfc18fbdd7a94412e27fc537f042d78d83426b72eecd WHIRLPOOL 476519404c4485b589442af4e12c7288f4f65a5e7b8e635fd3e7456744970691955a5851fe0cb96e5900c837e1e39deb85e10402a4bd643a6646866daac6815d
 EBUILD qtcore-5.7.1-r3.ebuild 896 SHA256 5e5147a1845598ad8ca5dd3adc0a48e0f75c2a83ba4ed55f4ea688005babf53d SHA512 bd5fd8e6a9a189773f4c5473d0073709f034b661a28296a8f4d3cac4d26eaf63f04e4b0d08028810b77ca10bfe8c67aaf6c4cf2da7a436e2b29f9b04024cb158 WHIRLPOOL 142ea4799f6d8d9795f2f63b3acf7c38bb6c2b879e03589df1cc4ee5f1adb8146054a66f92cef22adfeaf7ed72f213cab4fdea5f98f58c3661476a95599c13f2
 EBUILD qtcore-5.9.2.ebuild 1389 SHA256 2a348b867a9f2698d76dfbc29fe88f869a7376498c4a329d76da7891ec4a7b03 SHA512 b51328052f28e8cb5f48ae59834553fb995099245a0e6b3390fa0006b89620a889c45b36baf5f028ef1111b87597380c940c6df0a69a14aac07ca6824d795fc0 WHIRLPOOL 62325390101aeeb78c53da2113be3b461558f062fabfbc676d480927bcd98941f36ff69b98de52fd0a3586cfc802e1c6c35a13f5ffe1f7ffb3aad6f9ac01c34c
diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch
new file mode 100644
index 000000000000..7660dedc1630
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch
@@ -0,0 +1,17 @@
+diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829	2015-05-07 09:14:44.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp	2016-03-16 13:20:43.145899869 -0500
+@@ -188,8 +188,12 @@ int runMoc(int _argc, char **_argv)
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
+ 
+-    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
++    // Workaround a bug while parsing some boost headers. See QTBUG-22829
+     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
++    pp.macros["BOOST_TYPE_TRAITS_HPP"];
++    pp.macros["_SYS_SYSMACROS_H_OUTER"];
+ 
+     QByteArray filename;
+     QByteArray output;
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
new file mode 100644
index 000000000000..d4979c7760e1
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="+glib iconv icu libressl qt3support ssl"
+
+DEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	~dev-qt/qttranslations-${PV}
+	qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/qt4/Qt/qconfig.h
+	/usr/include/qt4/QtCore/qconfig.h
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
+	"${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
+	"${FILESDIR}/${PN}-4.8.7-libressl.patch" # bug 584796
+	"${FILESDIR}/${PN}-4.8.7-moc.patch" # bug 556104, 635394
+)
+
+QT4_TARGET_DIRECTORIES="
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/uic
+	src/corelib
+	src/network
+	src/xml
+	src/plugins/codecs/cn
+	src/plugins/codecs/jp
+	src/plugins/codecs/kr
+	src/plugins/codecs/tw
+	tools/linguist/lconvert
+	tools/linguist/lrelease
+	tools/linguist/lupdate"
+
+QCONFIG_DEFINE="QT_ZLIB"
+
+src_prepare() {
+	qt4-build-multilib_src_prepare
+
+	# bug 172219
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
+		-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
+
+	# bug 427782
+	sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
+		qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix 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/' \
+		configure || die "sed configure setBootstrapVariable failed"
+}
+
+multilib_src_configure() {
+	local 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_multilib_src_configure
+}