commit: 7039649d1c5fcb39fb2b2470031daf5855653cbf
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 12:41:36 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=7039649d
kde-apps/importwizard: pkgmove to kde-apps/akonadi-import-wizard
Package moved to its own repository.
Package-Manager: portage-2.2.28
.../akonadi-import-wizard-16.08.0.ebuild} | 11 +++++++++--
.../akonadi-import-wizard-16.08.49.9999.ebuild} | 11 +++++++++--
.../akonadi-import-wizard-9999.ebuild} | 12 +-----------
.../{importwizard => akonadi-import-wizard}/metadata.xml | 0
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 +-
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/importwizard/importwizard-16.08.0.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-16.08.0.ebuild
similarity index 81%
rename from kde-apps/importwizard/importwizard-16.08.0.ebuild
rename to kde-apps/akonadi-import-wizard/akonadi-import-wizard-16.08.0.ebuild
index 00517f7..c662df7 100644
--- a/kde-apps/importwizard/importwizard-16.08.0.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-16.08.0.ebuild
@@ -6,9 +6,10 @@ EAPI=6
KDE_HANDBOOK="forceoptional"
KMNAME="kdepim"
+MY_PN="importwizard"
inherit kde5
-DESCRIPTION="Import emails, settings, addressbook and calendar data from
various mailers"
+DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options";
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
KEYWORDS="~amd64 ~x86"
@@ -43,11 +44,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() {
# importwizard 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/importwizard/importwizard-16.08.49.9999.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-16.08.49.9999.ebuild
similarity index 81%
rename from kde-apps/importwizard/importwizard-16.08.49.9999.ebuild
rename to
kde-apps/akonadi-import-wizard/akonadi-import-wizard-16.08.49.9999.ebuild
index 31d383d..f65b10e 100644
--- a/kde-apps/importwizard/importwizard-16.08.49.9999.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-16.08.49.9999.ebuild
@@ -6,9 +6,10 @@ EAPI=6
KDE_HANDBOOK="forceoptional"
KMNAME="kdepim"
+MY_PN="importwizard"
inherit kde5
-DESCRIPTION="Import emails, settings, addressbook and calendar data from
various mailers"
+DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options";
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
KEYWORDS=""
@@ -43,11 +44,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() {
# importwizard 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/importwizard/importwizard-9999.ebuild
b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
similarity index 73%
rename from kde-apps/importwizard/importwizard-9999.ebuild
rename to kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
index 31d383d..4e13208 100644
--- a/kde-apps/importwizard/importwizard-9999.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
@@ -5,10 +5,9 @@
EAPI=6
KDE_HANDBOOK="forceoptional"
-KMNAME="kdepim"
inherit kde5
-DESCRIPTION="Import emails, settings, addressbook and calendar data from
various mailers"
+DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options";
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
KEYWORDS=""
@@ -42,12 +41,3 @@ RDEPEND="${DEPEND}
!kde-apps/kdepim:5
!kde-apps/kmail:4
"
-
-src_prepare() {
- # importwizard 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/kde-apps/importwizard/metadata.xml
b/kde-apps/akonadi-import-wizard/metadata.xml
similarity index 100%
rename from kde-apps/importwizard/metadata.xml
rename to kde-apps/akonadi-import-wizard/metadata.xml
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 f76c635..e42ed92 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-16.08.0.ebuild
@@ -19,6 +19,7 @@ RDEPEND="
$(add_kdeapps_dep akonadiconsole)
$(add_kdeapps_dep akonadi-calendar)
$(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep akonadi-import-wizard)
$(add_kdeapps_dep akonadi-mime)
$(add_kdeapps_dep akonadi-notes)
$(add_kdeapps_dep akonadi-search)
@@ -30,7 +31,6 @@ RDEPEND="
$(add_kdeapps_dep gpgmepp)
$(add_kdeapps_dep grantleeeditor)
$(add_kdeapps_dep grantleetheme)
- $(add_kdeapps_dep importwizard)
$(add_kdeapps_dep incidenceeditor)
$(add_kdeapps_dep kaddressbook)
$(add_kdeapps_dep kalarm)
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 026a457..47b9eab 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
@@ -19,6 +19,7 @@ RDEPEND="
$(add_kdeapps_dep akonadiconsole)
$(add_kdeapps_dep akonadi-calendar)
$(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep akonadi-import-wizard)
$(add_kdeapps_dep akonadi-mime)
$(add_kdeapps_dep akonadi-notes)
$(add_kdeapps_dep akonadi-search)
@@ -30,7 +31,6 @@ RDEPEND="
$(add_kdeapps_dep gpgmepp)
$(add_kdeapps_dep grantleeeditor)
$(add_kdeapps_dep grantleetheme)
- $(add_kdeapps_dep importwizard)
$(add_kdeapps_dep incidenceeditor)
$(add_kdeapps_dep kaddressbook)
$(add_kdeapps_dep kalarm)
diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index 9b99bed..0045d64 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -19,6 +19,7 @@ RDEPEND="
$(add_kdeapps_dep akonadiconsole)
$(add_kdeapps_dep akonadi-calendar)
$(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep akonadi-import-wizard)
$(add_kdeapps_dep akonadi-mime)
$(add_kdeapps_dep akonadi-notes)
$(add_kdeapps_dep akonadi-search)
@@ -30,7 +31,6 @@ RDEPEND="
$(add_kdeapps_dep gpgmepp)
$(add_kdeapps_dep grantleeeditor)
$(add_kdeapps_dep grantleetheme)
- $(add_kdeapps_dep importwizard)
$(add_kdeapps_dep incidenceeditor)
$(add_kdeapps_dep kaddressbook)
$(add_kdeapps_dep kalarm)
diff --git a/profiles/package.mask/kdepim-16.08.0
b/profiles/package.mask/kdepim-16.08.0
index d66d9a8..6cb7d73 100644
--- a/profiles/package.mask/kdepim-16.08.0
+++ b/profiles/package.mask/kdepim-16.08.0
@@ -2,6 +2,7 @@
~kde-apps/akonadi-16.08.0
~kde-apps/akonadi-calendar-16.08.0
~kde-apps/akonadi-contacts-16.08.0
+~kde-apps/akonadi-import-wizard-16.08.0
~kde-apps/akonadi-mime-16.08.0
~kde-apps/akonadi-notes-16.08.0
~kde-apps/akonadi-search-16.08.0
@@ -14,7 +15,6 @@
~kde-apps/gpgmepp-16.08.0
~kde-apps/grantleeeditor-16.08.0
~kde-apps/grantleetheme-16.08.0
-~kde-apps/importwizard-16.08.0
~kde-apps/incidenceeditor-16.08.0
~kde-apps/kaddressbook-16.08.0
~kde-apps/kalarm-16.08.0
diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
index 6f982f5..634cb6f 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -1 +1,2 @@
move kde-apps/akonadi-contact kde-apps/akonadi-contacts
+move kde-apps/importwizard kde-apps/akonadi-import-wizard
