gentoo resync : 14.05.2020

4 files changed, 2 insertions, 98 deletions

diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 0692df6422ca..34deb6d833b0 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,8 +1,5 @@
-AUX qtprintsupport-5.13.2-no-cups.patch 2196 BLAKE2B c84c6db10bc05a349d910c3c74519b33a9e00cc616def388a2f77f62099215368a6d1715f8997ef9d9231e594c05122ec8c5ca5db0b59caff4c6d0946d01f8bd SHA512 7fb16775627a484c4c9c6cc184f3c73d898c6f3600fb5769623f311f504dc8723713815acb99be6d11026ae3a067a7587a94b282bed95e8747e47798a7efb977
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtprintsupport-5.13.2-r2.ebuild 813 BLAKE2B 5e5572dbb950afece428f4d162431b4261fe4af59428c76e2d76252b07b386f760a9f59f8fbd22ee9b406f2731305cb6c8ab61cbc40223a260366cc9d43151c9 SHA512 86f0ec867d14ec8cba1b4a59d221182b62aea7e31264b84f58f76945c6fd2d1caf55c039f58c37d26b8ed5fc25df4659690b52bf224968b3eb61af1ed993a47d
 EBUILD qtprintsupport-5.14.1-r1.ebuild 780 BLAKE2B e7006172f947edfaa16620d4ec3b8f5d30f5b6eed00a765f41511e5bccd25a64ade0afb597269562a7ab66d3e7f0c64d09d387c544446f6754e3038e2e39751a SHA512 563a5bc47c4c329876758bb10772e6998acdf81510c7cc7cd9a6a6963d83c5a02bbf3036910bfa967b1d08eb2b89a799f9139033de0d4b37180e44611759b88d
-EBUILD qtprintsupport-5.14.2.ebuild 788 BLAKE2B d706d8e3afc1d8cb1d7b9c9af2320fcf5a6040fb7e53a268374c966274b9b10d6a4b66e44ebda267a5ab23c80566f8d690ed2fe97c9d4e829431b9e89839d3f6 SHA512 d42803cf2bc3d45c94bf454001fcb4a155121a230072e494acf03efaf85b3c35993fb20106ff966ad09026e8240a1371ea7e2616e7a63679b441d678341f079e
+EBUILD qtprintsupport-5.14.2.ebuild 786 BLAKE2B 423c54f33854f94565b8a4aa46afcf0c4674e971f496e22b34dae01e8db5c2286478a25e949365325ad2067a90fc9ac2013e81ca8193a59b94c6d1815fb94732 SHA512 b917d22021ed79ab810030a216f6731073bb40a865cf7abc58f1b64d97561a2820a08986e7ad52201c0483d832d36953be85666d7167e93fcdd4930137257ebd
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtprintsupport/files/qtprintsupport-5.13.2-no-cups.patch b/dev-qt/qtprintsupport/files/qtprintsupport-5.13.2-no-cups.patch
deleted file mode 100644
index fe19baf4096b..000000000000
--- a/dev-qt/qtprintsupport/files/qtprintsupport-5.13.2-no-cups.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 2ad3348031d8a622374920eac5bdd8fb9ecefcd7 Mon Sep 17 00:00:00 2001
-From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
-Date: Sat, 21 Dec 2019 19:57:45 +0100
-Subject: QPrintDialog: don't access dangling pointer when cups is disabled
-
-When no cups support is available, ui.pagesRadioButton is destroyed in
-QPrintDialogPrivate::init() but was accessed later on. Fix it by moving
-the cups check one line above.
-
-Fixes: QTBUG-80945
-Change-Id: Ieb062b39e1461f39665ef612dfea1d7757274b7e
-Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
----
- src/printsupport/dialogs/qprintdialog_unix.cpp | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
-index c7328d9732..7bbf137977 100644
---- a/src/printsupport/dialogs/qprintdialog_unix.cpp
-+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
-@@ -637,8 +637,10 @@ void QPrintDialogPrivate::init()
-     options.pageSetCombo->addItem(tr("Odd Pages"), QVariant::fromValue(QCUPSSupport::OddPages));
-     options.pageSetCombo->addItem(tr("Even Pages"), QVariant::fromValue(QCUPSSupport::EvenPages));
- #else
--    for (int i = options.pagesLayout->count() - 1; i >= 0; --i)
--        delete options.pagesLayout->itemAt(i)->widget();
-+    delete options.pagesRadioButton;
-+    delete options.pagesLineEdit;
-+    options.pagesRadioButton = nullptr;
-+    options.pagesLineEdit = nullptr;
- #endif
- 
-     top->d->setOptionsPane(this);
-@@ -727,12 +729,12 @@ void QPrintDialogPrivate::selectPrinter(const QPrinter::OutputFormat outputForma
-         else
-             options.pageSetCombo->setEnabled(true);
- 
-+#if QT_CONFIG(cups)
-         // Disable complex page ranges widget when printing to pdf
-         // It doesn't work since it relies on cups to do the heavy lifting and cups
-         // is not used when printing to PDF
-         options.pagesRadioButton->setEnabled(outputFormat != QPrinter::PdfFormat);
- 
--#if QT_CONFIG(cups)
-         // Disable color options on main dialog if not printing to file, it will be handled by CUPS advanced dialog
-         options.colorMode->setVisible(outputFormat == QPrinter::PdfFormat);
- #endif
--- 
-cgit v1.2.1
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r2.ebuild
deleted file mode 100644
index 5c0100d98132..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-IUSE="cups gles2-only"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-PATCHES=( "${FILESDIR}/${P}-no-cups.patch" ) # bug #704936, QTBUG-80945
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild
index 5945c013cb24..fb25ec4726d4 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="cups gles2-only"