| 1 |
commit: e779b4fb6ba3edce651de732865a874bf9cca158 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 8 19:36:31 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 8 19:37:44 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e779b4fb |
| 7 |
|
| 8 |
kde-apps/kajongg: Add missing DEPEND, block <kde-apps/kde4-l10n-17.03.90 |
| 9 |
|
| 10 |
Translation files collide with versions pre-KF5 porting. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 13 |
|
| 14 |
kde-apps/kajongg/files/kajongg-17.03.90-deps.patch | 30 ++++++++++++++++++++++ |
| 15 |
kde-apps/kajongg/kajongg-17.03.90.ebuild | 4 +++ |
| 16 |
kde-apps/kajongg/kajongg-17.04.49.9999.ebuild | 2 ++ |
| 17 |
kde-apps/kajongg/kajongg-9999.ebuild | 2 ++ |
| 18 |
4 files changed, 38 insertions(+) |
| 19 |
|
| 20 |
diff --git a/kde-apps/kajongg/files/kajongg-17.03.90-deps.patch b/kde-apps/kajongg/files/kajongg-17.03.90-deps.patch |
| 21 |
new file mode 100644 |
| 22 |
index 0000000000..91ca58e16f |
| 23 |
--- /dev/null |
| 24 |
+++ b/kde-apps/kajongg/files/kajongg-17.03.90-deps.patch |
| 25 |
@@ -0,0 +1,30 @@ |
| 26 |
+commit 76c932320b62b21ac5be21fb3df6be315ef4cdf0 |
| 27 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 28 |
+Date: Sat Apr 8 21:17:03 2017 +0200 |
| 29 |
+ |
| 30 |
+ Add missing KF5I18n dependency |
| 31 |
+ |
| 32 |
+ Release tarball expects it for ki18n_install. |
| 33 |
+ |
| 34 |
+ REVIEW: 130071 |
| 35 |
+ |
| 36 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 37 |
+index c25a94ff..bca3692d 100644 |
| 38 |
+--- a/CMakeLists.txt |
| 39 |
++++ b/CMakeLists.txt |
| 40 |
+@@ -9,13 +9,13 @@ set(KF5_MIN_VERSION "5.15.0") |
| 41 |
+ set(TWISTED_MIN_VERSION "16.6.0") |
| 42 |
+ |
| 43 |
+ find_package(ECM 1.2.0 REQUIRED NO_MODULE) |
| 44 |
+- |
| 45 |
++ |
| 46 |
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) |
| 47 |
+ |
| 48 |
+ find_package(PythonInterp ${PYTHON_MIN_VERSION} REQUIRED) |
| 49 |
+ find_package(Twisted ${TWISTED_MIN_VERSION} REQUIRED) |
| 50 |
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Svg Widgets) |
| 51 |
+-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config DocTools) |
| 52 |
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config DocTools I18n) |
| 53 |
+ |
| 54 |
+ include(FeatureSummary) |
| 55 |
+ include(ECMPackageConfigHelpers) |
| 56 |
|
| 57 |
diff --git a/kde-apps/kajongg/kajongg-17.03.90.ebuild b/kde-apps/kajongg/kajongg-17.03.90.ebuild |
| 58 |
index 45b15136e2..56492bd2ea 100644 |
| 59 |
--- a/kde-apps/kajongg/kajongg-17.03.90.ebuild |
| 60 |
+++ b/kde-apps/kajongg/kajongg-17.03.90.ebuild |
| 61 |
@@ -18,6 +18,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 62 |
DEPEND="${PYTHON_DEPS} |
| 63 |
$(add_frameworks_dep extra-cmake-modules) |
| 64 |
$(add_frameworks_dep kconfig) |
| 65 |
+ $(add_frameworks_dep ki18n) |
| 66 |
$(add_kdeapps_dep libkdegames) |
| 67 |
$(add_qt_dep qtcore) |
| 68 |
$(add_qt_dep qtgui) |
| 69 |
@@ -30,8 +31,11 @@ DEPEND="${PYTHON_DEPS} |
| 70 |
RDEPEND="${DEPEND} |
| 71 |
$(add_kdeapps_dep libkmahjongg) |
| 72 |
!kde-apps/kajongg:4 |
| 73 |
+ !<kde-apps/kde4-l10n-17.03.90:4 |
| 74 |
" |
| 75 |
|
| 76 |
+PATCHES=( "${FILESDIR}/${P}-deps.patch" ) |
| 77 |
+ |
| 78 |
pkg_setup() { |
| 79 |
python-single-r1_pkg_setup |
| 80 |
kde5_pkg_setup |
| 81 |
|
| 82 |
diff --git a/kde-apps/kajongg/kajongg-17.04.49.9999.ebuild b/kde-apps/kajongg/kajongg-17.04.49.9999.ebuild |
| 83 |
index af2f3e6838..42fbb78d56 100644 |
| 84 |
--- a/kde-apps/kajongg/kajongg-17.04.49.9999.ebuild |
| 85 |
+++ b/kde-apps/kajongg/kajongg-17.04.49.9999.ebuild |
| 86 |
@@ -18,6 +18,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 87 |
DEPEND="${PYTHON_DEPS} |
| 88 |
$(add_frameworks_dep extra-cmake-modules) |
| 89 |
$(add_frameworks_dep kconfig) |
| 90 |
+ $(add_frameworks_dep ki18n) |
| 91 |
$(add_kdeapps_dep libkdegames) |
| 92 |
$(add_qt_dep qtcore) |
| 93 |
$(add_qt_dep qtgui) |
| 94 |
@@ -30,6 +31,7 @@ DEPEND="${PYTHON_DEPS} |
| 95 |
RDEPEND="${DEPEND} |
| 96 |
$(add_kdeapps_dep libkmahjongg) |
| 97 |
!kde-apps/kajongg:4 |
| 98 |
+ !<kde-apps/kde4-l10n-17.03.90:4 |
| 99 |
" |
| 100 |
|
| 101 |
pkg_setup() { |
| 102 |
|
| 103 |
diff --git a/kde-apps/kajongg/kajongg-9999.ebuild b/kde-apps/kajongg/kajongg-9999.ebuild |
| 104 |
index af2f3e6838..42fbb78d56 100644 |
| 105 |
--- a/kde-apps/kajongg/kajongg-9999.ebuild |
| 106 |
+++ b/kde-apps/kajongg/kajongg-9999.ebuild |
| 107 |
@@ -18,6 +18,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 108 |
DEPEND="${PYTHON_DEPS} |
| 109 |
$(add_frameworks_dep extra-cmake-modules) |
| 110 |
$(add_frameworks_dep kconfig) |
| 111 |
+ $(add_frameworks_dep ki18n) |
| 112 |
$(add_kdeapps_dep libkdegames) |
| 113 |
$(add_qt_dep qtcore) |
| 114 |
$(add_qt_dep qtgui) |
| 115 |
@@ -30,6 +31,7 @@ DEPEND="${PYTHON_DEPS} |
| 116 |
RDEPEND="${DEPEND} |
| 117 |
$(add_kdeapps_dep libkmahjongg) |
| 118 |
!kde-apps/kajongg:4 |
| 119 |
+ !<kde-apps/kde4-l10n-17.03.90:4 |
| 120 |
" |
| 121 |
|
| 122 |
pkg_setup() { |
Archives