From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5BDC9138CD0 for ; Sat, 30 May 2015 16:07:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 655FFE0966; Sat, 30 May 2015 16:07:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10B27E0966 for ; Sat, 30 May 2015 16:07:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA1D3340CBF for ; Sat, 30 May 2015 16:07:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C62779ED for ; Sat, 30 May 2015 16:07:09 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1433002021.6b93ba7019fbbfda8f672372e05375b83cd7ddfb.mrueg@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/gwenview/gwenview-15.04.2.ebuild X-VCS-Directories: kde-apps/gwenview/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: 6b93ba7019fbbfda8f672372e05375b83cd7ddfb X-VCS-Branch: master Date: Sat, 30 May 2015 16:07:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 35e70a2d-22cc-443e-b016-0235d47a93cd X-Archives-Hash: 83ed51c982b89e6e5f2c738b7889a8ab commit: 6b93ba7019fbbfda8f672372e05375b83cd7ddfb Author: Manuel Rüger gentoo org> AuthorDate: Sat May 30 16:07:01 2015 +0000 Commit: Manuel Rüger gentoo 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)