Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdesdk-meta/
Date: Sat, 27 Jun 2015 14:53:25
Message-Id: 1435416778.c43aa61bc5a19a95ae3b5db093d7de3b98a3b981.mrueg@gentoo
1 commit: c43aa61bc5a19a95ae3b5db093d7de3b98a3b981
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 27 14:52:58 2015 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 27 14:52:58 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c43aa61b
7
8 [kde-apps/kdesdk-meta] Allow lower version via USE flag for kde-apps/{kompare,libkomparediff2}.
9
10 Package-Manager: portage-2.2.20
11
12 kde-apps/kdesdk-meta/kdesdk-meta-15.04.3.ebuild | 8 +++++---
13 kde-apps/kdesdk-meta/metadata.xml | 3 +++
14 2 files changed, 8 insertions(+), 3 deletions(-)
15
16 diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-15.04.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-15.04.3.ebuild
17 index 5c6ba61..4d4ff34 100644
18 --- a/kde-apps/kdesdk-meta/kdesdk-meta-15.04.3.ebuild
19 +++ b/kde-apps/kdesdk-meta/kdesdk-meta-15.04.3.ebuild
20 @@ -9,7 +9,7 @@ inherit kde5-meta-pkg
21 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
22 HOMEPAGE="http://www.kde.org/applications/development"
23 KEYWORDS="~amd64 ~x86"
24 -IUSE="cvs"
25 +IUSE="cvs relaxed_deps"
26
27 RDEPEND="
28 $(add_kdeapps_dep dolphin-plugins)
29 @@ -19,11 +19,13 @@ RDEPEND="
30 $(add_kdeapps_dep kde-dev-scripts)
31 $(add_kdeapps_dep kde-dev-utils)
32 $(add_kdeapps_dep kdesdk-kioslaves)
33 - $(add_kdeapps_dep kompare)
34 - $(add_kdeapps_dep libkomparediff2)
35 $(add_kdeapps_dep lokalize)
36 $(add_kdeapps_dep okteta)
37 $(add_kdeapps_dep poxml)
38 $(add_kdeapps_dep umbrello)
39 + relaxed_deps? ( $(add_kdeapps_dep kompare '' '14.12.3')
40 + $(add_kdeapps_dep libkomparediff2 '' '14.12.3') )
41 + !relaxed_deps? ( $(add_kdeapps_dep kompare)
42 + $(add_kdeapps_dep libkomparediff2) )
43 cvs? ( $(add_kdeapps_dep cervisia) )
44 "
45
46 diff --git a/kde-apps/kdesdk-meta/metadata.xml b/kde-apps/kdesdk-meta/metadata.xml
47 index a23f444..ff073f3 100644
48 --- a/kde-apps/kdesdk-meta/metadata.xml
49 +++ b/kde-apps/kdesdk-meta/metadata.xml
50 @@ -2,4 +2,7 @@
51 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
52 <pkgmetadata>
53 <herd>kde</herd>
54 + <use>
55 + <flag name='relaxed_deps'> Allow relaxed dependency on lower version to enable coninstabillity with other meta packages.</flag>
56 + </use>
57 </pkgmetadata>