gentoo resync : 29.05.2018

3 files changed, 2 insertions, 76 deletions

diff --git a/sys-auth/polkit-qt/Manifest b/sys-auth/polkit-qt/Manifest
index dbe776b6cf83..91e156293824 100644
--- a/sys-auth/polkit-qt/Manifest
+++ b/sys-auth/polkit-qt/Manifest
@@ -1,4 +1,3 @@
 DIST polkit-qt-1-0.112.0_p20160416.tar.xz 64540 BLAKE2B fbc3631585801f42ff92324576a2bd82d61aa5b24317f95e1182c300073a8e746007fa3409127a50d7d3433c5092f56d72e2e579683d08145067d4424c4dfe7e SHA512 90677af780a2bbcb33b6a54702ba96f965eb8561f2636af7aa0146f9b2450f9e89f67e022ffa99742afe50e3d1f570eabfad686e9e08e629a1e662d9f5abf2ea
-EBUILD polkit-qt-0.112.0_p20160416-r1.ebuild 1392 BLAKE2B b9b73020401d1a1bd79479d252a2de367b254d6f9d6d844e20a84ff4a0f13f5d591253dc486f9c6d037b0a52bf7106fa32ab6101dd1c742e520b3b0a5e5da636 SHA512 a1ddb1a1b0294dbc95f804e441691577c4b244325b81228d0c582cfd8576accee79f5b171e7d13ddf62f0f75686d07fddd585cbe0073f1d914f7ad6144624e70
-EBUILD polkit-qt-0.112.0_p20160416-r2.ebuild 829 BLAKE2B 7746da664b6f5b714b1772427220085c2921c183719a79d8c25ebdda53d2dbdb11a9b4e22102f41aebd1f3c9ce8bc1137c86faf17ec329b5bf5eee9ee656efc6 SHA512 aeccdb91684b6f8ba4fd9b9b2b8250e3d223f1a08055d07582825de5976c08e0042f693f8bed92932166cd1bca5c635da0152065b449b44ee88eda3a8474e2d8
+EBUILD polkit-qt-0.112.0_p20160416-r2.ebuild 827 BLAKE2B 853a15e7486a934a10aa4c1422129b1e5cb5207e1bd79febd2f004721fa0fd64dbe9136df90b3f8a46c8dc128be7b33058e989fff7422f9b9656d56be75671c3 SHA512 bc2339eb96e4897cae2a9cd23d1133858e11fc0052b942fb42600b80f6d88f47171163a923e9357dba6174732feb08ae95d738c1296bbf349e88597329353512
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild
deleted file mode 100644
index 8939baaf3bd9..000000000000
--- a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/qt/qt-1}"
-
-inherit cmake-utils multibuild
-
-DESCRIPTION="PolicyKit Qt API wrapper library"
-HOMEPAGE="https://www.kde.org/"
-SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="debug examples qt4"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=sys-auth/polkit-0.103
-	examples? ( dev-qt/qtxml:5 )
-	qt4? (
-		dev-qt/qtcore:4[glib]
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4[glib]
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README README.porting TODO )
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) qt5 )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-			-DBUILD_EXAMPLES=$(usex examples)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			mycmakeargs+=( -DUSE_QT4=ON )
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
-			mycmakeargs+=( -DUSE_QT5=ON )
-		fi
-
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant cmake-utils_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-}
diff --git a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r2.ebuild b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r2.ebuild
index e909e08a5bfd..cfd05deaabce 100644
--- a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r2.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="debug examples"
 
 RDEPEND="