gentoo resync : 24.12.2018

4 files changed, 4 insertions, 48 deletions

diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index b32b922ed206..75ba8f949c9c 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
-DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
-DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtprintsupport-5.11.1.ebuild 775 BLAKE2B e5f7cde1cabf1f3e027d9c38e57951ce0f585a286ceb694a63940f18d5e07fa237715f9011a4a4b6e7e1977d3b42577522f5d89cdc0c9f9f8568b5d0a2d94e0e SHA512 57cace1f5369cb2c7198feead227cab0676c5e9097df072429e958537b16c2b701de31d53a9cf562f929aec7c68da4baaca3f73e18224177bafabd06af86246f
-EBUILD qtprintsupport-5.11.2.ebuild 777 BLAKE2B ea90c13d7ceecd077bb6fac0e410a5b992ef8993fbbb9b0c998dafa1255242850c20dfe3b240bb68e32bd0a10862d000894201c31548a50d24d6072b6c89fdb1 SHA512 0928447c4f6e434701cf7327900259e613c7faf6618c444ff6d7a5be6a7cf4cc49a90c884de9d32ffc6479cdcad2b6f9f93989e4523e1288344abc2e6eac1a5d
-EBUILD qtprintsupport-5.9.6.ebuild 776 BLAKE2B 1fee8755df583a6f9534d835cef6275b1c02e3233b9c44f4bdd0525da27212ccb250c409a61fa63b71126aabe7fc79ea5f84d8104dabe697f58cc1883baad0a5 SHA512 dc5c309683e5535f00e979e8085df9745a878f7ddd2f4298e70f32f566894d48aa971634328eb01a58197feac2305a50a7ddcaa6e05231ff09bb7b408d8fd39d
+DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
+EBUILD qtprintsupport-5.11.1.ebuild 773 BLAKE2B 81a9e6d9b64142e9983ff20396a347c4556f9ba232021a70d2d10d7e896ed2ba90ad7bb20b381ef776d6ba55545d5fac62a9c91547b464b80be1eeb0276ae688 SHA512 7cc39b7c8dd450fbecb0afb210f78569bdde73af3044a155b09dfa6387c84582e234c21879a8bc36e58523bc21526cb74e7a4852332a082dc7b0551a4c994896
+EBUILD qtprintsupport-5.11.3.ebuild 777 BLAKE2B ea90c13d7ceecd077bb6fac0e410a5b992ef8993fbbb9b0c998dafa1255242850c20dfe3b240bb68e32bd0a10862d000894201c31548a50d24d6072b6c89fdb1 SHA512 0928447c4f6e434701cf7327900259e613c7faf6618c444ff6d7a5be6a7cf4cc49a90c884de9d32ffc6479cdcad2b6f9f93989e4523e1288344abc2e6eac1a5d
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild
index b9b7af20b52b..80fc60a6c4ea 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.11.1.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 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="cups gles2"
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.11.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.11.3.ebuild
index 1d457318cd9c..1d457318cd9c 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.11.2.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.11.3.ebuild
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.9.6.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9.6.ebuild
deleted file mode 100644
index 3484c5c647aa..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.9.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-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 ~amd64-fbsd"
-fi
-
-IUSE="cups gles2"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	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
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}