diff options
4 files changed, 0 insertions, 158 deletions
diff --git a/dev-libs/extra-cmake-modules/Manifest b/dev-libs/extra-cmake-modules/Manifest index 894cb484dca..e2624d5fcd0 100644 --- a/dev-libs/extra-cmake-modules/Manifest +++ b/dev-libs/extra-cmake-modules/Manifest @@ -1,2 +1 @@ -DIST extra-cmake-modules-1.0.0.tar.xz 116972 SHA256 41434c8c8f79efe4a9e44ef18daa0bc3ecc86834f5f8f2ae3c2acc612127093c SHA512 13d07ac94a07b4d2c8c6622b50dc877c7ddf341be91ebd7fa7da34229c8e1b6f54a858040586fa1d3ddd7fa9b7665c530b9ae5da4d7ab62184e880d0c55eef62 WHIRLPOOL f82ee3f7a353a650a5b2a79fa674f1b13ad8960d0e19914080268ee24bbbcb81f00d517b2f7a290b9a21a2142661a84254d87471467cf15779b531bd4db48750 DIST extra-cmake-modules-1.1.0.tar.xz 117380 SHA256 0b460126dfc5faabb64fe4f0f9ec0d247fe75cf66c2a8a5f0d66d4a45f73e303 SHA512 76947a9ea76611e5f3593b5e60d0f2e102459d6fa85c8e7e21371bcc6d513372dfccd01c9eb021d75f9782942612d27c7ebc97c978838329c1505e2792794353 WHIRLPOOL 0f965f6cebc76f804d7c87cbef2ce318ce1a9fdff15f3d7ab6c60ff2001dd2cd0097ddce7f48a7670842e3a5f29f93c175aa4fc9df632620d2842b0117c762b2 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 ab87b508b03..00000000000 --- 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 94a58b40167..00000000000 --- 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 <faure@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 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 deleted file mode 100644 index 76bf9890017..00000000000 --- a/dev-libs/extra-cmake-modules/files/extra-cmake-modules-1.0.0-linguas.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5acf1735f7f497662c6ebe43220489dc81785ec6 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@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 - |