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

[Michael Palimaka]

commit:     a53fedd2440db6e68ee25445a39dc50789d37cc6
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 13:47:55 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=a53fedd2

kde-apps/sieveeditor: pkgmove to kde-apps/pim-sieve-editor

Package moved to its own repository. Fix DESCRIPTION.

Package-Manager: portage-2.2.28

 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 +-
 kde-apps/{sieveeditor => pim-sieve-editor}/metadata.xml      |  0
 .../pim-sieve-editor-16.08.0.ebuild}                         | 11 +++++++++--
 .../pim-sieve-editor-16.08.49.9999.ebuild}                   | 11 +++++++++--
 .../pim-sieve-editor-9999.ebuild}                            | 12 +-----------
 profiles/package.mask/kdepim-16.08.0                         |  2 +-
 profiles/updates/3Q-2016                                     |  1 +
 9 files changed, 24 insertions(+), 19 deletions(-)

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 f45aec9..568b58b 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
@@ -69,8 +69,8 @@ RDEPEND="
 	$(add_kdeapps_dep mbox-importer)
 	$(add_kdeapps_dep messagelib)
 	$(add_kdeapps_dep pim-data-exporter)
+	$(add_kdeapps_dep pim-sieve-editor)
 	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep sieveeditor)
 	$(add_kdeapps_dep storageservicemanager)
 	$(add_kdeapps_dep syndication)
 	nls? (

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 83fa732..cc2207b 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
@@ -69,8 +69,8 @@ RDEPEND="
 	$(add_kdeapps_dep mbox-importer)
 	$(add_kdeapps_dep messagelib)
 	$(add_kdeapps_dep pim-data-exporter)
+	$(add_kdeapps_dep pim-sieve-editor)
 	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep sieveeditor)
 	$(add_kdeapps_dep storageservicemanager)
 	$(add_kdeapps_dep syndication)
 	nls? (

diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index cf5c09c..e1f333e 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -68,8 +68,8 @@ RDEPEND="
 	$(add_kdeapps_dep mbox-importer)
 	$(add_kdeapps_dep messagelib)
 	$(add_kdeapps_dep pim-data-exporter)
+	$(add_kdeapps_dep pim-sieve-editor)
 	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep sieveeditor)
 	$(add_kdeapps_dep storageservicemanager)
 	$(add_kdeapps_dep syndication)
 	nls? (

diff --git a/kde-apps/sieveeditor/metadata.xml b/kde-apps/pim-sieve-editor/metadata.xml
similarity index 100%
rename from kde-apps/sieveeditor/metadata.xml
rename to kde-apps/pim-sieve-editor/metadata.xml

diff --git a/kde-apps/sieveeditor/sieveeditor-16.08.0.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-16.08.0.ebuild
similarity index 84%
rename from kde-apps/sieveeditor/sieveeditor-16.08.0.ebuild
rename to kde-apps/pim-sieve-editor/pim-sieve-editor-16.08.0.ebuild
index f49f609..a68b64a 100644
--- a/kde-apps/sieveeditor/sieveeditor-16.08.0.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-16.08.0.ebuild
@@ -7,10 +7,11 @@ EAPI=6
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 KMNAME="kdepim"
+MY_PN="sieveeditor"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Editor for Sieve scripts used for email filtering on a mail server"
+DESCRIPTION="Assistant for editing IMAP Sieve filters"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -46,11 +47,17 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}/${MY_PN}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
+fi
+
 src_prepare() {
 	# sieveeditor subproject does not contain doc
 	# at least until properly split upstream
 	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-	mv ../doc/${PN} doc || die "Failed to move handbook"
+	mv ../doc/${MY_PN} doc || die "Failed to move handbook"
 
 	kde5_src_prepare
 }

diff --git a/kde-apps/sieveeditor/sieveeditor-16.08.49.9999.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-16.08.49.9999.ebuild
similarity index 84%
rename from kde-apps/sieveeditor/sieveeditor-16.08.49.9999.ebuild
rename to kde-apps/pim-sieve-editor/pim-sieve-editor-16.08.49.9999.ebuild
index 2f93b58..8d31990 100644
--- a/kde-apps/sieveeditor/sieveeditor-16.08.49.9999.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-16.08.49.9999.ebuild
@@ -7,10 +7,11 @@ EAPI=6
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 KMNAME="kdepim"
+MY_PN="sieveeditor"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Editor for Sieve scripts used for email filtering on a mail server"
+DESCRIPTION="Assistant for editing IMAP Sieve filters"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
 IUSE=""
@@ -46,11 +47,17 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}/${MY_PN}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
+fi
+
 src_prepare() {
 	# sieveeditor subproject does not contain doc
 	# at least until properly split upstream
 	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-	mv ../doc/${PN} doc || die "Failed to move handbook"
+	mv ../doc/${MY_PN} doc || die "Failed to move handbook"
 
 	kde5_src_prepare
 }

diff --git a/kde-apps/sieveeditor/sieveeditor-9999.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
similarity index 75%
rename from kde-apps/sieveeditor/sieveeditor-9999.ebuild
rename to kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
index 2f93b58..8793eaa 100644
--- a/kde-apps/sieveeditor/sieveeditor-9999.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
@@ -6,11 +6,10 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
-KMNAME="kdepim"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Editor for Sieve scripts used for email filtering on a mail server"
+DESCRIPTION="Assistant for editing IMAP Sieve filters"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
 IUSE=""
@@ -45,12 +44,3 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim:5
 	!kde-apps/kdepim-common-libs:4
 "
-
-src_prepare() {
-	# sieveeditor subproject does not contain doc
-	# at least until properly split upstream
-	echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir"
-	mv ../doc/${PN} doc || die "Failed to move handbook"
-
-	kde5_src_prepare
-}

diff --git a/profiles/package.mask/kdepim-16.08.0 b/profiles/package.mask/kdepim-16.08.0
index 0aed855..f1fc957 100644
--- a/profiles/package.mask/kdepim-16.08.0
+++ b/profiles/package.mask/kdepim-16.08.0
@@ -53,7 +53,7 @@
 ~kde-apps/mbox-importer-16.08.0
 ~kde-apps/messagelib-16.08.0
 ~kde-apps/pim-data-exporter-16.08.0
+~kde-apps/pim-sieve-editor-16.08.0
 ~kde-apps/pimcommon-16.08.0
-~kde-apps/sieveeditor-16.08.0
 ~kde-apps/storageservicemanager-16.08.0
 ~kde-apps/syndication-16.08.0

diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
index cdb7cf5..75ed8d6 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -4,3 +4,4 @@ move kde-apps/grantleeeditor kde-apps/grantlee-editor
 move kde-apps/accountwizard kde-apps/kmail-account-wizard
 move kde-apps/mboximporter kde-apps/mbox-importer
 move kde-apps/pimsettingexporter kde-apps/pim-data-exporter
+move kde-apps/sieveeditor kde-apps/pim-sieve-editor