this qt4 build is killing me

1 files changed, 30 insertions, 6 deletions

diff --git a/dev-libs/libdbusmenu-qt4/libdbusmenu-qt4-0.9.3_pre20140619-r1.ebuild b/dev-libs/libdbusmenu-qt4/libdbusmenu-qt4-0.9.3_pre20140619-r1.ebuild
index b2dc2e84..39643d3b 100644
--- a/dev-libs/libdbusmenu-qt4/libdbusmenu-qt4-0.9.3_pre20140619-r1.ebuild
+++ b/dev-libs/libdbusmenu-qt4/libdbusmenu-qt4-0.9.3_pre20140619-r1.ebuild
@@ -14,32 +14,39 @@ 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"
 PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" )
-
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc +qt4"
 S=${WORKDIR}/${MY_PN}-${MY_PV}
 
-RDEPEND=">=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}]
+RDEPEND="dev-qt/qtcore:4[${MULTILIB_USEDEP}]
+	dev-qt/qtdbus:4[${MULTILIB_USEDEP}]
+	dev-qt/qtgui:4[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? (
 		dev-libs/qjson[${MULTILIB_USEDEP}]
-		>=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}]
+		dev-qt/qttest:4[${MULTILIB_USEDEP}]
 	)
 "
 
 DOCS=( NEWS README )
 
+# tests fail due to missing connection to dbus
 RESTRICT="test"
 
 pkg_setup() {
 	MULTIBUILD_VARIANTS=( $(usex qt4 4) )
 }
 
+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)
@@ -52,7 +59,7 @@ multilib_src_configure() {
 src_configure() {
 	myconfigure() {
 		local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
-		cmake-utils__src_configure
+		multilib_src_configure
 	}
 
 	multibuild_foreach_variant myconfigure
@@ -73,3 +80,20 @@ 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}
+}