Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/
Date: Fri, 29 May 2015 14:50:43
Message-Id: 1432911014.c36c116f2873e15e81058bb3a54b925ac112bb08.kensington@gentoo
1 commit: c36c116f2873e15e81058bb3a54b925ac112bb08
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 29 14:50:14 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Fri May 29 14:50:14 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c36c116f
7
8 [kde-apps/gwenview] Remove workaround that is no longer required.
9
10 Upstream commit: b73a9272688ca64c8f98c3d47a211ab3ccbfbaef
11
12 Package-Manager: portage-2.2.20
13
14 kde-apps/gwenview/gwenview-15.04.49.9999.ebuild | 5 -----
15 kde-apps/gwenview/gwenview-9999.ebuild | 5 -----
16 2 files changed, 10 deletions(-)
17
18 diff --git a/kde-apps/gwenview/gwenview-15.04.49.9999.ebuild b/kde-apps/gwenview/gwenview-15.04.49.9999.ebuild
19 index 3b4ac99..48fd099 100644
20 --- a/kde-apps/gwenview/gwenview-15.04.49.9999.ebuild
21 +++ b/kde-apps/gwenview/gwenview-15.04.49.9999.ebuild
22 @@ -58,11 +58,6 @@ src_configure() {
23 $(cmake-utils_use_find_package raw KF5KDcraw)
24 )
25
26 - # Workaround for bug #479510
27 - if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
28 - mycmakeargs+=( -DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" )
29 - fi
30 -
31 if use semantic-desktop; then
32 mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
33 else
34
35 diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
36 index 3b4ac99..48fd099 100644
37 --- a/kde-apps/gwenview/gwenview-9999.ebuild
38 +++ b/kde-apps/gwenview/gwenview-9999.ebuild
39 @@ -58,11 +58,6 @@ src_configure() {
40 $(cmake-utils_use_find_package raw KF5KDcraw)
41 )
42
43 - # Workaround for bug #479510
44 - if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
45 - mycmakeargs+=( -DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" )
46 - fi
47 -
48 if use semantic-desktop; then
49 mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
50 else