commit: ab573988a3b40ad3303e5c05b88e145064318fc4
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 13:40:16 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=ab573988
kde-apps/pimsettingexporter: pkgmove to kde-apps/pim-data-exporter
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 +-
.../{pimsettingexporter => pim-data-exporter}/metadata.xml | 0
.../pim-data-exporter-16.08.0.ebuild} | 13 ++++++++++---
.../pim-data-exporter-16.08.49.9999.ebuild} | 13 ++++++++++---
.../pim-data-exporter-9999.ebuild} | 12 +-----------
profiles/package.mask/kdepim-16.08.0 | 2 +-
profiles/updates/3Q-2016 | 1 +
9 files changed, 26 insertions(+), 21 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 410cb4e..f45aec9 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
@@ -68,8 +68,8 @@ RDEPEND="
$(add_kdeapps_dep mailimporter)
$(add_kdeapps_dep mbox-importer)
$(add_kdeapps_dep messagelib)
+ $(add_kdeapps_dep pim-data-exporter)
$(add_kdeapps_dep pimcommon)
- $(add_kdeapps_dep pimsettingexporter)
$(add_kdeapps_dep sieveeditor)
$(add_kdeapps_dep storageservicemanager)
$(add_kdeapps_dep syndication)
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 89bbd1e..83fa732 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
@@ -68,8 +68,8 @@ RDEPEND="
$(add_kdeapps_dep mailimporter)
$(add_kdeapps_dep mbox-importer)
$(add_kdeapps_dep messagelib)
+ $(add_kdeapps_dep pim-data-exporter)
$(add_kdeapps_dep pimcommon)
- $(add_kdeapps_dep pimsettingexporter)
$(add_kdeapps_dep sieveeditor)
$(add_kdeapps_dep storageservicemanager)
$(add_kdeapps_dep syndication)
diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index 27d3639..cf5c09c 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -67,8 +67,8 @@ RDEPEND="
$(add_kdeapps_dep mailimporter)
$(add_kdeapps_dep mbox-importer)
$(add_kdeapps_dep messagelib)
+ $(add_kdeapps_dep pim-data-exporter)
$(add_kdeapps_dep pimcommon)
- $(add_kdeapps_dep pimsettingexporter)
$(add_kdeapps_dep sieveeditor)
$(add_kdeapps_dep storageservicemanager)
$(add_kdeapps_dep syndication)
diff --git a/kde-apps/pimsettingexporter/metadata.xml
b/kde-apps/pim-data-exporter/metadata.xml
similarity index 100%
rename from kde-apps/pimsettingexporter/metadata.xml
rename to kde-apps/pim-data-exporter/metadata.xml
diff --git a/kde-apps/pimsettingexporter/pimsettingexporter-16.08.0.ebuild
b/kde-apps/pim-data-exporter/pim-data-exporter-16.08.0.ebuild
similarity index 81%
rename from kde-apps/pimsettingexporter/pimsettingexporter-16.08.0.ebuild
rename to kde-apps/pim-data-exporter/pim-data-exporter-16.08.0.ebuild
index 1aaea0c..2fa33f8 100644
--- a/kde-apps/pimsettingexporter/pimsettingexporter-16.08.0.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-16.08.0.ebuild
@@ -7,10 +7,11 @@ EAPI=6
KDE_HANDBOOK="forceoptional"
KDE_TEST="forceoptional"
KMNAME="kdepim"
+MY_PN="pimsettingexporter"
VIRTUALX_REQUIRED="test"
inherit kde5
-DESCRIPTION="Export and import PIM settings and local mail"
+DESCRIPTION="Assistant to backup and archive PIM data and configuration"
HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options";
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
KEYWORDS="~amd64 ~x86"
@@ -52,11 +53,17 @@ 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() {
- # pimsettingsexporter subproject does not contain doc
+ # pimsettingexporter 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/pimsettingexporter/pimsettingexporter-16.08.49.9999.ebuild
b/kde-apps/pim-data-exporter/pim-data-exporter-16.08.49.9999.ebuild
similarity index 81%
rename from kde-apps/pimsettingexporter/pimsettingexporter-16.08.49.9999.ebuild
rename to kde-apps/pim-data-exporter/pim-data-exporter-16.08.49.9999.ebuild
index e6a0032..9d123f1 100644
--- a/kde-apps/pimsettingexporter/pimsettingexporter-16.08.49.9999.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-16.08.49.9999.ebuild
@@ -7,10 +7,11 @@ EAPI=6
KDE_HANDBOOK="forceoptional"
KDE_TEST="forceoptional"
KMNAME="kdepim"
+MY_PN="pimsettingexporter"
VIRTUALX_REQUIRED="test"
inherit kde5
-DESCRIPTION="Export and import PIM settings and local mail"
+DESCRIPTION="Assistant to backup and archive PIM data and configuration"
HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options";
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
KEYWORDS=""
@@ -52,11 +53,17 @@ 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() {
- # pimsettingsexporter subproject does not contain doc
+ # pimsettingexporter 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/pimsettingexporter/pimsettingexporter-9999.ebuild
b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
similarity index 79%
rename from kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild
rename to kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
index e6a0032..0258110 100644
--- a/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
@@ -6,11 +6,10 @@ EAPI=6
KDE_HANDBOOK="forceoptional"
KDE_TEST="forceoptional"
-KMNAME="kdepim"
VIRTUALX_REQUIRED="test"
inherit kde5
-DESCRIPTION="Export and import PIM settings and local mail"
+DESCRIPTION="Assistant to backup and archive PIM data and configuration"
HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options";
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
KEYWORDS=""
@@ -51,12 +50,3 @@ RDEPEND="${DEPEND}
!kde-apps/kdepim:5
!kde-apps/kmail:4
"
-
-src_prepare() {
- # pimsettingsexporter 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 cc0c599..0aed855 100644
--- a/profiles/package.mask/kdepim-16.08.0
+++ b/profiles/package.mask/kdepim-16.08.0
@@ -52,8 +52,8 @@
~kde-apps/mailimporter-16.08.0
~kde-apps/mbox-importer-16.08.0
~kde-apps/messagelib-16.08.0
+~kde-apps/pim-data-exporter-16.08.0
~kde-apps/pimcommon-16.08.0
-~kde-apps/pimsettingexporter-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 f41d6e6..cdb7cf5 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -3,3 +3,4 @@ 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
+move kde-apps/pimsettingexporter kde-apps/pim-data-exporter
