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

[Michael Palimaka]

commit:     b15f46a1fca51ac08371fbe803e6994f66f18aa8
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Nov  4 15:55:32 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 16:45:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b15f46a1

kde-apps/libkonq: Adapt USE=minimal to latest changes

Fixed in kio upstream commit 6ec29b03e4433c93bf5c2e5da977d019440020a9
New conflict created by kio commit 4b24b70c93523c5bc56c90c04a5a666331e96a1b

Package-Manager: portage-2.2.20.1

 kde-apps/libkonq/libkonq-15.08.49.9999.ebuild | 11 -----------
 kde-apps/libkonq/libkonq-5.9999.ebuild        |  5 +----
 kde-apps/libkonq/libkonq-9999.ebuild          | 11 -----------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/kde-apps/libkonq/libkonq-15.08.49.9999.ebuild 
b/kde-apps/libkonq/libkonq-15.08.49.9999.ebuild
index 286efcb..2a4d9a2 100644
--- a/kde-apps/libkonq/libkonq-15.08.49.9999.ebuild
+++ b/kde-apps/libkonq/libkonq-15.08.49.9999.ebuild
@@ -17,14 +17,3 @@ RESTRICT="test"
 KMSAVELIBS="true"
 
 PATCHES=( "${FILESDIR}/${PN}-4.9.0-cmake.patch" )
-
-src_install() {
-       kde4-base_src_install
-
-       if use minimal; then
-               rm 
"${D}"/usr/share/templates/{Directory,HTMLFile,TextFile}.desktop || die
-               rm 
"${D}"/usr/share/templates/{linkPath,linkProgram,linkURL}.desktop || die
-               rm "${D}"/usr/share/templates/.source/{Program,URL}.desktop || 
die
-               rm 
"${D}"/usr/share/templates/.source/{HTMLFile.html,TextFile.txt} || die
-       fi
-}

diff --git a/kde-apps/libkonq/libkonq-5.9999.ebuild 
b/kde-apps/libkonq/libkonq-5.9999.ebuild
index e4ee517..b129c17 100644
--- a/kde-apps/libkonq/libkonq-5.9999.ebuild
+++ b/kde-apps/libkonq/libkonq-5.9999.ebuild
@@ -44,9 +44,6 @@ src_install() {
        kde5_src_install
 
        if use minimal; then
-               rm 
"${D}"/usr/share/templates/{Directory,HTMLFile,TextFile}.desktop || die
-               rm 
"${D}"/usr/share/templates/{linkPath,linkProgram,linkURL}.desktop || die
-               rm "${D}"/usr/share/templates/.source/{Program,URL}.desktop || 
die
-               rm 
"${D}"/usr/share/templates/.source/{HTMLFile.html,TextFile.txt} || die
+               rm "${D}"/usr/share/kservicetypes5/konqpopupmenuplugin.desktop 
|| die
        fi
 }

diff --git a/kde-apps/libkonq/libkonq-9999.ebuild 
b/kde-apps/libkonq/libkonq-9999.ebuild
index 286efcb..2a4d9a2 100644
--- a/kde-apps/libkonq/libkonq-9999.ebuild
+++ b/kde-apps/libkonq/libkonq-9999.ebuild
@@ -17,14 +17,3 @@ RESTRICT="test"
 KMSAVELIBS="true"
 
 PATCHES=( "${FILESDIR}/${PN}-4.9.0-cmake.patch" )
-
-src_install() {
-       kde4-base_src_install
-
-       if use minimal; then
-               rm 
"${D}"/usr/share/templates/{Directory,HTMLFile,TextFile}.desktop || die
-               rm 
"${D}"/usr/share/templates/{linkPath,linkProgram,linkURL}.desktop || die
-               rm "${D}"/usr/share/templates/.source/{Program,URL}.desktop || 
die
-               rm 
"${D}"/usr/share/templates/.source/{HTMLFile.html,TextFile.txt} || die
-       fi
-}