Version bump to latest. Drop older.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

5 files changed, 77 insertions, 117 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/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index 71d9ae4accbc..3a17a4073759 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,8 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libdbusmenu-qt-0.6.2.tar.bz2 31197 RMD160 86990f8c48d39f48959826409a4bdff91ad76a20 SHA1 1c2f3db7704d213fde5148f68be6e4905cbf8848 SHA256 4e64cfcdb6fd4002de3fa4347cf308622d233afc71821f0042524c53f2368afe
-DIST libdbusmenu-qt-0.6.4.tar.bz2 31302 RMD160 75a384fa265f85295a8408e712218c09da962e24 SHA1 43a8df1cadb3db719d891eed0ae5d9dd113cfc51 SHA256 321e24f1cdec58a89a40b80fa3bf3d90aa32176c9b93c9a3c19614d291102d95
-DIST libdbusmenu-qt-0.7.0.tar.bz2 31233 RMD160 1a7ae2665e2f359a4481f02a9d0938d8fef0264c SHA1 fabd8568ff3700ee42458b0e9d29b95d4b9cfdba SHA256 2438e9614b0c74a088543653050ff0a4cda9e629c792ee1090644cd94fe1c37e
+DIST libdbusmenu-qt-0.8.2.tar.xz 35916 RMD160 0837e9ca01aca628c92c55eca21cca07aa170701 SHA1 12acb11e1f62888edc95e1c42cf60759f29bf1d6 SHA256 8dae417a768cd9de1f7b36b617d11757f27b93a71ad833045141ada84514b9f1
 EBUILD libdbusmenu-qt-0.6.2.ebuild 950 RMD160 9eb86e639888295228612bb187d744a51ce09cca SHA1 f0ae067c557774bf56b5494a1860952f65f2ca6a SHA256 a085e8eed7f8f960b48aa042b18327154535562ae4ce7adecb8fc197d41e329d
-EBUILD libdbusmenu-qt-0.6.4.ebuild 1334 RMD160 242dc866e512d84b35001fe0bf293a656287d46b SHA1 abdff9ead0c7d0dc9010f2ba5a9997ef9bccc951 SHA256 033aa768f3d90968deb667e6693a23714bff5aa5f942b3c3b97cad109e0c7bde
-EBUILD libdbusmenu-qt-0.7.0.ebuild 1515 RMD160 933af001f94ec8ec6d86127f4d7a27412a7fdd65 SHA1 c8d5744b83a74fc02b91ae4c36bae51e99af39c6 SHA256 3018d148d49114469b5cbf7a886f07d4395f8aa418aaf068bd423695cb6a1233
-MISC ChangeLog 2805 RMD160 9bc0e7c5ee38b01592a460c1e471c39479e13eca SHA1 bae15e7f410aa8da0e2c9b049ae3b1517db055a4 SHA256 2851a718edf455f66e41641aa1b6e25997dfab82f58ab4b97686af586478929c
+EBUILD libdbusmenu-qt-0.8.2.ebuild 1454 RMD160 f7d46c0aa5b5f8b1165905ba0ac9bf445a528ca4 SHA1 3018e6aa707c0486606eb0859bef0989fd9db3bd SHA256 fdf20d198ce9cc8a3539de86bbe54522e589f72c8f5f72966a736b31172908fd
+MISC ChangeLog 3030 RMD160 587da2d4793bcf517e1b1a5e41cf1a35b62fd0d8 SHA1 ecbc65346e9a2ce83aee3e6800e8d0900202c80d SHA256 de28bc7aa632327c03e650e527892cae4891d742a827cad81e9f886d82c36b91
 MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk26veEACgkQHB6c3gNBRYf9XwCgv2B3rMPnwsXl0QRfBR875UwR
+Rj8An34KmycGs/knaI1fSSnMwpKYGM+z
+=urto
+-----END PGP SIGNATURE-----
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
+}