From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1203867-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 55861138359
for <garchives@archives.gentoo.org>; Mon, 7 Sep 2020 15:07:51 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0110FE095A;
Mon, 7 Sep 2020 15:07:50 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id CD9DCE0952
for <gentoo-commits@lists.gentoo.org>; Mon, 7 Sep 2020 15:07:49 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 080D1340DE7
for <gentoo-commits@lists.gentoo.org>; Mon, 7 Sep 2020 15:07:49 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 412F335F
for <gentoo-commits@lists.gentoo.org>; Mon, 7 Sep 2020 15:07:46 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@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, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1599491149.3acabde8a7aa0d278e8aa0d3f48a57b467fecd27.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-apps/konqueror/konqueror-20.08.49.9999.ebuild kde-apps/konqueror/konqueror-9999.ebuild
X-VCS-Directories: kde-apps/konqueror/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 3acabde8a7aa0d278e8aa0d3f48a57b467fecd27
X-VCS-Branch: master
Date: Mon, 7 Sep 2020 15:07:46 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a2960cfd-bcae-4e64-b7b2-9f2669489c7f
X-Archives-Hash: 39dfe3f0ed881b7f7c7ad02191a7d723
commit: 3acabde8a7aa0d278e8aa0d3f48a57b467fecd27
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 13:35:40 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 15:05:49 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3acabde8
kde-apps/konqueror: Use optfeature
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/konqueror/konqueror-20.08.49.9999.ebuild | 28 ++++++---------------
kde-apps/konqueror/konqueror-9999.ebuild | 30 ++++++-----------------
2 files changed, 15 insertions(+), 43 deletions(-)
diff --git a/kde-apps/konqueror/konqueror-20.08.49.9999.ebuild b/kde-apps/konqueror/konqueror-20.08.49.9999.ebuild
index 10ebf1d25b..16d9aaeb6c 100644
--- a/kde-apps/konqueror/konqueror-20.08.49.9999.ebuild
+++ b/kde-apps/konqueror/konqueror-20.08.49.9999.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="true"
KFMIN=5.72.0
QTMIN=5.14.2
VIRTUALX_REQUIRED="test"
-inherit flag-o-matic ecm kde.org
+inherit flag-o-matic ecm kde.org optfeature
DESCRIPTION="Web browser and file manager based on KDE Frameworks"
HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror"
@@ -79,26 +79,12 @@ src_configure() {
}
pkg_postinst() {
- ecm_pkg_postinst
-
if [[ -z "${REPLACING_VERSIONS}" ]]; then
- if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
- elog "For bookmarks support, install keditbookmarks:"
- elog "kde-apps/keditbookmarks:${SLOT}"
- fi
-
- if ! has_version kde-apps/dolphin:${SLOT} ; then
- elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
- elog "kde-apps/dolphin:${SLOT}"
- fi
-
- if ! has_version kde-apps/svg:${SLOT} ; then
- elog "For konqueror to view SVGs, install the svg kpart:"
- elog "kde-apps/svgpart:${SLOT}"
- fi
-
- if ! has_version virtual/jre ; then
- elog "To use Java on webpages install virtual/jre."
- fi
+ elog "Optional dependencies:"
+ optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
+ optfeature "filemanager component" kde-apps/dolphin:${SLOT}
+ optfeature "SVG support" kde-apps/svg:${SLOT}
+ optfeature "Java support on webpages" virtual/jre
fi
+ ecm_pkg_postinst
}
diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild
index d967f89e00..0538477c16 100644
--- a/kde-apps/konqueror/konqueror-9999.ebuild
+++ b/kde-apps/konqueror/konqueror-9999.ebuild
@@ -3,12 +3,12 @@
EAPI=7
-ECM_HANDBOOK="optional" # not optional until !kdelibs4support
+ECM_HANDBOOK="optional"
ECM_TEST="true"
KFMIN=5.73.0
QTMIN=5.14.2
VIRTUALX_REQUIRED="test"
-inherit flag-o-matic ecm kde.org
+inherit flag-o-matic ecm kde.org optfeature
DESCRIPTION="Web browser and file manager based on KDE Frameworks"
HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror"
@@ -78,26 +78,12 @@ src_configure() {
}
pkg_postinst() {
- ecm_pkg_postinst
-
if [[ -z "${REPLACING_VERSIONS}" ]]; then
- if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
- elog "For bookmarks support, install keditbookmarks:"
- elog "kde-apps/keditbookmarks:${SLOT}"
- fi
-
- if ! has_version kde-apps/dolphin:${SLOT} ; then
- elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
- elog "kde-apps/dolphin:${SLOT}"
- fi
-
- if ! has_version kde-apps/svg:${SLOT} ; then
- elog "For konqueror to view SVGs, install the svg kpart:"
- elog "kde-apps/svgpart:${SLOT}"
- fi
-
- if ! has_version virtual/jre ; then
- elog "To use Java on webpages install virtual/jre."
- fi
+ elog "Optional dependencies:"
+ optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
+ optfeature "filemanager component" kde-apps/dolphin:${SLOT}
+ optfeature "SVG support" kde-apps/svg:${SLOT}
+ optfeature "Java support on webpages" virtual/jre
fi
+ ecm_pkg_postinst
}