Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepimlibs/
Date: Sun, 27 Aug 2017 17:23:11
Message-Id: 1503854560.10199e4b090fe561f603b618769a31627b22b74b.asturm@gentoo
1 commit: 10199e4b090fe561f603b618769a31627b22b74b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 27 17:21:41 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 27 17:22:40 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10199e4b
7
8 kde-apps/kdepimlibs: Drop USE=prison
9
10 It is a no-op for veryoldpim.
11
12 Package-Manager: Portage-2.3.8, Repoman-2.3.3
13
14 kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild | 5 ++---
15 kde-apps/kdepimlibs/metadata.xml | 3 ---
16 2 files changed, 2 insertions(+), 6 deletions(-)
17
18 diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
19 index 2a93f71a83b..831871c89f2 100644
20 --- a/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
21 +++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
22 @@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P/10_p/11_pre}.tar.xz"
23
24 KEYWORDS="amd64 ~arm x86"
25 LICENSE="LGPL-2.1"
26 -IUSE="debug ldap prison"
27 +IUSE="debug ldap"
28
29 # some akonadi tests timeout, that probably needs more work as its ~700 tests
30 RESTRICT="test"
31 @@ -29,7 +29,6 @@ DEPEND="
32 media-libs/phonon[qt4]
33 x11-misc/shared-mime-info
34 ldap? ( net-nds/openldap )
35 - prison? ( kde-frameworks/prison:4 )
36 "
37 # boost is not linked to, but headers which include it are installed
38 # bug #418071
39 @@ -45,7 +44,7 @@ src_configure() {
40 -DBUILD_TOOLS=OFF
41 -DBUILD_doc=$(usex handbook)
42 $(cmake-utils_use_find_package ldap Ldap)
43 - $(cmake-utils_use_find_package prison Prison)
44 + -DCMAKE_DISABLE_FIND_PACKAGE_Prison=ON
45 )
46
47 kde4-base_src_configure
48
49 diff --git a/kde-apps/kdepimlibs/metadata.xml b/kde-apps/kdepimlibs/metadata.xml
50 index b17398a5cb9..2fdbf33d963 100644
51 --- a/kde-apps/kdepimlibs/metadata.xml
52 +++ b/kde-apps/kdepimlibs/metadata.xml
53 @@ -5,7 +5,4 @@
54 <email>kde@g.o</email>
55 <name>Gentoo KDE Project</name>
56 </maintainer>
57 - <use>
58 - <flag name="prison">Enable support for QRcodes in contacts</flag>
59 - </use>
60 </pkgmetadata>