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

[Michael Palimaka]

commit:     057ae800204399f8ee90f2d325eebb41fdd39b89
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Dec 13 08:42:10 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 08:56:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=057ae800

kde-apps/kapptemplate: Make it kde-frameworks 5.17 compatible

File collision: /usr/share/kdevappwizard/templates/qml-plasmoid.tar.bz2

Package-Manager: portage-2.2.24

 ...apptemplate-15.11.90.ebuild => kapptemplate-15.08.3-r1.ebuild} | 8 +++++++-
 ...pptemplate-15.11.90.ebuild => kapptemplate-15.11.90-r1.ebuild} | 6 ++++++
 kde-apps/kapptemplate/kapptemplate-15.12.0.ebuild                 | 6 ++++++
 kde-apps/kapptemplate/kapptemplate-15.12.49.9999.ebuild           | 6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/kde-apps/kapptemplate/kapptemplate-15.11.90.ebuild b/kde-apps/kapptemplate/kapptemplate-15.08.3-r1.ebuild
similarity index 81%
copy from kde-apps/kapptemplate/kapptemplate-15.11.90.ebuild
copy to kde-apps/kapptemplate/kapptemplate-15.08.3-r1.ebuild
index 1e38664..b936b75 100644
--- a/kde-apps/kapptemplate/kapptemplate-15.11.90.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-15.08.3-r1.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
+FRAMEWORKS_MINIMAL="5.17.0"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 inherit kde5
 
 DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"
 HOMEPAGE="https://www.kde.org/applications/development/kapptemplate"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -27,3 +28,8 @@ DEPEND="
 "
 
 RDEPEND="${DEPEND}"
+
+src_install() {
+	kde5_src_install
+	rm "${ED}"usr/share/kdevappwizard/templates/qml-plasmoid.tar.bz2 || die
+}

diff --git a/kde-apps/kapptemplate/kapptemplate-15.11.90.ebuild b/kde-apps/kapptemplate/kapptemplate-15.11.90-r1.ebuild
similarity index 83%
rename from kde-apps/kapptemplate/kapptemplate-15.11.90.ebuild
rename to kde-apps/kapptemplate/kapptemplate-15.11.90-r1.ebuild
index 1e38664..87070cb 100644
--- a/kde-apps/kapptemplate/kapptemplate-15.11.90.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-15.11.90-r1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+FRAMEWORKS_MINIMAL="5.17.0"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 inherit kde5
@@ -27,3 +28,8 @@ DEPEND="
 "
 
 RDEPEND="${DEPEND}"
+
+src_install() {
+	kde5_src_install
+	rm "${ED}"usr/share/kdevappwizard/templates/qml-plasmoid.tar.bz2 || die
+}

diff --git a/kde-apps/kapptemplate/kapptemplate-15.12.0.ebuild b/kde-apps/kapptemplate/kapptemplate-15.12.0.ebuild
index 1e38664..87070cb 100644
--- a/kde-apps/kapptemplate/kapptemplate-15.12.0.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-15.12.0.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+FRAMEWORKS_MINIMAL="5.17.0"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 inherit kde5
@@ -27,3 +28,8 @@ DEPEND="
 "
 
 RDEPEND="${DEPEND}"
+
+src_install() {
+	kde5_src_install
+	rm "${ED}"usr/share/kdevappwizard/templates/qml-plasmoid.tar.bz2 || die
+}

diff --git a/kde-apps/kapptemplate/kapptemplate-15.12.49.9999.ebuild b/kde-apps/kapptemplate/kapptemplate-15.12.49.9999.ebuild
index d00dd58..fbf151d 100644
--- a/kde-apps/kapptemplate/kapptemplate-15.12.49.9999.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-15.12.49.9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+FRAMEWORKS_MINIMAL="5.17.0"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 inherit kde5
@@ -27,3 +28,8 @@ DEPEND="
 "
 
 RDEPEND="${DEPEND}"
+
+src_install() {
+	kde5_src_install
+	rm "${ED}"usr/share/kdevappwizard/templates/qml-plasmoid.tar.bz2 || die
+}