[gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/

[Manuel Rüger]

commit:     6b93ba7019fbbfda8f672372e05375b83cd7ddfb
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat May 30 16:07:01 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat May 30 16:07:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b93ba70

[kde-apps/gwenview] Don't depend on unreleased kipi/kdcraw. Thanks to Andreas 
Sturmlechner for noticing this.

Package-Manager: portage-2.2.20

 kde-apps/gwenview/gwenview-15.04.2.ebuild | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-15.04.2.ebuild 
b/kde-apps/gwenview/gwenview-15.04.2.ebuild
index a5447ed..e922a53 100644
--- a/kde-apps/gwenview/gwenview-15.04.2.ebuild
+++ b/kde-apps/gwenview/gwenview-15.04.2.ebuild
@@ -14,8 +14,11 @@ HOMEPAGE="
        http://gwenview.sourceforge.net/
 "
 KEYWORDS="~amd64 ~x86"
-IUSE="kipi raw semantic-desktop"
+IUSE="semantic-desktop"
 
+# Not released: USE="kipi raw"
+# kipi? ( $(add_kdeapps_dep libkipi '' 5.9999) )
+# raw? ( $(add_kdeapps_dep libkdcraw '' 5.9999) )
 DEPEND="
        $(add_frameworks_dep kactivities)
        $(add_frameworks_dep kcompletion)
@@ -45,18 +48,22 @@ DEPEND="
        media-libs/phonon[qt5]
        virtual/jpeg:0
        x11-libs/libX11
-       kipi? ( $(add_kdeapps_dep libkipi '' 5.9999) )
-       raw? ( $(add_kdeapps_dep libkdcraw '' 5.9999) )
        semantic-desktop? ( $(add_plasma_dep baloo) )
 "
 
 RDEPEND="${DEPEND}"
 
 src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_find_package kipi KF5Kipi)
-               $(cmake-utils_use_find_package raw KF5KDcraw)
-       )
+#      Not released:
+#      local mycmakeargs=(
+#              $(cmake-utils_use_find_package kipi KF5Kipi)
+#              $(cmake-utils_use_find_package raw KF5KDcraw)
+#      )
+
+       # Workaround for bug #479510
+       if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
+               mycmakeargs+=( 
-DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" )
+       fi
 
        if use semantic-desktop; then
                mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)