[dev-libs/libdbusmenu-qt] Synced with portage

5 files changed, 41 insertions, 48 deletions

diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index 7de727719f8..457c3787bf3 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,5 +1,3 @@
-AUX libdbusmenu-qt-0.3.2-qtincludedir.patch 382 RMD160 75af49240c5429017f7dfef4982d94b03060dd33 SHA1 7239aec611bcbca42fbfff8c11c27286bfa78fb6 SHA256 cfc24ca19d6e31b2b1588d7cea44d55a2f8b8c1f0ea18a29c3fda799f493e488
-DIST libdbusmenu-qt-0.3.2.tar.bz2 24729 RMD160 75a3c5b486880d1366b136b476b1a69328291695 SHA1 ea30bac73962a36ab1050105573ee068951a383f SHA256 6b81786b1cd9d5225256fd748b1235a36f97226c5c0e3dc2d40a4891a7a57b4b
-EBUILD libdbusmenu-qt-0.3.2.ebuild 589 RMD160 aba2448b5aea1d875c110bd403277c01bdfd5fe4 SHA1 81515ce6c8b211412c0cee650e6cca7039e7ece0 SHA256 c800baf0b1336a84b90e443a16b46930c95876c7cf7394595f2d5dd98b1d3dff
-EBUILD libdbusmenu-qt-9999.ebuild 598 RMD160 5d861808a12a5fd549978f6720e95d77af572504 SHA1 a0f0ba38cc44a2c95d564b9f0431a22e68c16460 SHA256 7b8ac2817c752ed65e13e11fa39fe882741aa1de0e22a3502306edf3a13d6d8c
+AUX libdbusmenu-qt-0.3.2-cmake.patch 914 RMD160 ea5965d76f472869d7c2535e389703861ef440db SHA1 6b9b6cf7e1fa77c61fbb6a85ff3789763b0484b2 SHA256 fd434784063bab7d5413b7e899a5357006bf4f27bf941b6e85349d6bba9e315d
+EBUILD libdbusmenu-qt-9999.ebuild 608 RMD160 13fea59b141b9da5056c305a3dbcacfb36303ba0 SHA1 b6c86e144af77b7c2d14e30ca80a9a839689e9ff SHA256 e681fece4a1e6816e6cf4316abb9659fe16e1f997b398c4ad0f426ed5c483dba
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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 00000000000..e8e13c480bf
--- /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/files/libdbusmenu-qt-0.3.2-qtincludedir.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-qtincludedir.patch
deleted file mode 100644
index 8c2d274dcab..00000000000
--- a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-qtincludedir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tools/testapp/CMakeLists.txt b/tools/testapp/CMakeLists.txt
-index 5b6d72e..77ab35d 100644
---- a/tools/testapp/CMakeLists.txt
-+++ b/tools/testapp/CMakeLists.txt
-@@ -11,6 +11,8 @@ include_directories(
-     ${QJSON_INCLUDE_DIR}
-     )
- 
-+link_directories(${QT_LIBRARY_DIR})
-+
- add_executable(dbusmenubench-qtapp ${qtapp_SRCS})
- 
- target_link_libraries(dbusmenubench-qtapp
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.2.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.2.ebuild
deleted file mode 100644
index 135aea8d398..00000000000
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils 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"
-
-DEPEND="
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4[dbus]
-	x11-libs/qt-test:4
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qtincludedir.patch
-}
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
index 5ed81d185ae..f82a14d10af 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="3"
 
-inherit eutils cmake-utils git
+inherit git cmake-utils
 
 DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
 HOMEPAGE="http://people.canonical.com/~agateau/dbusmenu/"
@@ -22,7 +22,12 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.3.2-qtincludedir.patch
-	git_src_prepare
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.2-cmake.patch"
+)
+
+DOCS="NEWS README"
+
+src_unpack() {
+	git_src_unpack
 }