Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/
Date: Tue, 11 Feb 2020 16:24:56
Message-Id: 1581438252.27aad9509d51f325a978262f0db286dac2da9689.asturm@gentoo
1 commit: 27aad9509d51f325a978262f0db286dac2da9689
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 11 15:58:18 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 11 16:24:12 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=27aad950
7
8 kde-apps/umbrello: Add USE php
9
10 Upstream commit bfe073542e03bb9aee8dc7c5a58f8de33f17feef
11
12 Package-Manager: Portage-2.3.88, Repoman-2.3.20
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14 (cherry picked from commit 38f2b95f0c1128c12572129808aad3ace92e46b9)
15
16 kde-apps/umbrello/metadata.xml | 3 +++
17 kde-apps/umbrello/umbrello-19.12.49.9999.ebuild | 7 ++++++-
18 kde-apps/umbrello/umbrello-9999.ebuild | 7 ++++++-
19 3 files changed, 15 insertions(+), 2 deletions(-)
20
21 diff --git a/kde-apps/umbrello/metadata.xml b/kde-apps/umbrello/metadata.xml
22 index 2fdbf33d96..c81c6f761d 100644
23 --- a/kde-apps/umbrello/metadata.xml
24 +++ b/kde-apps/umbrello/metadata.xml
25 @@ -5,4 +5,7 @@
26 <email>kde@g.o</email>
27 <name>Gentoo KDE Project</name>
28 </maintainer>
29 + <use>
30 + <flag name="php">Enable PHP import support using <pkg>dev-util/kdevelop</pkg> and <pkg>dev-util/kdevelop-pg-qt</pkg></flag>
31 + </use>
32 </pkgmetadata>
33
34 diff --git a/kde-apps/umbrello/umbrello-19.12.49.9999.ebuild b/kde-apps/umbrello/umbrello-19.12.49.9999.ebuild
35 index a4d2ce0a79..99da515610 100644
36 --- a/kde-apps/umbrello/umbrello-19.12.49.9999.ebuild
37 +++ b/kde-apps/umbrello/umbrello-19.12.49.9999.ebuild
38 @@ -17,7 +17,7 @@ https://umbrello.kde.org"
39 LICENSE="GPL-2" # TODO: CHECK
40 SLOT="5"
41 KEYWORDS=""
42 -IUSE=""
43 +IUSE="php"
44
45 RDEPEND="
46 >=kde-frameworks/karchive-${KFMIN}:5
47 @@ -43,6 +43,10 @@ RDEPEND="
48 dev-libs/libxml2
49 dev-libs/libxslt
50 >=dev-qt/qtwebkit-5.212.0_pre20180120:5
51 + php? (
52 + dev-util/kdevelop:5=
53 + dev-util/kdevelop-pg-qt
54 + )
55 "
56 DEPEND="${RDEPEND}
57 >=kde-frameworks/kdelibs4support-${KFMIN}:5
58 @@ -51,6 +55,7 @@ DEPEND="${RDEPEND}
59 src_configure() {
60 local mycmakeargs=(
61 -DBUILD_KF5=ON
62 + -DBUILD_PHP_IMPORT=$(usex php)
63 -DBUILD_unittests=$(usex test)
64 )
65 use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
66
67 diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild
68 index 7cc778b41a..01832f0f4a 100644
69 --- a/kde-apps/umbrello/umbrello-9999.ebuild
70 +++ b/kde-apps/umbrello/umbrello-9999.ebuild
71 @@ -17,7 +17,7 @@ https://umbrello.kde.org"
72 LICENSE="GPL-2" # TODO: CHECK
73 SLOT="5"
74 KEYWORDS=""
75 -IUSE=""
76 +IUSE="php"
77
78 RDEPEND="
79 >=kde-frameworks/karchive-${KFMIN}:5
80 @@ -43,6 +43,10 @@ RDEPEND="
81 dev-libs/libxml2
82 dev-libs/libxslt
83 >=dev-qt/qtwebkit-5.212.0_pre20180120:5
84 + php? (
85 + dev-util/kdevelop:5=
86 + dev-util/kdevelop-pg-qt
87 + )
88 "
89 DEPEND="${RDEPEND}
90 >=kde-frameworks/kdelibs4support-${KFMIN}:5
91 @@ -51,6 +55,7 @@ DEPEND="${RDEPEND}
92 src_configure() {
93 local mycmakeargs=(
94 -DBUILD_KF5=ON
95 + -DBUILD_PHP_IMPORT=$(usex php)
96 -DBUILD_unittests=$(usex test)
97 )
98 use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )