From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-892686-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 D780913832E
for <garchives@archives.gentoo.org>; Wed, 20 Jul 2016 15:19:03 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2FA9221C04D;
Wed, 20 Jul 2016 15:19:00 +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 CD0AD21C04D
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Jul 2016 15:18:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 55C2A340E02
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Jul 2016 15:18:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D35ED7C9
for <gentoo-commits@lists.gentoo.org>; Wed, 20 Jul 2016 15:18:56 +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: <1469027925.7a7a2176c23f882e4ea0b14bd61f02e7065b9243.kensington@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-apps/konqueror/konqueror-16.08.49.9999.ebuild kde-apps/konqueror/konqueror-9999.ebuild
X-VCS-Directories: kde-apps/konqueror/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: 7a7a2176c23f882e4ea0b14bd61f02e7065b9243
X-VCS-Branch: master
Date: Wed, 20 Jul 2016 15:18:56 +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: 67def0bd-7dff-4f69-89e0-67346371018e
X-Archives-Hash: 22ca38abe95d73d3f6c807777f83cad5
commit: 7a7a2176c23f882e4ea0b14bd61f02e7065b9243
Author: Coacher <itumaykin+gentoo <AT> gmail <DOT> com>
AuthorDate: Wed Jul 20 15:18:27 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 15:18:45 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7a7a2176
kde-apps/konqueror: avoid installing dolphin stuff with USE="-filemanager"
Gentoo-bug: 589126
Package-Manager: portage-2.3.0
kde-apps/konqueror/konqueror-16.08.49.9999.ebuild | 4 ++--
kde-apps/konqueror/konqueror-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kde-apps/konqueror/konqueror-16.08.49.9999.ebuild b/kde-apps/konqueror/konqueror-16.08.49.9999.ebuild
index 9771487..fde7e07 100644
--- a/kde-apps/konqueror/konqueror-16.08.49.9999.ebuild
+++ b/kde-apps/konqueror/konqueror-16.08.49.9999.ebuild
@@ -55,8 +55,6 @@ KMEXTRACTONLY="
src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
- use filemanager || cmake_comment_add_subdirectory dolphin
-
# required for dolphin
sed -e "/konq_copytomenu.h/ s/# //" \
-e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
@@ -65,6 +63,8 @@ src_prepare() {
kde4-meta_src_prepare
+ use filemanager || cmake_comment_add_subdirectory dolphin
+
# Do not install *.desktop files for kfmclient
sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
|| die "Failed to omit .desktop files"
diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild
index 9771487..fde7e07 100644
--- a/kde-apps/konqueror/konqueror-9999.ebuild
+++ b/kde-apps/konqueror/konqueror-9999.ebuild
@@ -55,8 +55,6 @@ KMEXTRACTONLY="
src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
- use filemanager || cmake_comment_add_subdirectory dolphin
-
# required for dolphin
sed -e "/konq_copytomenu.h/ s/# //" \
-e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
@@ -65,6 +63,8 @@ src_prepare() {
kde4-meta_src_prepare
+ use filemanager || cmake_comment_add_subdirectory dolphin
+
# Do not install *.desktop files for kfmclient
sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
|| die "Failed to omit .desktop files"