[gentoo-commits] proj/kde:master commit in: profiles/updates/, kde-apps/kdepim-meta/, kde-apps/kmail-account-wizard/, ...

[Michael Palimaka]

commit:     31c4558391569640508022863a4a8bc5ed89d414
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 13:15:49 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=31c45583

kde-apps/accountwizard: pkgmove to kde-apps/kmail-account-wizard

Package moved to its own repository. Add blocker against kdepim-runtime:4

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 +-
 .../kmail-account-wizard-16.08.0.ebuild}                       | 10 +++++++++-
 .../kmail-account-wizard-16.08.49.9999.ebuild}                 | 10 +++++++++-
 .../kmail-account-wizard-9999.ebuild}                          |  4 ++--
 kde-apps/{accountwizard => kmail-account-wizard}/metadata.xml  |  0
 profiles/package.mask/kdepim-16.08.0                           |  2 +-
 profiles/updates/3Q-2016                                       |  1 +
 9 files changed, 25 insertions(+), 8 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 2377913..da61c70 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
@@ -14,7 +14,6 @@ IUSE="nls"
 [[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
 
 RDEPEND="
-	$(add_kdeapps_dep accountwizard)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadiconsole)
 	$(add_kdeapps_dep akonadi-calendar)
@@ -49,6 +48,7 @@ RDEPEND="
 	$(add_kdeapps_dep kldap)
 	$(add_kdeapps_dep kleopatra)
 	$(add_kdeapps_dep kmail)
+	$(add_kdeapps_dep kmail-account-wizard)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmbox)
 	$(add_kdeapps_dep kmime)

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 5c02b64..2328d9e 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
@@ -14,7 +14,6 @@ IUSE="nls"
 [[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
 
 RDEPEND="
-	$(add_kdeapps_dep accountwizard)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadiconsole)
 	$(add_kdeapps_dep akonadi-calendar)
@@ -49,6 +48,7 @@ RDEPEND="
 	$(add_kdeapps_dep kldap)
 	$(add_kdeapps_dep kleopatra)
 	$(add_kdeapps_dep kmail)
+	$(add_kdeapps_dep kmail-account-wizard)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmbox)
 	$(add_kdeapps_dep kmime)

diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index 58945f5..2fea457 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -14,7 +14,6 @@ IUSE="nls"
 [[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
 
 RDEPEND="
-	$(add_kdeapps_dep accountwizard)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadiconsole)
 	$(add_kdeapps_dep akonadi-calendar)
@@ -48,6 +47,7 @@ RDEPEND="
 	$(add_kdeapps_dep kldap)
 	$(add_kdeapps_dep kleopatra)
 	$(add_kdeapps_dep kmail)
+	$(add_kdeapps_dep kmail-account-wizard)
 	$(add_kdeapps_dep kmailtransport)
 	$(add_kdeapps_dep kmbox)
 	$(add_kdeapps_dep kmime)

diff --git a/kde-apps/accountwizard/accountwizard-16.08.0.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-16.08.0.ebuild
similarity index 86%
rename from kde-apps/accountwizard/accountwizard-16.08.0.ebuild
rename to kde-apps/kmail-account-wizard/kmail-account-wizard-16.08.0.ebuild
index a02ecc7..29e8f75 100644
--- a/kde-apps/accountwizard/accountwizard-16.08.0.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-16.08.0.ebuild
@@ -7,10 +7,11 @@ EAPI=6
 KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 KDE_TEST="forceoptional"
 KMNAME="kdepim"
+MY_PN="accountwizard"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Editor for Sieve scripts used for email filtering on a mail server"
+DESCRIPTION="Assistant for KMail accounts configuration"
 HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS="~amd64 ~x86"
@@ -53,4 +54,11 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim:5
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-runtime:4
 "
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}/${MY_PN}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
+fi

diff --git a/kde-apps/accountwizard/accountwizard-9999.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-16.08.49.9999.ebuild
similarity index 86%
rename from kde-apps/accountwizard/accountwizard-9999.ebuild
rename to kde-apps/kmail-account-wizard/kmail-account-wizard-16.08.49.9999.ebuild
index 5b2208c..5c2d446 100644
--- a/kde-apps/accountwizard/accountwizard-9999.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-16.08.49.9999.ebuild
@@ -7,10 +7,11 @@ EAPI=6
 KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 KDE_TEST="forceoptional"
 KMNAME="kdepim"
+MY_PN="accountwizard"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Editor for Sieve scripts used for email filtering on a mail server"
+DESCRIPTION="Assistant for KMail accounts configuration"
 HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
@@ -53,4 +54,11 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim:5
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-runtime:4
 "
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+	S="${WORKDIR}/${P}/${MY_PN}"
+else
+	S="${WORKDIR}/${KMNAME}-${PV}/${MY_PN}"
+fi

diff --git a/kde-apps/accountwizard/accountwizard-16.08.49.9999.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild
similarity index 93%
rename from kde-apps/accountwizard/accountwizard-16.08.49.9999.ebuild
rename to kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild
index 5b2208c..bdf6115 100644
--- a/kde-apps/accountwizard/accountwizard-16.08.49.9999.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild
@@ -6,11 +6,10 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 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 KMail accounts configuration"
 HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
@@ -53,4 +52,5 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim:5
 	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-runtime:4
 "

diff --git a/kde-apps/accountwizard/metadata.xml b/kde-apps/kmail-account-wizard/metadata.xml
similarity index 100%
rename from kde-apps/accountwizard/metadata.xml
rename to kde-apps/kmail-account-wizard/metadata.xml

diff --git a/profiles/package.mask/kdepim-16.08.0 b/profiles/package.mask/kdepim-16.08.0
index 06b71d0..6fd9978 100644
--- a/profiles/package.mask/kdepim-16.08.0
+++ b/profiles/package.mask/kdepim-16.08.0
@@ -1,4 +1,3 @@
-~kde-apps/accountwizard-16.08.0
 ~kde-apps/akonadi-16.08.0
 ~kde-apps/akonadi-calendar-16.08.0
 ~kde-apps/akonadi-contacts-16.08.0
@@ -33,6 +32,7 @@
 ~kde-apps/kldap-16.08.0
 ~kde-apps/kleopatra-16.08.0
 ~kde-apps/kmail-16.08.0
+~kde-apps/kmail-account-wizard-16.08.0
 ~kde-apps/kmailtransport-16.08.0
 ~kde-apps/kmbox-16.08.0
 ~kde-apps/kmime-16.08.0

diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
index 33cfb06..5064388 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -1,3 +1,4 @@
 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
+move kde-apps/accountwizard kde-apps/kmail-account-wizard