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/gwenview/
Date: Sat, 30 May 2015 16:07:19
Message-Id: 1433002021.6b93ba7019fbbfda8f672372e05375b83cd7ddfb.mrueg@gentoo
1 commit: 6b93ba7019fbbfda8f672372e05375b83cd7ddfb
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 30 16:07:01 2015 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Sat May 30 16:07:01 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b93ba70
7
8 [kde-apps/gwenview] Don't depend on unreleased kipi/kdcraw. Thanks to Andreas Sturmlechner for noticing this.
9
10 Package-Manager: portage-2.2.20
11
12 kde-apps/gwenview/gwenview-15.04.2.ebuild | 21 ++++++++++++++-------
13 1 file changed, 14 insertions(+), 7 deletions(-)
14
15 diff --git a/kde-apps/gwenview/gwenview-15.04.2.ebuild b/kde-apps/gwenview/gwenview-15.04.2.ebuild
16 index a5447ed..e922a53 100644
17 --- a/kde-apps/gwenview/gwenview-15.04.2.ebuild
18 +++ b/kde-apps/gwenview/gwenview-15.04.2.ebuild
19 @@ -14,8 +14,11 @@ HOMEPAGE="
20 http://gwenview.sourceforge.net/
21 "
22 KEYWORDS="~amd64 ~x86"
23 -IUSE="kipi raw semantic-desktop"
24 +IUSE="semantic-desktop"
25
26 +# Not released: USE="kipi raw"
27 +# kipi? ( $(add_kdeapps_dep libkipi '' 5.9999) )
28 +# raw? ( $(add_kdeapps_dep libkdcraw '' 5.9999) )
29 DEPEND="
30 $(add_frameworks_dep kactivities)
31 $(add_frameworks_dep kcompletion)
32 @@ -45,18 +48,22 @@ DEPEND="
33 media-libs/phonon[qt5]
34 virtual/jpeg:0
35 x11-libs/libX11
36 - kipi? ( $(add_kdeapps_dep libkipi '' 5.9999) )
37 - raw? ( $(add_kdeapps_dep libkdcraw '' 5.9999) )
38 semantic-desktop? ( $(add_plasma_dep baloo) )
39 "
40
41 RDEPEND="${DEPEND}"
42
43 src_configure() {
44 - local mycmakeargs=(
45 - $(cmake-utils_use_find_package kipi KF5Kipi)
46 - $(cmake-utils_use_find_package raw KF5KDcraw)
47 - )
48 +# Not released:
49 +# local mycmakeargs=(
50 +# $(cmake-utils_use_find_package kipi KF5Kipi)
51 +# $(cmake-utils_use_find_package raw KF5KDcraw)
52 +# )
53 +
54 + # Workaround for bug #479510
55 + if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
56 + mycmakeargs+=( -DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" )
57 + fi
58
59 if use semantic-desktop; then
60 mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)