gentoo resync : 15.09.2018

8 files changed, 81 insertions, 6 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 5bcae233816e..d1681629e65f 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 00fed7bc28b3..dd9b263f07f9 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,5 +1,6 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtcore-5.11.1.ebuild 1512 BLAKE2B e0a3c39ed489a4b685d6aa1a100b6c20589b1b8b72b564a15697bceb842928159566d290ab4c26bd6fac09d23057fe0150defdcbfb0485d9aa575a4c95f7aa4c SHA512 40946d4b88a0d1f7ca883b13c162c9866105a76ed01ba5c941d2c5041ce379b982793d0b29b359f38e7d027a82bc92949bdb718f52cf0cd1b6845b4411161905
+EBUILD qtcore-5.11.1-r1.ebuild 1504 BLAKE2B 098e1da5ccaa1c453921fa1d50f209cdd67d9ffff8900e8d0c1a5c4ccf49d5788b4c74112931cec1967c86ac9b19a7f1a152bf04f9f6f88099461097cf54a56e SHA512 c52096cd039803fa4a33ef4845925e197938a7543f7e8418516acf4194e8110f7c91eb43572f60cd7c67ca718f8a069ad057376f2a1b6dbf48752f340ffbecbf
+EBUILD qtcore-5.9.6-r1.ebuild 1504 BLAKE2B 098e1da5ccaa1c453921fa1d50f209cdd67d9ffff8900e8d0c1a5c4ccf49d5788b4c74112931cec1967c86ac9b19a7f1a152bf04f9f6f88099461097cf54a56e SHA512 c52096cd039803fa4a33ef4845925e197938a7543f7e8418516acf4194e8110f7c91eb43572f60cd7c67ca718f8a069ad057376f2a1b6dbf48752f340ffbecbf
 EBUILD qtcore-5.9.6.ebuild 1508 BLAKE2B 34ba4a5cb00b733481fa35cb0e892f6eba653f4693d24e06f8c3dadf436255d6ab33f6327a14614453e7d88a8c4c1c988fdbc16c7690453051012215c0f50b07 SHA512 7c511688ca6323acc9d7f8e97074b69a25548a8203e2dc9c8b68a2b8c0cb6950e4e3c20fd41edc1a9dfbaa59c5394ef8f3611957624179c57ceb27a962559eaa
 MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666
diff --git a/dev-qt/qtcore/qtcore-5.11.1.ebuild b/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild
index 3c04e6e737fd..c3da14471f41 100644
--- a/dev-qt/qtcore/qtcore-5.11.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.11.1-r1.ebuild
@@ -59,7 +59,7 @@ src_install() {
 		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
 		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
 		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
-		XCURSOR	XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+		XCURSOR	XFIXES XKB XRANDR XSYNC ZLIB
 	)
 
 	for flag in ${flags[@]}; do
diff --git a/dev-qt/qtcore/qtcore-5.9.6-r1.ebuild b/dev-qt/qtcore/qtcore-5.9.6-r1.ebuild
new file mode 100644
index 000000000000..c3da14471f41
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.9.6-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	!<dev-qt/qtcore-4.8.7-r4:4
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/qfloat16-tables
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	!:network
+	!:sql
+	!:testlib
+	!:xml
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use !icu iconv)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	local flags=(
+		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+		XCURSOR	XFIXES XKB XRANDR XSYNC ZLIB
+	)
+
+	for flag in ${flags[@]}; do
+		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+			#if defined(QT_NO_${flag}) && defined(QT_${flag})
+			# undef QT_NO_${flag}
+			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+			# define QT_NO_${flag}
+			#endif
+		_EOF_
+	done
+}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index fe8506b3fed3..ebf62e4e43e7 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -8,6 +8,6 @@ AUX qtwebengine-5.9.4-jpeg-9-2.patch 1295 BLAKE2B 93fdcc0a69fa39c85583dcacd3052b
 AUX qtwebengine-5.9.6-gcc8.patch 1184 BLAKE2B aea72fb7563517f6c1f0f1330bad21ae71bbadc7b74e13b5c9280074ba5ae642be1df6c6e3014464f4b9aa26dd5620b5c5ef5b7139256c6a48fe58ed911e54e0 SHA512 21e79c6fc1575728d658c31bc68da66a5b9840c6fee7c442218ec8ac6009d5df1436bea931aa56439965987ec1ccdac32afce2b0a246c3d7bb2d0b0536717be5
 DIST qtwebengine-everywhere-src-5.11.1.tar.xz 233633572 BLAKE2B 06fb9d490377ebb4af937e0fa1688cdfeb9bfdadf6c80afeef609d20a76bdb7c4fed6c1042405b762e59b11d7b16369990c66a395ec1b6b48bbb1ea5b8cd47f2 SHA512 3e17f88b690c06f6d28c30d8d43588eaad9b0b214434b219c3d8fe11969cca515a68c731d176cf640940fd3db12e95de8f723d3717555504c5b95d135fa4a596
 DIST qtwebengine-opensource-src-5.9.6.tar.xz 216733460 BLAKE2B 6f6f4d89559899b7faa6c8a31187967e5dab357d63f6c096953bdffa9ff8e8299f22f3fe97bc5295093a89200b38f47b4b214ff91765f8da3a992c5058f06e1e SHA512 493e9b4fb7274253eca107bfbb6ff044068c78997299c48b62a504ba5511c4d3e2a7f481d986f34c75d035e4804b18f74bf6a4bf0daf0f6a5778abd8aa7ee68a
-EBUILD qtwebengine-5.11.1.ebuild 3568 BLAKE2B 736d9eceb5303b8cde3e5d27a43614384bb5721b2a2b1be188b74573c4dc3c90df0bfb52c3bbc562cbe6243a0512bd294aa9bfc307ad93ab1d639d491ac484d2 SHA512 b80cfda48edf3e64e008ce9f6c812e684fe18ac9bd585e9a3888031638b88bc314472612326b3643e7b4158bf7f3fc04d7ab4ea96d271955f14e015f73df0f12
+EBUILD qtwebengine-5.11.1.ebuild 3547 BLAKE2B 8447731a8eecedf77413cb0013915491689502a2606578b128397d4cdd20a94d56faaf3616831158b3e256c9f3d05ee22059bb3029b769ec43a17ee0c03c2d5b SHA512 f0110153927e6a9112e143077ea2e52a078367328577586ece5e876eafd0663d9cc3404040f0a5b7a997f5e04161bb45bd3c5d89b29e83924c843d5e4f981e49
 EBUILD qtwebengine-5.9.6-r1.ebuild 3411 BLAKE2B 146d96022668be866f724a8905c82ed139a517cb68492dd97c554c3389e97b7fa4125afa5b4ca343fe4057bccc9efa25566ebf76d26d9e40b43968838cbaa96e SHA512 6d84cc73e712355e3c0069d753556f0f9e8e64a89a4574bde151bc776fecc67f01923c973af64258163ebe9d5950582c6bb5fd02ced78c121f86e3c6907a7066
 MISC metadata.xml 1096 BLAKE2B a4b3f106b5a3ea4468e6b1b5b458b69f310b0a89b02ab6720d13a6df727686570385f065caf84e782a4043b9027823dbabc5ab67fec209db97139aad64aae1ed SHA512 e3864852c1da88f27b5d384ac2b63b2e93551db73242be03283dd2a23dc27835f05cd7ad8655053b24a06a7d402c3ba1142f49d3ae72a2cdd4cb778b09e8404a
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index ba14ab9efae3..fc11c5106e8c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 	media-libs/libwebp:=
 	media-libs/mesa[egl]
 	media-libs/opus
-	net-libs/libsrtp:0=
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-libs/libcap
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 4f2fd1c44cb9..9a71eaadc473 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -4,6 +4,6 @@ AUX qtwebkit-5.5.1-disable-jit.patch 460 BLAKE2B a5ec0644d7f4341993cfbec916bc3c9
 AUX qtwebkit-5.8.0-disable-gstreamer.patch 714 BLAKE2B 3bb7ec6976934e20d016fc6fa0421cab5d6ce51731a0c5a12b92b6e1611a75396f9db751074f7d9ffdb1c000b1964689d69606ba16e29f3ee5329d141dd3c90a SHA512 7b47d5e549f8bc0113bdff596a191fff3f8c6deafd6ebc456e224c1657a07e0208c478fdd49b9790ef618371cb969ae8aaaf08f9c5f9eb10b5841817f0f8736d
 DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
 DIST qtwebkit-opensource-src-5.9.1.tar.xz 35300628 BLAKE2B eb64f6345e14698d176958faccf7493073e177ac8c2e25b44f02c09df6b45e4a069e2c86960d9fbe497f7d59099b25d021743437276c1bd6bc8fd0593052faa2 SHA512 79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5
-EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3734 BLAKE2B 968071383f299ca4247a7d69a708171180716441e62696d4b2b5eec1dd7a442acf12c22f9aabf7063813a8d288886741f2a7c45954fa34de416b72e030ac7f43 SHA512 b3c6e91bb5309121527cb85d6ee68024cee948fc36f6222f2774810faded9d1dfd074ae38e7daf701978224cd5f340ddc11f2e79327ace05cc791290089b2725
+EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3685 BLAKE2B a366f7f3d67305a85cffcf088e2c8f7f39c7c9918662716cf810863449d636fad8035d43d567dc6e83e7931e22f9064fb2d3c92f1d18cce323ba82de6877af7a SHA512 3962ca7f3fae7f2819c20a2d66e396d5d9a034d8b5b8eb7fadecfc04b388f807fa1d897cf876fa74fff91e631c311d763d7728fb33fa6db28ab7f66e843ab912
 EBUILD qtwebkit-5.9.1.ebuild 3503 BLAKE2B 0bed04771bb14fbea809c3a2db5254943883f34b971b459c3c2a3f008660b24c4813b800cd14bc4a47c1d807ed17725e16eddc30f6f50ed62cf678931d6e2f87 SHA512 5b80352dcf1f6be843cd94b90c90552c06662494359b1d84a91e495274674fc3bc9a807e8e86d67da96ca28e00c7a74590a250e74d845183ff53fd002bec51c9
 MISC metadata.xml 1374 BLAKE2B 582f07a66b4dd4ff72e865c69596a364247bffbe1c11ea4a77c38c8b1dd6af6062a97889116387a251e890aee572724f2293e7b281fb5200fa3b3c1b91d4ccde SHA512 6f845148e018566a18f4dc86f1ff2224c45e5a135083263f7335fb0bb7a5ebba620787485ac1746f5207854b752be9ab3e5385b4fed63251359172bd4c196742
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
index 038f92f9ecc6..4d9b8362f179 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
@@ -12,7 +12,7 @@ inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-singl
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
 HOMEPAGE="https://www.qt.io/"
-SRC_URI="http://code.qt.io/cgit/qt/${PN}.git/snapshot/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="BSD LGPL-2+"
 SLOT="5/5.212"