From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-913458-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8214E1395E2
for <garchives@archives.gentoo.org>; Sat, 26 Nov 2016 16:31:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 75EE1E08C7;
Sat, 26 Nov 2016 16:31:04 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 588FDE08C7
for <gentoo-commits@lists.gentoo.org>; Sat, 26 Nov 2016 16:31:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7000F34119A
for <gentoo-commits@lists.gentoo.org>; Sat, 26 Nov 2016 16:31:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 37B9E4A6
for <gentoo-commits@lists.gentoo.org>; Sat, 26 Nov 2016 16:31:01 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1480177852.04292b031e4e7bbf18758cf83df9123bd278119d.kensington@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-apps/gwenview/gwenview-16.12.49.9999.ebuild kde-apps/gwenview/gwenview-9999.ebuild
X-VCS-Directories: kde-apps/gwenview/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: 04292b031e4e7bbf18758cf83df9123bd278119d
X-VCS-Branch: master
Date: Sat, 26 Nov 2016 16:31:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 903ab8f8-ec84-42e3-bc79-1bc7f025eff8
X-Archives-Hash: 653611c0bd211c4b4d5945f71bac26f4
commit: 04292b031e4e7bbf18758cf83df9123bd278119d
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Nov 25 11:02:04 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 16:30:52 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=04292b03
kde-apps/gwenview: Drop unused cmake variable
KDE-bug: 343105
Upstream-commit: b73a9272688ca64c8f98c3d47a211ab3ccbfbaef
Upstrema-commit: 4dc18b994558cbc88d8f1a701247ece3868682a8
Package-Manager: portage-2.3.0
kde-apps/gwenview/gwenview-16.12.49.9999.ebuild | 7 +------
kde-apps/gwenview/gwenview-9999.ebuild | 7 +------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/kde-apps/gwenview/gwenview-16.12.49.9999.ebuild b/kde-apps/gwenview/gwenview-16.12.49.9999.ebuild
index d55041e..d6698f1 100644
--- a/kde-apps/gwenview/gwenview-16.12.49.9999.ebuild
+++ b/kde-apps/gwenview/gwenview-16.12.49.9999.ebuild
@@ -20,7 +20,7 @@ KEYWORDS=""
IUSE="kipi raw semantic-desktop X"
# requires running environment
-RESTRICT="test"
+RESTRICT+=" test"
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -77,11 +77,6 @@ src_configure() {
$(cmake-utils_use_find_package X X11)
)
- # 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)
else
diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index d55041e..d6698f1 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -20,7 +20,7 @@ KEYWORDS=""
IUSE="kipi raw semantic-desktop X"
# requires running environment
-RESTRICT="test"
+RESTRICT+=" test"
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -77,11 +77,6 @@ src_configure() {
$(cmake-utils_use_find_package X X11)
)
- # 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)
else