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

["Michael Palimaka" <kensington@gentoo.org>]

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