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

[Michael Palimaka]

commit:     a955f8c79a3797748cc0cfc9ee01f12ff1b73da2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 15:46:46 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 15:46:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a955f8c7

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

Package-Manager: portage-2.3.0

 dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild | 27 ++++++++--------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild 
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
index 368fc09..1a2aea3 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
@@ -6,26 +6,20 @@ EAPI=6
 
 EBZR_REPO_URI="lp:libdbusmenu-qt"
 
-[[ ${PV} == 9999* ]] && BZR_ECLASS="bzr"
-inherit multibuild multilib virtualx ${BZR_ECLASS} cmake-multilib
+[[ ${PV} == 9999* ]] && inherit bzr
+inherit cmake-multilib multibuild multilib virtualx cmake-multilib
 
 DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
 HOMEPAGE="https://launchpad.net/libdbusmenu-qt/";
-if [[ ${PV} == 9999* ]] ; then
-       KEYWORDS=""
-else
-       MY_PV=${PV/_pre/+14.10.}
+if [[ ${PV} != 9999* ]] ; then
+       MY_PV=${PV/_pre/+16.04.}
        
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="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" )
+       KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd 
~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc +qt4 qt5"
+IUSE="debug +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
 
@@ -43,14 +37,14 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
-       doc? ( app-doc/doxygen )
        test? (
-               dev-libs/qjson[${MULTILIB_USEDEP}]
                qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
                qt5? ( dev-qt/qttest:5 )
        )
 "
 
+[[ ${PV} == 9999* ]] || S=${WORKDIR}/${PN}-${MY_PV}
+
 DOCS=( NEWS README )
 
 # tests fail due to missing connection to dbus
@@ -70,7 +64,7 @@ src_prepare() {
 
 multilib_src_configure() {
        local mycmakeargs=(
-               -DWITH_DOC=$(usex doc)
+               -DWITH_DOC=OFF
                -DUSE_QT${QT_MULTIBUILD_VARIANT}=ON
                
-DQT_QMAKE_EXECUTABLE="/usr/$(get_libdir)/qt${QT_MULTIBUILD_VARIANT}/bin/qmake"
        )
@@ -129,8 +123,7 @@ src_test() {
 multilib_src_test() {
        local builddir=${BUILD_DIR}
 
-       BUILD_DIR=${BUILD_DIR}/tests \
-               VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+       BUILD_DIR=${BUILD_DIR}/tests virtx cmake-utils_src_test
 
        BUILD_DIR=${builddir}
 }