4 files changed, 67 insertions, 117 deletions
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild
index 41bdea20..05dca850 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r2.ebuild
@@ -2,20 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="A library providing Qt implementation of DBusMenu specification (meta mackage)"
 HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
 LICENSE="LGPL-2"
 KEYWORDS="amd64 x86"
 SLOT="0"
-IUSE="debug doc +qt4 qt5"
+IUSE="debug"
 
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
-	qt4? ( ~dev-libs/libdbusmenu-qt4-${PV} )
-	qt5? ( ~dev-libs/libdbusmenu-qt5-${PV} )
-"
+RDEPEND="~dev-libs/libdbusmenu-qt5-${PV}"
 DEPEND=""
 RESTRICT="test"
diff --git a/dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20160218-r1.ebuild b/dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20160218-r1.ebuild
deleted file mode 100644
index 8baab32f..00000000
--- a/dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20160218-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN/qt5/qt}"
-MY_PV=${PV/_pre/+16.04.}
-
-inherit multibuild multilib virtualx cmake-multilib
-
-DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
-HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN}_${MY_PV}.orig.tar.gz"
-KEYWORDS="amd64 x86"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug doc +qt5"
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-qt/qttest:5
-	)
-"
-
-DOCS=( NEWS README )
-
-# tests fail due to missing connection to dbus
-RESTRICT="test"
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usex qt5 5) )
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	comment_add_subdirectory tools
-	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 QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
-		multilib_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	mycompile() {
-		cmake-utils_src_compile
-	}
-
-	multibuild_foreach_variant mycompile
-}
-
-src_install() {
-	myinstall() {
-		cmake-utils_src_install
-	}
-
-	multibuild_foreach_variant myinstall
-}
-
-src_test() {
-	mytest() {
-		multilib_src_test
-	}
-
-	multibuild_foreach_variant mytest
-}
-
-multilib_src_test() {
-	local builddir=${BUILD_DIR}
-
-	BUILD_DIR=${BUILD_DIR}/tests \
-		VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
-
-	BUILD_DIR=${builddir}
-}
diff --git a/dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20160218-r2.ebuild b/dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20160218-r2.ebuild
new file mode 100644
index 00000000..7c083f1a
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt5/libdbusmenu-qt5-0.9.3_pre20160218-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/qt5/qt}"
+MY_PV=${PV/_pre/+16.04.}
+
+EBZR_REPO_URI="lp:libdbusmenu-qt"
+
+[[ ${PV} == 9999* ]] && inherit bzr
+inherit cmake-utils virtualx
+
+DESCRIPTION="Library providing Qt implementation of DBusMenu specification"
+HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN}_${MY_PV}.orig.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+[[ ${PV} == 9999* ]] || S=${WORKDIR}/${PN}-${MY_PV}
+
+# tests fail due to missing connection to dbus
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+src_prepare() {
+	[[ ${PV} == 9999* ]] && bzr_src_prepare
+	cmake-utils_src_prepare
+
+	cmake_comment_add_subdirectory tools
+	use test || cmake_comment_add_subdirectory tests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DOC=OFF
+		-DUSE_QT5=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	local builddir=${BUILD_DIR}
+
+	BUILD_DIR=${BUILD_DIR}/tests virtx cmake-utils_src_test
+
+	BUILD_DIR=${builddir}
+}
diff --git a/dev-libs/libdbusmenu-qt5/metadata.xml b/dev-libs/libdbusmenu-qt5/metadata.xml
deleted file mode 100644
index 282ea1c4..00000000
--- a/dev-libs/libdbusmenu-qt5/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">ubuntu</remote-id>
-	</upstream>
-</pkgmetadata>