diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2016-07-21 01:46:46 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-07-21 01:46:49 +1000 |
| commit | a955f8c79a3797748cc0cfc9ee01f12ff1b73da2 (patch) | |
| tree | 93d2a9d18a3e31818ccb6d709b9ff96106fe8229 /dev-libs/libdbusmenu-qt | |
| parent | 7a7a2176c23f882e4ea0b14bd61f02e7065b9243 (diff) | |
| download | kde-a955f8c79a3797748cc0cfc9ee01f12ff1b73da2.tar.gz kde-a955f8c79a3797748cc0cfc9ee01f12ff1b73da2.tar.bz2 kde-a955f8c79a3797748cc0cfc9ee01f12ff1b73da2.zip | |
dev-libs/libdbusmenu-qt: sync with main tree
Package-Manager: portage-2.3.0
Diffstat (limited to 'dev-libs/libdbusmenu-qt')
| -rw-r--r-- | dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild | 27 |
1 files 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 368fc097016..1a2aea3778b 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} } |