[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu-qt/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     3b8f699e3ef9281bc5930b12f62197776704966b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 22:13:40 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 22:13:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3b8f699e

dev-libs/libdbusmenu-qt: Drop USE=qt5, build it unconditionally

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
index 9434c8fa7e..34335d9c8a 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
@@ -6,9 +6,9 @@ EAPI=6
 EBZR_REPO_URI="lp:libdbusmenu-qt"
 
 [[ ${PV} == 9999* ]] && inherit bzr
-inherit cmake-multilib multibuild multilib virtualx cmake-multilib
+inherit cmake-multilib multibuild virtualx
 
-DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
+DESCRIPTION="Library providing Qt implementation of DBusMenu specification"
 HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
 if [[ ${PV} != 9999* ]] ; then
 	MY_PV=${PV/_pre/+16.04.}
@@ -18,27 +18,23 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug +qt4 qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE="debug qt4"
 
 RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	qt4? (
 		>=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]
 		>=dev-qt/qtdbus-4.8.6:4[${MULTILIB_USEDEP}]
 		>=dev-qt/qtgui-4.8.6:4[${MULTILIB_USEDEP}]
 	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
 "
 DEPEND="${RDEPEND}
 	test? (
+		dev-qt/qttest:5
 		qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
-		qt5? ( dev-qt/qttest:5 )
 	)
 "
 
@@ -50,7 +46,7 @@ DOCS=( NEWS README )
 RESTRICT="test"
 
 pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usex qt4 4) $(usex qt5 5) )
+	MULTIBUILD_VARIANTS=( $(usex qt4 4) 5 )
 }
 
 src_prepare() {