[gentoo-commits] proj/kde:master commit in: kde-apps/kdepim-meta/, kde-apps/grantlee-editor/, profiles/updates/, ...

[Michael Palimaka]

commit:     bee93d675938e75b1441ae3f0a6a6519345b6d04
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 12:54:22 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 14:33:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bee93d67

kde-apps/grantleeeditor: pkgmove to kde-apps/grantlee-editor

Fix DESCRIPTION.

Package-Manager: portage-2.2.28

 .../grantlee-editor-16.08.0.ebuild}                   |  9 ++++++++-
 .../grantlee-editor-16.08.49.9999.ebuild}             |  9 ++++++++-
 .../grantlee-editor-9999.ebuild}                      | 19 +------------------
 .../{grantleeeditor => grantlee-editor}/metadata.xml  |  0
 kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild       |  2 +-
 kde-apps/kdepim-meta/kdepim-meta-16.08.49.9999.ebuild |  2 +-
 kde-apps/kdepim-meta/kdepim-meta-9999.ebuild          |  2 +-
 profiles/package.mask/kdepim-16.08.0                  |  2 +-
 profiles/updates/3Q-2016                              |  1 +
 9 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/kde-apps/grantleeeditor/grantleeeditor-16.08.0.ebuild b/kde-apps/grantlee-editor/grantlee-editor-16.08.0.ebuild
similarity index 88%
rename from kde-apps/grantleeeditor/grantleeeditor-16.08.0.ebuild
rename to kde-apps/grantlee-editor/grantlee-editor-16.08.0.ebuild
index cf53a4a..79a25f6 100644
--- a/kde-apps/grantleeeditor/grantleeeditor-16.08.0.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-16.08.0.ebuild
@@ -6,9 +6,10 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KMNAME="kdepim"
+MY_PN="grantleeeditor"
 inherit kde5
 
-DESCRIPTION="Editor for Sieve scripts used for email filtering on a mail server"
+DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -47,6 +48,12 @@ RDEPEND="${DEPEND}
 	!kde-apps/kmail:4
 "
 
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}/${MY_PN}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
+fi
+
 src_prepare() {
 	# grantleeeditor subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/grantleeeditor/grantleeeditor-16.08.49.9999.ebuild b/kde-apps/grantlee-editor/grantlee-editor-16.08.49.9999.ebuild
similarity index 88%
rename from kde-apps/grantleeeditor/grantleeeditor-16.08.49.9999.ebuild
rename to kde-apps/grantlee-editor/grantlee-editor-16.08.49.9999.ebuild
index 2aded93..f107a58 100644
--- a/kde-apps/grantleeeditor/grantleeeditor-16.08.49.9999.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-16.08.49.9999.ebuild
@@ -6,9 +6,10 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KMNAME="kdepim"
+MY_PN="grantleeeditor"
 inherit kde5
 
-DESCRIPTION="Editor for Sieve scripts used for email filtering on a mail server"
+DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
 IUSE=""
@@ -47,6 +48,12 @@ RDEPEND="${DEPEND}
 	!kde-apps/kmail:4
 "
 
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}/${MY_PN}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
+fi
+
 src_prepare() {
 	# grantleeeditor subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild b/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
similarity index 65%
rename from kde-apps/grantleeeditor/grantleeeditor-9999.ebuild
rename to kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
index 2aded93..a02f38c 100644
--- a/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
@@ -5,10 +5,9 @@
 EAPI=6
 
 KDE_HANDBOOK="forceoptional"
-KMNAME="kdepim"
 inherit kde5
 
-DESCRIPTION="Editor for Sieve scripts used for email filtering on a mail server"
+DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
 IUSE=""
@@ -46,19 +45,3 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
 	!kde-apps/kmail:4
 "
-
-src_prepare() {
-	# grantleeeditor subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-
-	mkdir doc || die "Failed to create doc dir"
-	mv ../doc/contactthemeeditor doc || die "Failed to move handbook"
-	mv ../doc/headerthemeeditor doc || die "Failed to move handbook"
-	cat <<-EOF > doc/CMakeLists.txt
-add_subdirectory(contactthemeeditor)
-add_subdirectory(headerthemeeditor)
-EOF
-
-	kde5_src_prepare
-}

diff --git a/kde-apps/grantleeeditor/metadata.xml b/kde-apps/grantlee-editor/metadata.xml
similarity index 100%
rename from kde-apps/grantleeeditor/metadata.xml
rename to kde-apps/grantlee-editor/metadata.xml

diff --git a/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild b/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
index e42ed92..2377913 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep eventviews)
 	$(add_kdeapps_dep gpgmepp)
-	$(add_kdeapps_dep grantleeeditor)
+	$(add_kdeapps_dep grantlee-editor)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep incidenceeditor)
 	$(add_kdeapps_dep kaddressbook)

diff --git a/kde-apps/kdepim-meta/kdepim-meta-16.08.49.9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-16.08.49.9999.ebuild
index 47b9eab..5c02b64 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-16.08.49.9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-16.08.49.9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep eventviews)
 	$(add_kdeapps_dep gpgmepp)
-	$(add_kdeapps_dep grantleeeditor)
+	$(add_kdeapps_dep grantlee-editor)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep incidenceeditor)
 	$(add_kdeapps_dep kaddressbook)

diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index 0045d64..58945f5 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep eventviews)
 	$(add_kdeapps_dep gpgmepp)
-	$(add_kdeapps_dep grantleeeditor)
+	$(add_kdeapps_dep grantlee-editor)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep incidenceeditor)
 	$(add_kdeapps_dep kaddressbook)

diff --git a/profiles/package.mask/kdepim-16.08.0 b/profiles/package.mask/kdepim-16.08.0
index 6cb7d73..06b71d0 100644
--- a/profiles/package.mask/kdepim-16.08.0
+++ b/profiles/package.mask/kdepim-16.08.0
@@ -13,7 +13,7 @@
 ~kde-apps/calendarsupport-16.08.0
 ~kde-apps/eventviews-16.08.0
 ~kde-apps/gpgmepp-16.08.0
-~kde-apps/grantleeeditor-16.08.0
+~kde-apps/grantlee-editor-16.08.0
 ~kde-apps/grantleetheme-16.08.0
 ~kde-apps/incidenceeditor-16.08.0
 ~kde-apps/kaddressbook-16.08.0

diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
index 634cb6f..33cfb06 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -1,2 +1,3 @@
 move kde-apps/akonadi-contact kde-apps/akonadi-contacts
 move kde-apps/importwizard kde-apps/akonadi-import-wizard
+move kde-apps/grantleeeditor kde-apps/grantlee-editor