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

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

[Johannes Huber]

commit:     8c2d697278f3191a60e4800770fe6ff1e6dfe9b1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 18:14:48 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 18:14:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8c2d6972

kde-apps/kfmclient: EAPI 6

Package-Manager: portage-2.2.28

 kde-apps/kfmclient/kfmclient-15.12.3.ebuild       | 2 +-
 kde-apps/kfmclient/kfmclient-16.04.49.9999.ebuild | 2 +-
 kde-apps/kfmclient/kfmclient-9999.ebuild          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kfmclient/kfmclient-15.12.3.ebuild b/kde-apps/kfmclient/kfmclient-15.12.3.ebuild
index 814aa57..f86007a 100644
--- a/kde-apps/kfmclient/kfmclient-15.12.3.ebuild
+++ b/kde-apps/kfmclient/kfmclient-15.12.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KMNAME="kde-baseapps"
 KMMODULE="konqueror/client"

diff --git a/kde-apps/kfmclient/kfmclient-16.04.49.9999.ebuild b/kde-apps/kfmclient/kfmclient-16.04.49.9999.ebuild
index 984488b..2646fbe 100644
--- a/kde-apps/kfmclient/kfmclient-16.04.49.9999.ebuild
+++ b/kde-apps/kfmclient/kfmclient-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KMNAME="kde-baseapps"
 KMMODULE="konqueror/client"

diff --git a/kde-apps/kfmclient/kfmclient-9999.ebuild b/kde-apps/kfmclient/kfmclient-9999.ebuild
index 984488b..2646fbe 100644
--- a/kde-apps/kfmclient/kfmclient-9999.ebuild
+++ b/kde-apps/kfmclient/kfmclient-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KMNAME="kde-baseapps"
 KMMODULE="konqueror/client"

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

[Johannes Huber]

commit:     daa61923f4961c0d60948743d073655b9a5b473e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug  2 18:37:21 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 21:21:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=daa61923

kde-apps/kfmclient: Installed as part of konqueror

Package-Manager: portage-2.2.28

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 kde-apps/kfmclient/kfmclient-9999.ebuild | 34 --------------------------------
 1 file changed, 34 deletions(-)

diff --git a/kde-apps/kfmclient/kfmclient-9999.ebuild b/kde-apps/kfmclient/kfmclient-9999.ebuild
deleted file mode 100644
index 2646fbe..0000000
--- a/kde-apps/kfmclient/kfmclient-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KMNAME="kde-baseapps"
-KMMODULE="konqueror/client"
-inherit kde4-meta
-
-DESCRIPTION="KDE tool for opening URLs from the command line"
-KEYWORDS=""
-IUSE="debug"
-
-KMEXTRACTONLY="
-	konqueror/kfmclient.desktop
-	konqueror/kfmclient_dir.desktop
-	konqueror/kfmclient_html.desktop
-	konqueror/kfmclient_war.desktop
-	konqueror/src/org.kde.Konqueror.Main.xml
-	konqueror/src/org.kde.Konqueror.MainWindow.xml
-"
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	# Do not install non-kfmclient *.desktop files
-	sed -e "/konqbrowser\.desktop/d" \
-		-e "/konqueror\.desktop/s/^/#DONOTWANT/" \
-		-e "/install(FILES profile/s/^/#DONOTWANT/" \
-		-e "/install(FILES konqueror.appdata.xml/s/^/#DONOTWANT/" \
-		-i konqueror/CMakeLists.txt \
-		|| die "Failed to omit .desktop files"
-}

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

[Manuel Rüger]

commit:     5c21a0c591ac0371c49beb76243490a26797330a
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  2 17:44:27 2014 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Dec  2 17:44:27 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5c21a0c5

[kde-apps/kfmclient] Fix file collision with kde-apps/konqueror

Package-Manager: portage-2.2.14

---
 .../{kfmclient-14.11.97.ebuild => kfmclient-14.11.97-r1.ebuild}       | 4 ++--
 kde-apps/kfmclient/kfmclient-9999.ebuild                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kfmclient/kfmclient-14.11.97.ebuild b/kde-apps/kfmclient/kfmclient-14.11.97-r1.ebuild
similarity index 91%
rename from kde-apps/kfmclient/kfmclient-14.11.97.ebuild
rename to kde-apps/kfmclient/kfmclient-14.11.97-r1.ebuild
index 03d15dd..4936eda 100644
--- a/kde-apps/kfmclient/kfmclient-14.11.97.ebuild
+++ b/kde-apps/kfmclient/kfmclient-14.11.97-r1.ebuild
@@ -13,7 +13,6 @@ KEYWORDS=" ~amd64 ~x86"
 IUSE="debug"
 
 KMEXTRACTONLY="
-	konqueror/konqueror.appdata.xml
 	konqueror/kfmclient.desktop
 	konqueror/kfmclient_dir.desktop
 	konqueror/kfmclient_html.desktop
@@ -29,6 +28,7 @@ src_prepare() {
 	sed -e "/konqbrowser\.desktop/d" \
 		-e "/konqueror\.desktop/s/^/#DONOTWANT/" \
 		-e "/install(FILES profile/s/^/#DONOTWANT/" \
+		-e "/install(FILES konqueror.appdata.xml/s/^/#DONOTWANT/" \
 		-i konqueror/CMakeLists.txt \
-		|| die "Failed to omit .desktop files"
+		|| die
 }

diff --git a/kde-apps/kfmclient/kfmclient-9999.ebuild b/kde-apps/kfmclient/kfmclient-9999.ebuild
index 81e3777..b1bbfef 100644
--- a/kde-apps/kfmclient/kfmclient-9999.ebuild
+++ b/kde-apps/kfmclient/kfmclient-9999.ebuild
@@ -13,7 +13,6 @@ KEYWORDS=""
 IUSE="debug"
 
 KMEXTRACTONLY="
-	konqueror/konqueror.appdata.xml
 	konqueror/kfmclient.desktop
 	konqueror/kfmclient_dir.desktop
 	konqueror/kfmclient_html.desktop
@@ -29,6 +28,7 @@ src_prepare() {
 	sed -e "/konqbrowser\.desktop/d" \
 		-e "/konqueror\.desktop/s/^/#DONOTWANT/" \
 		-e "/install(FILES profile/s/^/#DONOTWANT/" \
+		-e "/install(FILES konqueror.appdata.xml/s/^/#DONOTWANT/" \
 		-i konqueror/CMakeLists.txt \
 		|| die "Failed to omit .desktop files"
 }

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

[Manuel Rüger]

commit:     780855888ffc1d84c381c217241a2ed12d837311
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  1 17:34:33 2014 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Dec  1 17:34:33 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=78085588

[kde-apps/kfmclient] Fix install. Add missing file.

Package-Manager: portage-2.2.14

---
 kde-apps/kfmclient/kfmclient-14.11.97.ebuild | 1 +
 kde-apps/kfmclient/kfmclient-9999.ebuild     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/kfmclient/kfmclient-14.11.97.ebuild b/kde-apps/kfmclient/kfmclient-14.11.97.ebuild
index 16d620a..03d15dd 100644
--- a/kde-apps/kfmclient/kfmclient-14.11.97.ebuild
+++ b/kde-apps/kfmclient/kfmclient-14.11.97.ebuild
@@ -13,6 +13,7 @@ KEYWORDS=" ~amd64 ~x86"
 IUSE="debug"
 
 KMEXTRACTONLY="
+	konqueror/konqueror.appdata.xml
 	konqueror/kfmclient.desktop
 	konqueror/kfmclient_dir.desktop
 	konqueror/kfmclient_html.desktop

diff --git a/kde-apps/kfmclient/kfmclient-9999.ebuild b/kde-apps/kfmclient/kfmclient-9999.ebuild
index b14a5c2..81e3777 100644
--- a/kde-apps/kfmclient/kfmclient-9999.ebuild
+++ b/kde-apps/kfmclient/kfmclient-9999.ebuild
@@ -13,6 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 KMEXTRACTONLY="
+	konqueror/konqueror.appdata.xml
 	konqueror/kfmclient.desktop
 	konqueror/kfmclient_dir.desktop
 	konqueror/kfmclient_html.desktop