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

[Michael Palimaka]

commit:     58d9706e5268d39ebd90efaff63b89e4130bc422
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  8 14:51:48 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec  8 14:51:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=58d9706e

dev-libs/libdbusmenu-qt: sync with main tree

Package-Manager: portage-2.2.26

 dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild | 91 ++++++++++++++--------
 1 file changed, 60 insertions(+), 31 deletions(-)

diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
index c69e472..5dab70b 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
@@ -7,18 +7,20 @@ EAPI=5
 EBZR_REPO_URI="lp:libdbusmenu-qt"
 
 [[ ${PV} == 9999* ]] && BZR_ECLASS="bzr"
-inherit cmake-utils multibuild virtualx ${BZR_ECLASS}
+inherit multibuild multilib virtualx ${BZR_ECLASS} cmake-multilib
 
 DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
 HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
 if [[ ${PV} == 9999* ]] ; then
 	KEYWORDS=""
 else
-	#SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+	MY_PV=${PV/_pre/+14.10.}
+	SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz"
 	# upstream has no permissions to use some kde written code so repack git
 	# repo every time
-	SRC_URI="http://dev.gentoo.org/~scarabeus/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	#SRC_URI="https://dev.gentoo.org/~scarabeus/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" )
 fi
 
 LICENSE="LGPL-2"
@@ -29,9 +31,9 @@ REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
 	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
+		>=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
@@ -43,19 +45,19 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? (
-		dev-libs/qjson
-		qt4? ( dev-qt/qttest:4 )
+		dev-libs/qjson[${MULTILIB_USEDEP}]
+		qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
 		qt5? ( dev-qt/qttest:5 )
 	)
 "
 
 DOCS=( NEWS README )
 
-# tests fail due to missing conection to dbus
+# tests fail due to missing connection to dbus
 RESTRICT="test"
 
 pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+	MULTIBUILD_VARIANTS=( $(usex qt4 4) $(usex qt5 5) )
 }
 
 src_prepare() {
@@ -66,42 +68,69 @@ src_prepare() {
 	use test || comment_add_subdirectory tests
 }
 
+multilib_src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with doc)
+		-DUSE_QT${QT_MULTIBUILD_VARIANT}=ON
+		-DQT_QMAKE_EXECUTABLE="/usr/$(get_libdir)/qt${QT_MULTIBUILD_VARIANT}/bin/qmake"
+	)
+	cmake-utils_src_configure
+}
+
 src_configure() {
 	myconfigure() {
-		local mycmakeargs=(
-			$(cmake-utils_use_with doc)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			mycmakeargs+=( -DUSE_QT4=ON )
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
-			mycmakeargs+=( -DUSE_QT5=ON )
+		local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
+		if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
+			cmake-multilib_src_configure
+		elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
+			multilib_src_configure
 		fi
-
-		cmake-utils_src_configure
 	}
 
 	multibuild_foreach_variant myconfigure
 }
 
 src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
+	mycompile() {
+		if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
+			cmake-multilib_src_compile
+		elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
+			cmake-utils_src_compile
+		fi
+	}
+
+	multibuild_foreach_variant mycompile
 }
 
-src_test() {
-	mytest() {
-		local builddir=${BUILD_DIR}
+src_install() {
+	myinstall() {
+		if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
+			cmake-multilib_src_install
+		elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
+			cmake-utils_src_install
+		fi
+	}
 
-		BUILD_DIR=${BUILD_DIR}/tests \
-			VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+	multibuild_foreach_variant myinstall
+}
 
-		BUILD_DIR=${builddir}
+src_test() {
+	mytest() {
+		if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
+			cmake-multilib_src_test
+		elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
+			multilib_src_test
+		fi
 	}
 
 	multibuild_foreach_variant mytest
 }
 
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+multilib_src_test() {
+	local builddir=${BUILD_DIR}
+
+	BUILD_DIR=${BUILD_DIR}/tests \
+		VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+
+	BUILD_DIR=${builddir}
 }