[dev-libs/libdbusmenu-qt] Version bump to 0.7.0, cleanup, use official sources, support tests, sync with live ebuild

(Portage version: 2.2.0_alpha19/git/Linux x86_64, signed Manifest commit with key 50ED256E)

3 files changed, 119 insertions, 15 deletions

diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index 183a673e927..5a939fe451e 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,2 +1,14 @@
-EBUILD libdbusmenu-qt-9999.ebuild 611 RMD160 e466fa54f2de6c1534aea3e678bbf8c039afcf96 SHA1 df85fb3f03ea375e8e3ee887df0aac2325cfbc55 SHA256 fa18e217ddc35e8d4744067505828d14f62849ce669c12822f529acb94ceb1e7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libdbusmenu-qt-0.7.0.tar.bz2 31233 RMD160 1a7ae2665e2f359a4481f02a9d0938d8fef0264c SHA1 fabd8568ff3700ee42458b0e9d29b95d4b9cfdba SHA256 2438e9614b0c74a088543653050ff0a4cda9e629c792ee1090644cd94fe1c37e
+EBUILD libdbusmenu-qt-0.7.0.ebuild 1400 RMD160 a12c99d866c2b30d99d4197ecce4d62a527f26b8 SHA1 b443bfeb58b18011c1c93a4939514883205547a3 SHA256 128b4620e269101cc0bc7923e2581dc467985906bf862b8c289365bb54a26494
+EBUILD libdbusmenu-qt-9999.ebuild 1400 RMD160 a12c99d866c2b30d99d4197ecce4d62a527f26b8 SHA1 b443bfeb58b18011c1c93a4939514883205547a3 SHA256 128b4620e269101cc0bc7923e2581dc467985906bf862b8c289365bb54a26494
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1EXbEACgkQjqfyF1DtJW4I+wCgq/iR+OGo3uVUvzoc2oMTSyLQ
+dNEAn0toNycAhB9hJBxfJVXgIkKE47XH
+=XRjI
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.7.0.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.7.0.ebuild
new file mode 100644
index 00000000000..0cf7ade0990
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.7.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+QT_DEPEND="4.6.3"
+inherit cmake-utils virtualx
+
+if [[ "${PV}" = 9999* ]] ; then
+	inherit git
+
+	EGIT_REPO_URI="git://gitorious.org/dbusmenu/dbusmenu-qt.git"
+
+	KEYWORDS=""
+else
+	# We are using snapshots from Aurelien's repos, as advised in kde-packager ml
+	# This is because version 0.6.3 removed code from the official version,
+	#  because Canonical has no copyright on it
+	#SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
+HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	>=x11-libs/qt-core-${QT_DEPEND}:4
+	>=x11-libs/qt-gui-${QT_DEPEND}:4[dbus]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/qjson
+		>=x11-libs/qt-test-${QT_DEPEND}:4
+	)
+"
+
+DOCS=(NEWS README)
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build test TESTS)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd "${CMAKE_BUILD_DIR}/tests" > /dev/null
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	export maketype="ctest ${ctestargs}"
+	virtualmake || die "Tests failed."
+
+	popd > /dev/null
+}
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
index c53e9a6af23..0cf7ade0990 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
@@ -4,29 +4,59 @@
 
 EAPI=3
 
-inherit git cmake-utils
+QT_DEPEND="4.6.3"
+inherit cmake-utils virtualx
+
+if [[ "${PV}" = 9999* ]] ; then
+	inherit git
+
+	EGIT_REPO_URI="git://gitorious.org/dbusmenu/dbusmenu-qt.git"
+
+	KEYWORDS=""
+else
+	# We are using snapshots from Aurelien's repos, as advised in kde-packager ml
+	# This is because version 0.6.3 removed code from the official version,
+	#  because Canonical has no copyright on it
+	#SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
 
 DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
-HOMEPAGE="http://people.canonical.com/~agateau/dbusmenu/"
-EGIT_REPO_URI="git://gitorious.org/dbusmenu/dbusmenu-qt.git"
+HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
 
 LICENSE="LGPL-2"
-KEYWORDS=""
 SLOT="0"
 IUSE="debug"
 
-# Bug #315215, require X server running
-RESTRICT="test"
-
-DEPEND="
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4[dbus]
-	x11-libs/qt-test:4
+RDEPEND="
+	>=x11-libs/qt-core-${QT_DEPEND}:4
+	>=x11-libs/qt-gui-${QT_DEPEND}:4[dbus]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/qjson
+		>=x11-libs/qt-test-${QT_DEPEND}:4
+	)
 "
-RDEPEND="${DEPEND}"
 
 DOCS=(NEWS README)
 
-src_unpack() {
-	git_src_unpack
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build test TESTS)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd "${CMAKE_BUILD_DIR}/tests" > /dev/null
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	export maketype="ctest ${ctestargs}"
+	virtualmake || die "Tests failed."
+
+	popd > /dev/null
 }