commit: e779b4fb6ba3edce651de732865a874bf9cca158 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Apr 8 19:36:31 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Apr 8 19:37:44 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e779b4fb
kde-apps/kajongg: Add missing DEPEND, block <kde-apps/kde4-l10n-17.03.90 Translation files collide with versions pre-KF5 porting. Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/kajongg/files/kajongg-17.03.90-deps.patch | 30 ++++++++++++++++++++++ kde-apps/kajongg/kajongg-17.03.90.ebuild | 4 +++ kde-apps/kajongg/kajongg-17.04.49.9999.ebuild | 2 ++ kde-apps/kajongg/kajongg-9999.ebuild | 2 ++ 4 files changed, 38 insertions(+) diff --git a/kde-apps/kajongg/files/kajongg-17.03.90-deps.patch b/kde-apps/kajongg/files/kajongg-17.03.90-deps.patch new file mode 100644 index 0000000000..91ca58e16f --- /dev/null +++ b/kde-apps/kajongg/files/kajongg-17.03.90-deps.patch @@ -0,0 +1,30 @@ +commit 76c932320b62b21ac5be21fb3df6be315ef4cdf0 +Author: Andreas Sturmlechner <[email protected]> +Date: Sat Apr 8 21:17:03 2017 +0200 + + Add missing KF5I18n dependency + + Release tarball expects it for ki18n_install. + + REVIEW: 130071 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c25a94ff..bca3692d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,13 +9,13 @@ set(KF5_MIN_VERSION "5.15.0") + set(TWISTED_MIN_VERSION "16.6.0") + + find_package(ECM 1.2.0 REQUIRED NO_MODULE) +- ++ + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + + find_package(PythonInterp ${PYTHON_MIN_VERSION} REQUIRED) + find_package(Twisted ${TWISTED_MIN_VERSION} REQUIRED) + find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Svg Widgets) +-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config DocTools) ++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config DocTools I18n) + + include(FeatureSummary) + include(ECMPackageConfigHelpers) diff --git a/kde-apps/kajongg/kajongg-17.03.90.ebuild b/kde-apps/kajongg/kajongg-17.03.90.ebuild index 45b15136e2..56492bd2ea 100644 --- a/kde-apps/kajongg/kajongg-17.03.90.ebuild +++ b/kde-apps/kajongg/kajongg-17.03.90.ebuild @@ -18,6 +18,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} $(add_frameworks_dep extra-cmake-modules) $(add_frameworks_dep kconfig) + $(add_frameworks_dep ki18n) $(add_kdeapps_dep libkdegames) $(add_qt_dep qtcore) $(add_qt_dep qtgui) @@ -30,8 +31,11 @@ DEPEND="${PYTHON_DEPS} RDEPEND="${DEPEND} $(add_kdeapps_dep libkmahjongg) !kde-apps/kajongg:4 + !<kde-apps/kde4-l10n-17.03.90:4 " +PATCHES=( "${FILESDIR}/${P}-deps.patch" ) + pkg_setup() { python-single-r1_pkg_setup kde5_pkg_setup diff --git a/kde-apps/kajongg/kajongg-17.04.49.9999.ebuild b/kde-apps/kajongg/kajongg-17.04.49.9999.ebuild index af2f3e6838..42fbb78d56 100644 --- a/kde-apps/kajongg/kajongg-17.04.49.9999.ebuild +++ b/kde-apps/kajongg/kajongg-17.04.49.9999.ebuild @@ -18,6 +18,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} $(add_frameworks_dep extra-cmake-modules) $(add_frameworks_dep kconfig) + $(add_frameworks_dep ki18n) $(add_kdeapps_dep libkdegames) $(add_qt_dep qtcore) $(add_qt_dep qtgui) @@ -30,6 +31,7 @@ DEPEND="${PYTHON_DEPS} RDEPEND="${DEPEND} $(add_kdeapps_dep libkmahjongg) !kde-apps/kajongg:4 + !<kde-apps/kde4-l10n-17.03.90:4 " pkg_setup() { diff --git a/kde-apps/kajongg/kajongg-9999.ebuild b/kde-apps/kajongg/kajongg-9999.ebuild index af2f3e6838..42fbb78d56 100644 --- a/kde-apps/kajongg/kajongg-9999.ebuild +++ b/kde-apps/kajongg/kajongg-9999.ebuild @@ -18,6 +18,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} $(add_frameworks_dep extra-cmake-modules) $(add_frameworks_dep kconfig) + $(add_frameworks_dep ki18n) $(add_kdeapps_dep libkdegames) $(add_qt_dep qtcore) $(add_qt_dep qtgui) @@ -30,6 +31,7 @@ DEPEND="${PYTHON_DEPS} RDEPEND="${DEPEND} $(add_kdeapps_dep libkmahjongg) !kde-apps/kajongg:4 + !<kde-apps/kde4-l10n-17.03.90:4 " pkg_setup() {
