From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kajongg/files/, kde-apps/kajongg/
Date: Sat, 8 Apr 2017 19:40:35 +0000 (UTC) [thread overview]
Message-ID: <1491680264.e779b4fb6ba3edce651de732865a874bf9cca158.asturm@gentoo> (raw)
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 <andreas.sturmlechner@gmail.com>
+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() {
reply other threads:[~2017-04-08 19:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1491680264.e779b4fb6ba3edce651de732865a874bf9cca158.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox