[gentoo-commits] proj/kde:master commit in: dev-libs/extra-cmake-modules/, dev-libs/extra-cmake-modules/files/
commit: d4eb24d8eb6d98d87f92fb49e11db021a0ff5b53
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Fri Aug 8 14:50:38 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Fri Aug 8 14:50:38 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d4eb24d8
[dev-libs/extra-cmake-modules] Remove old.
Package-Manager: portage-2.2.10
---
.../extra-cmake-modules-1.0.0-r2.ebuild| 49
.../files/extra-cmake-modules-1.0.0-kxmlgui.patch | 66 --
.../files/extra-cmake-modules-1.0.0-linguas.patch | 42 --
3 files changed, 157 deletions(-)
diff --git a/dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0-r2.ebuild
b/dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0-r2.ebuild
deleted file mode 100644
index ab87b50..000
--- a/dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION=Extra modules and scripts for CMake
-HOMEPAGE=https://projects.kde.org/projects/kdesupport/extra-cmake-modules;
-SRC_URI=mirror://kde/stable/frameworks/5.0.0/${P}.tar.xz
-
-LICENSE=BSD
-SLOT=0
-KEYWORDS=~amd64
-IUSE=doc
-
-DEPEND=
- app-arch/xz-utils
- =dev-util/cmake-2.8.12
- doc? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
- )
-
-
-PATCHES=(
- ${FILESDIR}/${P}-linguas.patch
- ${FILESDIR}/${P}-kxmlgui.patch
-)
-
-python_check_deps() {
- has_version dev-python/sphinx[${PYTHON_USEDEP}]
-}
-
-pkg_setup() {
- use doc python-any-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build doc HTML_DOCS)
- $(cmake-utils_use_build doc MAN_DOCS)
- )
-
- cmake-utils_src_configure
-}
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
deleted file mode 100644
index 94a58b4..000
--- a/dev-libs/extra-cmake-modules/files/extra-cmake-modules-1.0.0-kxmlgui.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 032b4c4baaaff5fde1243864149d33f545767b5c Mon Sep 17 00:00:00 2001
-From: David Faure fa...@kde.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
-
diff --git
[gentoo-commits] proj/kde:master commit in: dev-libs/extra-cmake-modules/, dev-libs/extra-cmake-modules/files/
commit: f18654535b6c264adddcf81f06eb95d6f4a53f61
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sun Jul 27 15:18:47 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sun Jul 27 15:18:47 2014 +
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 000..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 fa...@kde.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
+
[gentoo-commits] proj/kde:master commit in: dev-libs/extra-cmake-modules/, dev-libs/extra-cmake-modules/files/
commit: 52045ba54d1775bf71e202085ce84fbd54ee690f
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sun Jul 13 15:29:33 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sun Jul 13 15:29:33 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=52045ba5
[dev-libs/extra-cmake-modules] Backport patch from upstream fixing build
failure when LINGUAS is set and Qt4 is installed.
Package-Manager: portage-2.2.10
---
ebuild = extra-cmake-modules-1.0.0-r1.ebuild} | 2 ++
.../files/extra-cmake-modules-1.0.0-linguas.patch | 42 ++
2 files changed, 44 insertions(+)
diff --git a/dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0.ebuild
b/dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0-r1.ebuild
similarity index 94%
rename from dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0.ebuild
rename to dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0-r1.ebuild
index 0cde8c2..da40a74 100644
--- a/dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0.ebuild
+++ b/dev-libs/extra-cmake-modules/extra-cmake-modules-1.0.0-r1.ebuild
@@ -26,6 +26,8 @@ DEPEND=
)
+PATCHES=( ${FILESDIR}/${P}-linguas.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-linguas.patch
b/dev-libs/extra-cmake-modules/files/extra-cmake-modules-1.0.0-linguas.patch
new file mode 100644
index 000..76bf989
--- /dev/null
+++ b/dev-libs/extra-cmake-modules/files/extra-cmake-modules-1.0.0-linguas.patch
@@ -0,0 +1,42 @@
+From 5acf1735f7f497662c6ebe43220489dc81785ec6 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka kensing...@gentoo.org
+Date: Wed, 9 Jul 2014 23:54:11 +1000
+Subject: [PATCH] Don't search default paths when finding lconvert.
+
+Otherwise, if lconvert exists in normal system paths (eg. /usr/bin) that one
+will be used instead of the one alongside Qt5::lrelease. This could cause Qt4
+lconvert to be incorrectly used on some systems.
+
+REVIEW: 119198
+---
+ modules/ECMCreateQmFromPoFiles.cmake | 1 +
+ modules/ECMPoQmTools.cmake | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/modules/ECMCreateQmFromPoFiles.cmake
b/modules/ECMCreateQmFromPoFiles.cmake
+index 4a31a93..b66e598 100644
+--- a/modules/ECMCreateQmFromPoFiles.cmake
b/modules/ECMCreateQmFromPoFiles.cmake
+@@ -113,6 +113,7 @@ function(_ECM_QM_CREATE_TARGET install_destination
catalog_name)
+ find_program(lconvert_executable
+ NAMES lconvert-qt5 lconvert
+ PATHS ${lrelease_path}
++NO_DEFAULT_PATH
+ )
+
+ if (catalog_name)
+diff --git a/modules/ECMPoQmTools.cmake b/modules/ECMPoQmTools.cmake
+index 3ce6958..74dc656 100644
+--- a/modules/ECMPoQmTools.cmake
b/modules/ECMPoQmTools.cmake
+@@ -129,6 +129,7 @@ function(ecm_process_po_files_as_qm lang)
+ find_program(lconvert_executable
+ NAMES lconvert-qt5 lconvert
+ PATHS ${lrelease_path}
++NO_DEFAULT_PATH
+ )
+
+ # Create commands to turn po files into qm files
+--
+1.8.5.5
+
