gentoo Easter resync : 12.04.2020

6 files changed, 95 insertions, 96 deletions

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 40960afc58b6..0c2cee223659 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,10 +1,10 @@
 AUX qtwayland-5.13.2-fix-crash.patch 2173 BLAKE2B 80e797f7ce25085cddd4d9721e61cc94c48ab7310a9cd7f357bc0e6467f759a5c313564af808d4f5d6ffd1b5231731df5a69a6c01f876be6d9e53eb73084b23b SHA512 0071413c1bac608ad7591bb6e6b329424ed3dfac6cf1826cb9cedb512df83563fa995964fffb6e0b8ca47063b52835ffa8aeaf5612dbc72c0e916bd353c03965
 AUX qtwayland-5.13.2-fix-linuxdmabuf-build.patch 1052 BLAKE2B 7b184cbc66f5dab2dc8b640ae307f647bc4aea4772a5e74c5ee2be652ed2a90d6e682c4fafb9944d027022686f2be0cc666b2266051134ad57d7194f18eb48c3 SHA512 3c1c2b13c2ff632469f0e1f6c2d642303d359368343e679726d61357d8e104c483b6b3259f5e3b11961f64257f9d10b50d0bb2aa7d166eed5ffa5aaebcf58132
 AUX qtwayland-5.13.2-fix-touch-ignored.patch 1274 BLAKE2B a643a7df480ddf24939406a6479edb10a615ce031e249325c8509140c65c1377d58d37d29056fbd92cb0b943a01c4be0ec1408c5924e3bde8d07d8a100ae8554 SHA512 abdb8201873652510615e4d4db7ec3b415ba8f4f9db5b6258a4548101a25ea46c131d8bbb7d0d615aa4de384546f3d8ba6f299fa3fde3b0fbe5427b9e48103a9
-DIST qtwayland-everywhere-src-5.12.3.tar.xz 432304 BLAKE2B eb2ba520c651467c8ed5f0d870a69c9b07047cb4c05a0c889b36abeab30149861b83ca693efb0bb93dce4f5da5913afc3c8b61933ef0e8307d22b64fce530d87 SHA512 e66f9f41c15cf84165e559a1ff09e20ec21bb3f909b57fab08b0e3f8f9eeacf75d49541b499b1a6514a34d1ba5dd426ec1ce77719910588afa12cb3a7980dc90
 DIST qtwayland-everywhere-src-5.13.2.tar.xz 495536 BLAKE2B eb4352d76caba9ff1d217950b8be40edee1b963a085ca129938ade0d3a68569856bc1a745951d3731c81182b341704568a5036551693cad5926a239587dd506b SHA512 5eb895c2ef8e2e72b71fed027f760913bf754da213e488a6103d9034170a6333f034b3488115a87a5a4e90761425487b9a8ab8e84a68e2e614c159d747408d53
 DIST qtwayland-everywhere-src-5.14.1.tar.xz 544744 BLAKE2B cc74e6ac4519484713795169a91f18ed2535684bf604d12ab900a0fb2502d30c1fa4fbdc5899c4a32505e8f4b2be142d3b16540b6797c1624deac097d45ea41d SHA512 6cdfb527ce8160b562343bfb3959dfcd8ccc91a50817756547f4a0559b77372bee7587bc2e4e658e15b58ecb52c6eb0ef2193e30a285d13c4192bb03a1149cfc
-EBUILD qtwayland-5.12.3.ebuild 1104 BLAKE2B bb4b521407462f24a4e438a3d91682b8b976422ae2c661905414a7d156dbe6a409c97297c61e247dd3c208e98826f1db3acbf45ca99f4879aca7f4449c5ac10f SHA512 e8dbf7139d9059fe0970ad660d329b35191542a541e3f2ddfbe5ec3d14fb9261713d0dd6c131adf4909d8b1d109aede77254156c7c5ef7054903522bcd26f2e1
-EBUILD qtwayland-5.13.2-r1.ebuild 1353 BLAKE2B 23009b3f906ac833d9774623878c57793dfbaea37cefee47e8d984482c6ed2ea3dbbaca170a8ca310545b0de4832545dbf94fd77ab2ccbc1a5c0a1e251fc689b SHA512 8cc4e5014c294c609e1a4ec8d149e700d3cba63a438daa5fc719ca9357ace304d03084ff7e841773e7cbfd8908316eaa39e0c436a3dfcb805de002325af08d2b
-EBUILD qtwayland-5.14.1-r1.ebuild 1364 BLAKE2B 48aa884d5d77c18c7134ddcfda733ebbc2c4c23da5598faa89c6263b785756d4a7d42b6e37cd79228ae8812df9003c48c7bea7f747f8637b87982c5ea3a16cbc SHA512 e97c4eec05b4fb4cab85f28d4eb7ab0e8cf3944aba02ef490536e2dbf0dd5814c92c82f0dc17cb6390906e30adde0f50e5541357bce0c25cb33dc12b40f34826
+DIST qtwayland-everywhere-src-5.14.2.tar.xz 544532 BLAKE2B 13cf07116737ec2fd301f51f517cbc062fdd42b800d6d2739193f3570f1a9552e66e9909de15c22cc530d5284c3be9ff24915ce4b36f529ec6c22faeb0edff58 SHA512 0f396cabace17f099c2f2c0be54317006dc00c5f4be08cd79a4fa4fdc94362f63cc6ce9decc7feb63f566dd2ea52d562257e4bb23332557054418fc16dc7e899
+EBUILD qtwayland-5.13.2-r1.ebuild 1320 BLAKE2B 9344c1b8e41ca9e15709de22b0c3c02f154e75441a58494d852d08d13fa179d17336380ab8fd4480ad2e1b8ba62fba2da71daee86add5fb2eee3753754539ea6 SHA512 76b3880ad3d064d6d63a34695f3e39552bcc13afbd67aae94dfe89e6d0e788a4f65319ed377de1567afbf70fd51cff5a2e6b591bcde119911dd77dedfa47e502
+EBUILD qtwayland-5.14.1-r3.ebuild 914 BLAKE2B 4e32f25761bdf73ccf6d5b2a4351e155d272515584d97c858d6057df871ee3aa60237ec73ee5a6c3a9274e41ac0df0ddd8dbb1da4497e640e9ba5324cd16ab9c SHA512 41dc0ea2242c0b55f8879047f221b97067f5e47cf5b29af67a3d99cba62f6cab54039b72f13744395fb6aca66f3858c60b1982d6d60e6e98d6552af0cda67367
+EBUILD qtwayland-5.14.2.ebuild 919 BLAKE2B 415b0adbb5f67868266485c5d5874286a9d4545b85dd6016a8e04963ecfff5e6cc1ce11464ebc0f19ddb007f0958ae1d5b7ab3e71877035549ace86d61ed1bfe SHA512 a39274d6406da64ba6726a752f8c51ee2fd1b4d2786d65da40089657dfad7f9f7f3f5dd1adde0cf4a0a5c93670db6ae64655d1fcc27979e37c78f182aea49db7
 MISC metadata.xml 680 BLAKE2B 4ec031890956f3b2cfcb6c53678ce58580ad11416f1a4b3c20c5fe07d5e8bfa4c06999bce68491487a3d3fd98bc5994472138cd2bb10d012657d852d74c01eec SHA512 b76508be78d0b3976fe4d3e7af103dd0b0749fbcd84a63ffa7d97e527fbadbd06973ab4af18a37eba4e6d256512a1e2453b90c990f288b994cc6997cdabdefd6
diff --git a/dev-qt/qtwayland/qtwayland-5.12.3.ebuild b/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
deleted file mode 100644
index b5a4ed7dc206..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="x86"
-fi
-
-IUSE="+libinput xcomposite"
-
-DEPEND="
-	>=dev-libs/wayland-1.6.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput=]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	xcomposite? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_config libinput xkbcommon-evdev \
-		src/client/client.pro \
-		src/compositor/wayland_wrapper/wayland_wrapper.pri \
-		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
-		src/plugins/shellintegration/wl-shell/wl-shell.pro \
-		src/plugins/shellintegration/xdg-shell/xdg-shell.pro \
-		src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro \
-		src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \
-		tests/auto/compositor/compositor/compositor.pro
-
-	use xcomposite || rm -r config.tests/xcomposite || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
index 289fe1b38f5d..c7be17907c21 100644
--- a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~x86"
+	KEYWORDS="arm"
 fi
 
 IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild
deleted file mode 100644
index 5fa75b673a70..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="+libinput vulkan xcomposite"
-
-DEPEND="
-	>=dev-libs/wayland-1.6.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput=,vulkan=]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	vulkan? ( dev-util/vulkan-headers )
-	xcomposite? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_config libinput xkbcommon \
-		src/client/client.pro \
-		src/compositor/wayland_wrapper/wayland_wrapper.pri \
-		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
-		src/plugins/shellintegration/wl-shell/wl-shell.pro \
-		src/plugins/shellintegration/xdg-shell/xdg-shell.pro \
-		src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro \
-		src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \
-		tests/auto/compositor/compositor/compositor.pro
-
-	qt_use_disable_config vulkan wayland-vulkan-server-buffer \
-		src/plugins/hardwareintegration/client/client.pro \
-		src/plugins/hardwareintegration/compositor/compositor.pro
-
-	use xcomposite || rm -r config.tests/xcomposite || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.14.1-r3.ebuild b/dev-qt/qtwayland/qtwayland-5.14.1-r3.ebuild
new file mode 100644
index 000000000000..f36572e019a9
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.14.1-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
+fi
+
+IUSE="vulkan X"
+
+DEPEND="
+	>=dev-libs/wayland-1.6.0
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
+	media-libs/mesa[egl]
+	>=x11-libs/libxkbcommon-0.2.0
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		~dev-qt/qtgui-${PV}[-gles2-only]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use X || rm -r config.tests/xcomposite || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
+		$(qt_use X feature-xcomposite-egl)
+		$(qt_use X feature-xcomposite-glx)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwayland/qtwayland-5.14.2.ebuild b/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
new file mode 100644
index 000000000000..00131b6ecb13
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="vulkan X"
+
+DEPEND="
+	>=dev-libs/wayland-1.6.0
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
+	media-libs/mesa[egl]
+	>=x11-libs/libxkbcommon-0.2.0
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		~dev-qt/qtgui-${PV}[-gles2-only]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use X || rm -r config.tests/xcomposite || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
+		$(qt_use X feature-xcomposite-egl)
+		$(qt_use X feature-xcomposite-glx)
+	)
+	qt5-build_src_configure
+}