[gentoo-commits] proj/kde:master commit in: kde-apps/pim-storage-service-manager/, profiles/updates/, kde-apps/kdepim-meta/, ...

[Michael Palimaka]

commit:     23d086f69ad1a66350ab571c2571b913aca7e1f0
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 13:54:13 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=23d086f6

kde-apps/storageservicemanager: pkgmove to pim-storage-service-manager

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 +-
 .../metadata.xml                                                 | 0
 .../pim-storage-service-manager-16.08.0.ebuild}                  | 9 ++++++++-
 .../pim-storage-service-manager-16.08.49.9999.ebuild}            | 9 ++++++++-
 .../pim-storage-service-manager-9999.ebuild}                     | 3 +--
 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 568b58b..92525e6 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
@@ -70,8 +70,8 @@ RDEPEND="
 	$(add_kdeapps_dep messagelib)
 	$(add_kdeapps_dep pim-data-exporter)
 	$(add_kdeapps_dep pim-sieve-editor)
+	$(add_kdeapps_dep pim-storage-service-manager)
 	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep storageservicemanager)
 	$(add_kdeapps_dep syndication)
 	nls? (
 		$(add_kdeapps_dep kdepim-l10n '' ${L10N_MINIMAL})

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 cc2207b..b7ad59b 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
@@ -70,8 +70,8 @@ RDEPEND="
 	$(add_kdeapps_dep messagelib)
 	$(add_kdeapps_dep pim-data-exporter)
 	$(add_kdeapps_dep pim-sieve-editor)
+	$(add_kdeapps_dep pim-storage-service-manager)
 	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep storageservicemanager)
 	$(add_kdeapps_dep syndication)
 	nls? (
 		$(add_kdeapps_dep kdepim-l10n '' ${L10N_MINIMAL})

diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index e1f333e..8853abb 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -69,8 +69,8 @@ RDEPEND="
 	$(add_kdeapps_dep messagelib)
 	$(add_kdeapps_dep pim-data-exporter)
 	$(add_kdeapps_dep pim-sieve-editor)
+	$(add_kdeapps_dep pim-storage-service-manager)
 	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep storageservicemanager)
 	$(add_kdeapps_dep syndication)
 	nls? (
 		$(add_kdeapps_dep kdepim-l10n '' ${L10N_MINIMAL})

diff --git a/kde-apps/storageservicemanager/metadata.xml b/kde-apps/pim-storage-service-manager/metadata.xml
similarity index 100%
rename from kde-apps/storageservicemanager/metadata.xml
rename to kde-apps/pim-storage-service-manager/metadata.xml

diff --git a/kde-apps/storageservicemanager/storageservicemanager-16.08.0.ebuild b/kde-apps/pim-storage-service-manager/pim-storage-service-manager-16.08.0.ebuild
similarity index 79%
rename from kde-apps/storageservicemanager/storageservicemanager-16.08.0.ebuild
rename to kde-apps/pim-storage-service-manager/pim-storage-service-manager-16.08.0.ebuild
index 9e37f6f..d1ababd 100644
--- a/kde-apps/storageservicemanager/storageservicemanager-16.08.0.ebuild
+++ b/kde-apps/pim-storage-service-manager/pim-storage-service-manager-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="storageservicemanager"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Cloud storage manager"
+DESCRIPTION="Assistant to help with managing external and cloud data storage providers"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -37,3 +38,9 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim:5
 	!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

diff --git a/kde-apps/storageservicemanager/storageservicemanager-9999.ebuild b/kde-apps/pim-storage-service-manager/pim-storage-service-manager-16.08.49.9999.ebuild
similarity index 79%
rename from kde-apps/storageservicemanager/storageservicemanager-9999.ebuild
rename to kde-apps/pim-storage-service-manager/pim-storage-service-manager-16.08.49.9999.ebuild
index baa56a2..638404a 100644
--- a/kde-apps/storageservicemanager/storageservicemanager-9999.ebuild
+++ b/kde-apps/pim-storage-service-manager/pim-storage-service-manager-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="storageservicemanager"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="Cloud storage manager"
+DESCRIPTION="Assistant to help with managing external and cloud data storage providers"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
 IUSE=""
@@ -37,3 +38,9 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim:5
 	!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

diff --git a/kde-apps/storageservicemanager/storageservicemanager-16.08.49.9999.ebuild b/kde-apps/pim-storage-service-manager/pim-storage-service-manager-9999.ebuild
similarity index 91%
rename from kde-apps/storageservicemanager/storageservicemanager-16.08.49.9999.ebuild
rename to kde-apps/pim-storage-service-manager/pim-storage-service-manager-9999.ebuild
index baa56a2..d6559a5 100644
--- a/kde-apps/storageservicemanager/storageservicemanager-16.08.49.9999.ebuild
+++ b/kde-apps/pim-storage-service-manager/pim-storage-service-manager-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="Cloud storage manager"
+DESCRIPTION="Assistant to help with managing external and cloud data storage providers"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
 IUSE=""

diff --git a/profiles/package.mask/kdepim-16.08.0 b/profiles/package.mask/kdepim-16.08.0
index f1fc957..ffb7220 100644
--- a/profiles/package.mask/kdepim-16.08.0
+++ b/profiles/package.mask/kdepim-16.08.0
@@ -54,6 +54,6 @@
 ~kde-apps/messagelib-16.08.0
 ~kde-apps/pim-data-exporter-16.08.0
 ~kde-apps/pim-sieve-editor-16.08.0
+~kde-apps/pim-storage-service-manager-16.08.0
 ~kde-apps/pimcommon-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 75ed8d6..2345c85 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -5,3 +5,4 @@ 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
+move kde-apps/storageservicemanager kde-apps/pim-storage-service-manager