gentoo resync : 31.01.2018

3 files changed, 27 insertions, 95 deletions

diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index f2e790d13f1b..f4ca595239b1 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,5 @@
 DIST qtkeychain-0.7.0.tar.gz 18913 BLAKE2B df8d54b5436ee936ba9aa8b7613f035b8c23d7eb998565e5cffc68e286f1bd972b223968628d1bba008960bfb16a3451b2d83c7f412ba7140b53e150d4fb061d SHA512 b7e98fa6c7f6a8a5e4d79468366b30c859db4edf08984d685d2cd8d87c5ab60b5f4769b5af96c8d9ca306111e46a63e4d23be7c07d77d6c3492f2e81ae8cd88b
 DIST qtkeychain-0.8.0.tar.gz 34686 BLAKE2B bb20ace4393e04a8c8167ce112499fed75615ed165824bfcbba6a243e374523ff397aa85eb324ee8d742295a1bd4618a363fae6f92aae74caf09b9ca18d76c1e SHA512 be83ebc665a7916e96a2fd9990c72cd29373196591cf557fa6f9691f332ab67cc5475cab240c3e50e76cb37e0b7f189f0a1f2c3a70a6f655918e1d2465ed2f33
-EBUILD qtkeychain-0.7.0.ebuild 1277 BLAKE2B fbb1f54907d2d0f049f70cbaeeba8aca1dc1a4f41964ab307888d31c91d5e9cb7dcc344d1d3a2b0a62c17251dc53b919971fa26a736ac90dfe689b1b0e0dec62 SHA512 ec42535365a93f8ac25a7d93a09aded55b9c74b77bb9e7b95a940fb9faa75717243a40954bf508b36b53425cba4fd04aa0632bd9e8426fe271aa5343ee37acd5
-EBUILD qtkeychain-0.8.0.ebuild 1386 BLAKE2B 3e61412b56c26791a9fbfe5075b5d6cb6438676538f26a9f05e384717564cd7ed1d820d50b5179e54715f272797ed44e0edc8b8675dc9e286612ca9e653605fe SHA512 87c0e4dda269cec58187d825ff9f0e1ffbccd9b029cb3c0e088d86bc5b48140c73539ef92774907f49009edace9f0c2a0769608bbc7c183a85605d1ddd147bb7
+EBUILD qtkeychain-0.7.0.ebuild 659 BLAKE2B 01b0eb1ac04c9ed7e24e0cbec4239ce092cf578cba3bb0d2f5e341ef12c8ee92fc3141ceea386063e51b19c21aab8d17d493f63532e77b9dae5661cf2a7bef5f SHA512 f5f62497692e7d28f0dea0e28ab182fe19143c807e042cbbd17abcc5ae20ee4797dcb8333ab2860bb52bd8f246656a82484c24560e756f49651db6d20e5f34d3
+EBUILD qtkeychain-0.8.0.ebuild 766 BLAKE2B 87220338cc8e8cb1ff69c4bff3d36e5b81adbf6d524ce41bcd6d9a4cbe9462aa5a4b0fdfc9b26dfa11f9cb8e9a69eaf54ca6448b699d33621cf7dc8f43c6e046 SHA512 6cd288ed7dd0dc2cdd4f4af5e375bbb191ca94952117ad34099d287b71a1d45ed895ca67df1d2578e101ea42ca8ca117d58103fe873cb90d072c2c3f8e26d402
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.7.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.7.0.ebuild
index 3ef9895a0449..bf34a98d3df9 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.7.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils multibuild
+inherit cmake-utils
 
 DESCRIPTION="Qt API for storing passwords securely"
 HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
@@ -12,58 +12,24 @@ SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 LICENSE="BSD"
 SLOT="0/1"
 KEYWORDS="amd64 x86"
-IUSE="+qt4 qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE=""
 
 RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-	)
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 "
 DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
+	dev-qt/linguist-tools:5
 "
 
 DOCS=( ChangeLog ReadMe.txt )
 
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
 src_configure() {
-	myconfigure() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			local mycmakeargs=(-DBUILD_WITH_QT4=ON)
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			local mycmakeargs=(-DBUILD_WITH_QT4=OFF)
-		fi
-
-		mycmakeargs+=(
-			-DQTKEYCHAIN_STATIC=OFF
-			-DBUILD_TRANSLATIONS=ON
-		)
-
-		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
-}
+	local mycmakeargs=(
+		-DBUILD_WITH_QT4=OFF
+		-DQTKEYCHAIN_STATIC=OFF
+		-DBUILD_TRANSLATIONS=ON
+	)
 
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	cmake-utils_src_configure
 }
diff --git a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
index 8763ecfe4d8f..41ab3af92eec 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils multibuild
+inherit cmake-utils
 
 DESCRIPTION="Qt API for storing passwords securely"
 HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
@@ -12,60 +12,26 @@ SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 LICENSE="BSD"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome-keyring qt4 +qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE="gnome-keyring"
 
 RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-	)
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 "
 DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
 	gnome-keyring? ( gnome-base/libgnome-keyring )
-	qt5? ( dev-qt/linguist-tools:5 )
 "
 
 DOCS=( ChangeLog ReadMe.txt )
 
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
 src_configure() {
-	myconfigure() {
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			local mycmakeargs=(-DBUILD_WITH_QT4=ON)
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			local mycmakeargs=(-DBUILD_WITH_QT4=OFF)
-		fi
-
-		mycmakeargs+=(
-			-DQTKEYCHAIN_STATIC=OFF
-			-DBUILD_TRANSLATIONS=ON
-			-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
-		)
-
-		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
-}
+	local mycmakeargs=(
+		-DBUILD_WITH_QT4=OFF
+		-DQTKEYCHAIN_STATIC=OFF
+		-DBUILD_TRANSLATIONS=ON
+		-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
+	)
 
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	cmake-utils_src_configure
 }