[gentoo-commits] proj/kde:master commit in: dev-libs/extra-cmake-modules/, dev-libs/extra-cmake-modules/files/

[Michael Palimaka]

commit:     f18654535b6c264adddcf81f06eb95d6f4a53f61
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 27 15:18:47 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 27 15:18:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f1865453

[dev-libs/extra-cmake-modules] Backport patch from upstream adding KXMLGUI_INSTALL_DIR variable, required by Plasma 5.0.0.

Package-Manager: portage-2.2.10

---
 ....ebuild => extra-cmake-modules-1.0.0-r2.ebuild} |  5 +-
 .../files/extra-cmake-modules-1.0.0-kxmlgui.patch  | 66 ++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0-r1.ebuild b/dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0-r2.ebuild
similarity index 91%
rename from dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0-r1.ebuild
rename to dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0-r2.ebuild
index da40a74..ab87b50 100644
--- a/dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0-r1.ebuild
+++ b/dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0-r2.ebuild
@@ -26,7 +26,10 @@ DEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${P}-linguas.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-linguas.patch"
+	"${FILESDIR}/${P}-kxmlgui.patch"
+)
 
 python_check_deps() {
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"

diff --git a/dev-libs/extra-cmake-modules/files/extra-cmake-modules-1.0.0-kxmlgui.patch b/dev-libs/extra-cmake-modules/files/extra-cmake-modules-1.0.0-kxmlgui.patch
new file mode 100644
index 0000000..94a58b4
--- /dev/null
+++ b/dev-libs/extra-cmake-modules/files/extra-cmake-modules-1.0.0-kxmlgui.patch
@@ -0,0 +1,66 @@
+From 032b4c4baaaff5fde1243864149d33f545767b5c Mon Sep 17 00:00:00 2001
+From: David Faure <faure@×××.org>
+Date: Mon, 7 Jul 2014 00:09:53 +0200
+Subject: [PATCH] Define convenience variable for DATAROOTDIR/kxmlgui5.
+
+See RR 119142 for more details.
+---
+ kde-modules/KDEInstallDirs.cmake                     | 6 ++++++
+ tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt | 3 +++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index 061e542..90ed5b8 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -69,6 +69,9 @@
+ # ``KSERVICETYPES5DIR``
+ #     service types for KDE Frameworks 5 (``DATAROOTDIR/kservicetypes5``)
+ #     [``SERVICETYPES_INSTALL_DIR``]
++# ``KXMLGUI5DIR``
++#     knotify description files (``DATAROOTDIR/kxmlgui5``)
++#     [``KXMLGUI_INSTALL_DIR``]
+ # ``KNOTIFY5RCDIR``
+ #     knotify description files (``DATAROOTDIR/knotifications5``)
+ #     [``KNOTIFYRC_INSTALL_DIR``]
+@@ -384,6 +387,9 @@ _define_relative(KSERVICETYPES5DIR DATAROOTDIR "kservicetypes5"
+ _define_relative(KNOTIFY5RCDIR DATAROOTDIR "knotifications5"
+     "knotify description files"
+     KNOTIFYRC_INSTALL_DIR)
++_define_relative(KXMLGUI5DIR DATAROOTDIR "kxmlgui5"
++    "kxmlgui .rc files"
++    KXMLGUI_INSTALL_DIR)
+ 
+ # Cross-desktop or other system things
+ _define_relative(ICONDIR DATAROOTDIR "icons"
+diff --git a/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt b/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt
+index f1617da..3940b81 100644
+--- a/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt
++++ b/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt
+@@ -31,6 +31,7 @@ set(relative_path_vars
+     KF5_INCLUDE_INSTALL_DIR
+     KF5_LIBEXEC_INSTALL_DIR
+     KNOTIFYRC_INSTALL_DIR
++    KXMLGUI_INSTALL_DIR
+     LIBEXEC_INSTALL_DIR
+     LIB_INSTALL_DIR
+     LOCALE_INSTALL_DIR
+@@ -73,6 +74,7 @@ set(relative_path_vars
+     CMAKE_INSTALL_KCFGDIR
+     CMAKE_INSTALL_KCONFUPDATEDIR
+     CMAKE_INSTALL_KNOTIFY5RCDIR
++    CMAKE_INSTALL_KXMLGUI5DIR
+     CMAKE_INSTALL_KSERVICES5DIR
+     CMAKE_INSTALL_KSERVICETYPES5DIR
+     CMAKE_INSTALL_LIBDIR
+@@ -117,6 +119,7 @@ set(absolute_path_vars
+     CMAKE_INSTALL_FULL_KCFGDIR
+     CMAKE_INSTALL_FULL_KCONFUPDATEDIR
+     CMAKE_INSTALL_FULL_KNOTIFY5RCDIR
++    CMAKE_INSTALL_FULL_KXMLGUI5DIR
+     CMAKE_INSTALL_FULL_KSERVICES5DIR
+     CMAKE_INSTALL_FULL_KSERVICETYPES5DIR
+     CMAKE_INSTALL_FULL_LIBDIR
+-- 
+1.8.5.5
+