Version bump 0.3.2, fix bug 317389, restrict test, bug 315215

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 78 insertions, 4 deletions

diff --git a/dev-libs/libdbusmenu-qt/ChangeLog b/dev-libs/libdbusmenu-qt/ChangeLog
index 6180375c0bfd..7fe27b23ac31 100644
--- a/dev-libs/libdbusmenu-qt/ChangeLog
+++ b/dev-libs/libdbusmenu-qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libdbusmenu-qt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.1 2010/03/31 16:31:18 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.2 2010/04/27 13:47:48 reavertm Exp $
+
+*libdbusmenu-qt-0.3.2-r1 (27 Apr 2010)
+
+  27 Apr 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  +libdbusmenu-qt-0.3.2-r1.ebuild, +files/libdbusmenu-qt-0.3.2-cmake.patch:
+  Version bump 0.3.2, fix bug 317389, restrict test, bug 315215
 
 *libdbusmenu-qt-0.3.0 (31 Mar 2010)
 
diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index 575e7f6d6e6d..d3328b220bf6 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,5 +1,8 @@
 AUX libdbusmenu-qt-0.3.0-set-link-directories.patch 315 RMD160 b88809ad598ea314f8d7393badcff36f4b8fdb9c SHA1 911795c795f9a7197263d3060925118b1c7bd378 SHA256 4aa799c9015a4ae8feb09786f4518c8b2b9caac4ba9a172d294b23c5138a2bd5
+AUX libdbusmenu-qt-0.3.2-cmake.patch 914 RMD160 ea5965d76f472869d7c2535e389703861ef440db SHA1 6b9b6cf7e1fa77c61fbb6a85ff3789763b0484b2 SHA256 fd434784063bab7d5413b7e899a5357006bf4f27bf941b6e85349d6bba9e315d
 DIST libdbusmenu-qt-0.3.0.tar.bz2 24060 RMD160 2e3e6479c77186bc28b9c2197768f6a352170ebf SHA1 618c2908fcfae0547dc2aa675b8afd40f837d766 SHA256 8babcfd86e187076e0ae8855f506275bb2c03169617310ca3f8c6318a5d6bd10
-EBUILD libdbusmenu-qt-0.3.0.ebuild 802 RMD160 f647548d5a99a31fe417b5ff9dd6954d653a1edb SHA1 51d67e1aa39f69a0b1e3889ee13f5b4d598bad5e SHA256 9b09de59974eaa78c143f0d473e6e690ccefaa03fb0a855a0ebaf14f54886302
-MISC ChangeLog 489 RMD160 98e8277415046783888b9371b54701fa2f2e34a1 SHA1 7b6002b332f7cc4f4f836539d59c2723917c363f SHA256 38c6167a9865092df08d2631f9bfdecd24c42a76afbfb44491ff36347de9f816
+DIST libdbusmenu-qt-0.3.2.tar.bz2 24729 RMD160 75a3c5b486880d1366b136b476b1a69328291695 SHA1 ea30bac73962a36ab1050105573ee068951a383f SHA256 6b81786b1cd9d5225256fd748b1235a36f97226c5c0e3dc2d40a4891a7a57b4b
+EBUILD libdbusmenu-qt-0.3.0.ebuild 858 RMD160 1ecfdc746b350c192921220ee862872bccd99b9e SHA1 775f0a3433d3bd672c46491c42fa6e7c99eebb51 SHA256 98acd4803d22d739fffbf4ce6a59e81c1eb7d2cbe4ffcf7e471a382ebdd25bc3
+EBUILD libdbusmenu-qt-0.3.2-r1.ebuild 764 RMD160 1df1c3969f7f2c925cebc3440c078126b6c43229 SHA1 93afe00eff214aa2c605d87a6794829807915bd7 SHA256 78aa6981cc109d30ce2fe083e2b796c52600f5ce2d76435d9a477ca87a58bd05
+MISC ChangeLog 723 RMD160 307554db642f1c8e19cf2bd638c6954cf2cdebba SHA1 19794fa3e83fdc8b54484d7f7821a98175a246c9 SHA256 d346e72ddb6a213d958d68195834787cd871ae906b564fb4e411b6475f8f33e9
 MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2
diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch
new file mode 100644
index 000000000000..e8e13c480bf4
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch
@@ -0,0 +1,30 @@
+Only in .: build
+diff -ru ../libdbusmenu-qt-0.3.2/cmake/modules/FindQJSON.cmake ./cmake/modules/FindQJSON.cmake
+--- ../libdbusmenu-qt-0.3.2/cmake/modules/FindQJSON.cmake	2010-04-27 15:20:49.187784398 +0200
++++ ./cmake/modules/FindQJSON.cmake	2010-04-27 15:21:06.515858660 +0200
+@@ -17,14 +17,14 @@
+     # use pkg-config to get the values of QJSON_INCLUDE_DIRS
+     # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
+     include (FindPkgConfig)
+-    pkg_check_modules (QJSON QJson>=0.5)
++    pkg_check_modules (PC_QJSON QJson>=0.5)
+   endif (NOT WIN32)
+ 
+   find_library (QJSON_LIBRARIES
+     NAMES
+     qjson
+     PATHS
+-    ${QJSON_LIBRARY_DIRS}
++    ${PC_QJSON_LIBRARY_DIRS}
+     ${LIB_INSTALL_DIR}
+     ${KDE4_LIB_DIR}
+   )
+@@ -35,7 +35,7 @@
+     PATH_SUFFIXES
+     qjson
+     PATHS
+-    ${QJSON_INCLUDE_DIRS}
++    ${PC_QJSON_INCLUDE_DIRS}
+     ${INCLUDE_INSTALL_DIR}
+     ${KDE4_INCLUDE_DIR}
+   )
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.0.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.0.ebuild
index 18e4ee0d2a13..a0defa6fa6b6 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.0.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.3.0.ebuild,v 1.1 2010/03/31 16:31:18 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.0.ebuild,v 1.2 2010/04/27 13:47:48 reavertm Exp $
 
 EAPI=2
 
@@ -16,6 +16,9 @@ KEYWORDS="~amd64 ~x86"
 # Add "test" when the automatic/required dependency upon dev-libs/qjson is fixed!
 IUSE=""
 
+# Bug #315215, require X server running
+RESTRICT="test"
+
 # Change this to test?(qjson) when the automatic/required dep is fixed!
 DEPEND="
 	dev-libs/qjson
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.2-r1.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..77ff5a8a208f
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 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.3.2-r1.ebuild,v 1.1 2010/04/27 13:47:48 reavertm Exp $
+
+EAPI="3"
+
+inherit cmake-utils
+
+DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
+HOMEPAGE="http://people.canonical.com/~agateau/dbusmenu/"
+SRC_URI="http://people.canonical.com/~agateau/dbusmenu/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+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="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.2-cmake.patch"
+)
+
+DOCS="NEWS README"