Version bump to latest. Drop older.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 64 insertions, 112 deletions

diff --git a/dev-libs/libdbusmenu-qt/ChangeLog b/dev-libs/libdbusmenu-qt/ChangeLog
index c049b959a9ad..f46547b49c83 100644
--- a/dev-libs/libdbusmenu-qt/ChangeLog
+++ b/dev-libs/libdbusmenu-qt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libdbusmenu-qt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.15 2011/02/06 19:12:39 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.16 2011/04/29 13:32:45 scarabeus Exp $
+
+*libdbusmenu-qt-0.8.2 (29 Apr 2011)
+
+  29 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libdbusmenu-qt-0.6.4.ebuild, -libdbusmenu-qt-0.7.0.ebuild,
+  +libdbusmenu-qt-0.8.2.ebuild:
+  Version bump to latest. Drop older.
 
 *libdbusmenu-qt-0.7.0 (06 Feb 2011)
 
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.6.4.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.6.4.ebuild
deleted file mode 100644
index 1569a52656ea..000000000000
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.6.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.6.4.ebuild,v 1.3 2011/03/27 22:48:44 arfrever Exp $
-
-EAPI="3"
-
-QT_DEPEND="4.6.3"
-inherit cmake-utils virtualx
-
-DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
-HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
-# We are using the git tag from the gitorious repository, as advised in
-# kde-packager ml http://gitorious.org/dbusmenu/dbusmenu-qt
-# SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-SRC_URI="mirror://gentoo/libdbusmenu-qt-0.6.4.tar.bz2"
-
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-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"
-
-	VIRTUALX_COMMAND="ctest ${ctestargs}" virtualmake || die "Tests failed."
-
-	popd > /dev/null
-}
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.7.0.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.7.0.ebuild
deleted file mode 100644
index edc3465b421b..000000000000
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.7.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.7.0.ebuild,v 1.2 2011/03/27 22:48:44 arfrever Exp $
-
-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"
-
-	VIRTUALX_COMMAND="ctest ${ctestargs}" virtualmake || die "Tests failed."
-
-	popd > /dev/null
-}
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.8.2.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.8.2.ebuild
new file mode 100644
index 000000000000..4e41c6b8656b
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.8.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.8.2.ebuild,v 1.1 2011/04/29 13:32:45 scarabeus Exp $
+
+EAPI=4
+
+QT_DEPEND="4.6.3"
+EGIT_REPO_URI="git://gitorious.org/dbusmenu/dbusmenu-qt.git"
+
+[[ ${PV} == 9999* ]] && GIT_ECLASS="git-2"
+inherit cmake-utils virtualx ${GIT_ECLASS}
+
+DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
+HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
+if [[ ${PV} == 9999* ]] ; then
+	KEYWORDS=""
+else
+	#SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+	# upstream has no permissions to use some kde written code so repack git
+	# repo every time
+	SRC_URI="http://dev.gentoo.org/~scarabeus/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc"
+
+RDEPEND="
+	>=x11-libs/qt-core-${QT_DEPEND}:4
+	>=x11-libs/qt-gui-${QT_DEPEND}:4[dbus]
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-libs/qjson
+		>=x11-libs/qt-test-${QT_DEPEND}:4
+	)
+"
+
+DOCS=(NEWS README)
+
+# tests fail due to missing conection to dbus
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_with doc)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	CMAKE_BUILD_DIR=${CMAKE_BUILD_DIR}/tests VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+}