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

[Michael Palimaka]

commit:     4ed280e5ea1180b9538dcf20f4ddd4d32bc6578d
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 13:28:28 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=4ed280e5

kde-apps/mboximporter: pkgmove to kde-apps/mbox-importer

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 +-
 .../mbox-importer-16.08.0.ebuild}                                | 9 ++++++++-
 .../mbox-importer-16.08.49.9999.ebuild}                          | 9 ++++++++-
 .../mbox-importer-9999.ebuild}                                   | 3 +--
 kde-apps/{mboximporter => mbox-importer}/metadata.xml            | 0
 profiles/package.mask/kdepim-16.08.0                             | 2 +-
 profiles/updates/3Q-2016                                         | 1 +
 9 files changed, 22 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 da61c70..410cb4e 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
@@ -66,7 +66,7 @@ RDEPEND="
 	$(add_kdeapps_dep libktnef)
 	$(add_kdeapps_dep mailcommon)
 	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep mboximporter)
+	$(add_kdeapps_dep mbox-importer)
 	$(add_kdeapps_dep messagelib)
 	$(add_kdeapps_dep pimcommon)
 	$(add_kdeapps_dep pimsettingexporter)

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 2328d9e..89bbd1e 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
@@ -66,7 +66,7 @@ RDEPEND="
 	$(add_kdeapps_dep libktnef)
 	$(add_kdeapps_dep mailcommon)
 	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep mboximporter)
+	$(add_kdeapps_dep mbox-importer)
 	$(add_kdeapps_dep messagelib)
 	$(add_kdeapps_dep pimcommon)
 	$(add_kdeapps_dep pimsettingexporter)

diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index 2fea457..27d3639 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -65,7 +65,7 @@ RDEPEND="
 	$(add_kdeapps_dep libktnef)
 	$(add_kdeapps_dep mailcommon)
 	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep mboximporter)
+	$(add_kdeapps_dep mbox-importer)
 	$(add_kdeapps_dep messagelib)
 	$(add_kdeapps_dep pimcommon)
 	$(add_kdeapps_dep pimsettingexporter)

diff --git a/kde-apps/mboximporter/mboximporter-16.08.0.ebuild b/kde-apps/mbox-importer/mbox-importer-16.08.0.ebuild
similarity index 78%
rename from kde-apps/mboximporter/mboximporter-16.08.0.ebuild
rename to kde-apps/mbox-importer/mbox-importer-16.08.0.ebuild
index 5bc24fe..14cd2bd 100644
--- a/kde-apps/mboximporter/mboximporter-16.08.0.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-16.08.0.ebuild
@@ -6,9 +6,10 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 KMNAME="kdepim"
+MY_PN="mboximporter"
 inherit kde5
 
-DESCRIPTION="Import mbox data from various sources"
+DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -32,3 +33,9 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim:5
 	!kde-apps/kmail: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/mboximporter/mboximporter-9999.ebuild b/kde-apps/mbox-importer/mbox-importer-16.08.49.9999.ebuild
similarity index 77%
rename from kde-apps/mboximporter/mboximporter-9999.ebuild
rename to kde-apps/mbox-importer/mbox-importer-16.08.49.9999.ebuild
index 37cc5d5..e1ce39c 100644
--- a/kde-apps/mboximporter/mboximporter-9999.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-16.08.49.9999.ebuild
@@ -6,9 +6,10 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 KMNAME="kdepim"
+MY_PN="mboximporter"
 inherit kde5
 
-DESCRIPTION="Import mbox data from various sources"
+DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
 IUSE=""
@@ -32,3 +33,9 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim:5
 	!kde-apps/kmail: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/mboximporter/mboximporter-16.08.49.9999.ebuild b/kde-apps/mbox-importer/mbox-importer-9999.ebuild
similarity index 90%
rename from kde-apps/mboximporter/mboximporter-16.08.49.9999.ebuild
rename to kde-apps/mbox-importer/mbox-importer-9999.ebuild
index 37cc5d5..78bbf65 100644
--- a/kde-apps/mboximporter/mboximporter-16.08.49.9999.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-9999.ebuild
@@ -5,10 +5,9 @@
 EAPI=6
 
 KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KMNAME="kdepim"
 inherit kde5
 
-DESCRIPTION="Import mbox data from various sources"
+DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
 IUSE=""

diff --git a/kde-apps/mboximporter/metadata.xml b/kde-apps/mbox-importer/metadata.xml
similarity index 100%
rename from kde-apps/mboximporter/metadata.xml
rename to kde-apps/mbox-importer/metadata.xml

diff --git a/profiles/package.mask/kdepim-16.08.0 b/profiles/package.mask/kdepim-16.08.0
index 6fd9978..cc0c599 100644
--- a/profiles/package.mask/kdepim-16.08.0
+++ b/profiles/package.mask/kdepim-16.08.0
@@ -50,7 +50,7 @@
 ~kde-apps/libktnef-16.08.0
 ~kde-apps/mailcommon-16.08.0
 ~kde-apps/mailimporter-16.08.0
-~kde-apps/mboximporter-16.08.0
+~kde-apps/mbox-importer-16.08.0
 ~kde-apps/messagelib-16.08.0
 ~kde-apps/pimcommon-16.08.0
 ~kde-apps/pimsettingexporter-16.08.0

diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
index 5064388..f41d6e6 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -2,3 +2,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
+move kde-apps/mboximporter kde-apps/mbox-importer