public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: eclass/, kde-apps/kmail/, kde-apps/storageservicemanager/, ...
@ 2016-05-11  9:51 Michael Palimaka
  0 siblings, 0 replies; only message in thread
From: Michael Palimaka @ 2016-05-11  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     611fddf4c1c37013e0c9c42d3e4091eb0cbe2fc3
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun May  8 17:09:15 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun May  8 20:37:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=611fddf4

kde5.eclass: Define S for KMNAME=kdepim

Package-Manager: portage-2.2.28

 eclass/kde5.eclass                                          | 13 +++++++++++++
 kde-apps/accountwizard/accountwizard-9999.ebuild            |  6 ------
 kde-apps/akonadiconsole/akonadiconsole-16.04.0.ebuild       |  6 ------
 kde-apps/akonadiconsole/akonadiconsole-16.04.49.9999.ebuild |  6 ------
 kde-apps/akonadiconsole/akonadiconsole-9999.ebuild          |  6 ------
 kde-apps/akregator/akregator-16.04.0.ebuild                 |  6 ------
 kde-apps/akregator/akregator-16.04.49.9999.ebuild           |  6 ------
 kde-apps/akregator/akregator-9999.ebuild                    |  6 ------
 kde-apps/blogilo/blogilo-16.04.0.ebuild                     |  6 ------
 kde-apps/blogilo/blogilo-16.04.49.9999.ebuild               |  6 ------
 kde-apps/blogilo/blogilo-9999.ebuild                        |  6 ------
 kde-apps/calendarjanitor/calendarjanitor-16.04.0.ebuild     |  6 ------
 .../calendarjanitor/calendarjanitor-16.04.49.9999.ebuild    |  6 ------
 kde-apps/grantleeeditor/grantleeeditor-9999.ebuild          |  6 ------
 kde-apps/importwizard/importwizard-9999.ebuild              |  6 ------
 kde-apps/kaddressbook/kaddressbook-16.04.0.ebuild           |  6 ------
 kde-apps/kaddressbook/kaddressbook-16.04.49.9999.ebuild     |  6 ------
 kde-apps/kaddressbook/kaddressbook-9999.ebuild              |  6 ------
 kde-apps/kalarm/kalarm-9999.ebuild                          |  6 ------
 kde-apps/kmail/kmail-9999.ebuild                            |  6 ------
 kde-apps/knotes/knotes-16.04.0.ebuild                       |  6 ------
 kde-apps/knotes/knotes-16.04.49.9999.ebuild                 |  6 ------
 kde-apps/knotes/knotes-9999.ebuild                          |  6 ------
 kde-apps/konsolekalendar/konsolekalendar-16.04.0.ebuild     |  6 ------
 .../konsolekalendar/konsolekalendar-16.04.49.9999.ebuild    |  6 ------
 kde-apps/kontact/kontact-9999.ebuild                        |  6 ------
 kde-apps/korganizer/korganizer-9999.ebuild                  |  6 ------
 kde-apps/ktnef/ktnef-16.04.0.ebuild                         |  6 ------
 kde-apps/ktnef/ktnef-16.04.49.9999.ebuild                   |  6 ------
 kde-apps/ktnef/ktnef-9999.ebuild                            |  8 +-------
 kde-apps/mboximporter/mboximporter-9999.ebuild              |  6 ------
 kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild  |  6 ------
 kde-apps/sieveeditor/sieveeditor-9999.ebuild                |  6 ------
 .../storageservicemanager/storageservicemanager-9999.ebuild |  6 ------
 34 files changed, 14 insertions(+), 199 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 4228f13..9597a76 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -262,6 +262,19 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then
 	S=${WORKDIR}/${KMNAME}-${PV}
 fi
 
+if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KMNAME} = kdepim ]]; then
+	local subproj
+	if [[ ${PV} != 16.04* ]]; then
+		subproj="/${PN}"
+	fi
+	if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+		S="${WORKDIR}/${P}${subproj}"
+	else
+		S="${WORKDIR}/${KMNAME}-${PV}${subproj}"
+	fi
+	unset subproj
+fi
+
 _kde_is_unreleased() {
 	local pair
 	for pair in "${KDE_UNRELEASED[@]}" ; do

diff --git a/kde-apps/accountwizard/accountwizard-9999.ebuild b/kde-apps/accountwizard/accountwizard-9999.ebuild
index cf0a29f..e55f968 100644
--- a/kde-apps/accountwizard/accountwizard-9999.ebuild
+++ b/kde-apps/accountwizard/accountwizard-9999.ebuild
@@ -53,9 +53,3 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim:5
 	!kde-apps/kdepim-common-libs:4
 "
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi

diff --git a/kde-apps/akonadiconsole/akonadiconsole-16.04.0.ebuild b/kde-apps/akonadiconsole/akonadiconsole-16.04.0.ebuild
index d9aea49..9a70cc1 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-16.04.0.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-16.04.0.ebuild
@@ -47,12 +47,6 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-15.12.2:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON

diff --git a/kde-apps/akonadiconsole/akonadiconsole-16.04.49.9999.ebuild b/kde-apps/akonadiconsole/akonadiconsole-16.04.49.9999.ebuild
index 3adb341..5381aa5 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-16.04.49.9999.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-16.04.49.9999.ebuild
@@ -47,12 +47,6 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-15.12.2:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON

diff --git a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
index 056c126..b0387e6 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
@@ -46,9 +46,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-15.12.2:5
 "
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi

diff --git a/kde-apps/akregator/akregator-16.04.0.ebuild b/kde-apps/akregator/akregator-16.04.0.ebuild
index 81d1437..6cb7b57 100644
--- a/kde-apps/akregator/akregator-16.04.0.ebuild
+++ b/kde-apps/akregator/akregator-16.04.0.ebuild
@@ -58,12 +58,6 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kdepim-15.12.2:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON

diff --git a/kde-apps/akregator/akregator-16.04.49.9999.ebuild b/kde-apps/akregator/akregator-16.04.49.9999.ebuild
index f21d962..4941446 100644
--- a/kde-apps/akregator/akregator-16.04.49.9999.ebuild
+++ b/kde-apps/akregator/akregator-16.04.49.9999.ebuild
@@ -58,12 +58,6 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kdepim-15.12.2:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON

diff --git a/kde-apps/akregator/akregator-9999.ebuild b/kde-apps/akregator/akregator-9999.ebuild
index f45404f..c39d848 100644
--- a/kde-apps/akregator/akregator-9999.ebuild
+++ b/kde-apps/akregator/akregator-9999.ebuild
@@ -55,12 +55,6 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_prepare() {
 	# akregator subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/blogilo/blogilo-16.04.0.ebuild b/kde-apps/blogilo/blogilo-16.04.0.ebuild
index 8e15033..a72f3b8 100644
--- a/kde-apps/blogilo/blogilo-16.04.0.ebuild
+++ b/kde-apps/blogilo/blogilo-16.04.0.ebuild
@@ -44,12 +44,6 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-15.12.2:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON

diff --git a/kde-apps/blogilo/blogilo-16.04.49.9999.ebuild b/kde-apps/blogilo/blogilo-16.04.49.9999.ebuild
index 410781e..0ed21ff 100644
--- a/kde-apps/blogilo/blogilo-16.04.49.9999.ebuild
+++ b/kde-apps/blogilo/blogilo-16.04.49.9999.ebuild
@@ -44,12 +44,6 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-15.12.2:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON

diff --git a/kde-apps/blogilo/blogilo-9999.ebuild b/kde-apps/blogilo/blogilo-9999.ebuild
index 0661841..9166951 100644
--- a/kde-apps/blogilo/blogilo-9999.ebuild
+++ b/kde-apps/blogilo/blogilo-9999.ebuild
@@ -45,12 +45,6 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-apps-libs-16.04.50
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_prepare() {
 	# blogilo subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/calendarjanitor/calendarjanitor-16.04.0.ebuild b/kde-apps/calendarjanitor/calendarjanitor-16.04.0.ebuild
index 5642c8e..3518ac5 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-16.04.0.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-16.04.0.ebuild
@@ -29,12 +29,6 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-15.12.2:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 PATCHES=( "${FILESDIR}/kdepim-console.patch" )
 
 src_prepare() {

diff --git a/kde-apps/calendarjanitor/calendarjanitor-16.04.49.9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-16.04.49.9999.ebuild
index f604a9d..f6c1d5a 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-16.04.49.9999.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-16.04.49.9999.ebuild
@@ -29,12 +29,6 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-15.12.2:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 PATCHES=( "${FILESDIR}/kdepim-console.patch" )
 
 src_prepare() {

diff --git a/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild b/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild
index 4a33400..d4f975b 100644
--- a/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild
+++ b/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild
@@ -44,12 +44,6 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_prepare() {
 	# grantleeeditor subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/importwizard/importwizard-9999.ebuild b/kde-apps/importwizard/importwizard-9999.ebuild
index c3df897..f8ed079 100644
--- a/kde-apps/importwizard/importwizard-9999.ebuild
+++ b/kde-apps/importwizard/importwizard-9999.ebuild
@@ -42,12 +42,6 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_prepare() {
 	# importwizard subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/kaddressbook/kaddressbook-16.04.0.ebuild b/kde-apps/kaddressbook/kaddressbook-16.04.0.ebuild
index 83586cd..3a4fd1f 100644
--- a/kde-apps/kaddressbook/kaddressbook-16.04.0.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-16.04.0.ebuild
@@ -65,12 +65,6 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kdepim-runtime)
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON

diff --git a/kde-apps/kaddressbook/kaddressbook-16.04.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-16.04.49.9999.ebuild
index c6fc256..f658f88 100644
--- a/kde-apps/kaddressbook/kaddressbook-16.04.49.9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-16.04.49.9999.ebuild
@@ -65,12 +65,6 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kdepim-runtime)
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON

diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
index e6789f6..c5f305d 100644
--- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
@@ -60,12 +60,6 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kdepim-runtime)
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package prison KF5Prison)

diff --git a/kde-apps/kalarm/kalarm-9999.ebuild b/kde-apps/kalarm/kalarm-9999.ebuild
index 7ee374d..25e8062 100644
--- a/kde-apps/kalarm/kalarm-9999.ebuild
+++ b/kde-apps/kalarm/kalarm-9999.ebuild
@@ -69,12 +69,6 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_prepare() {
 	# kalarm subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
index d5734fc..45092c8 100644
--- a/kde-apps/kmail/kmail-9999.ebuild
+++ b/kde-apps/kmail/kmail-9999.ebuild
@@ -80,12 +80,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_prepare() {
 	# kmail subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/knotes/knotes-16.04.0.ebuild b/kde-apps/knotes/knotes-16.04.0.ebuild
index 350c22c..7a21282 100644
--- a/kde-apps/knotes/knotes-16.04.0.ebuild
+++ b/kde-apps/knotes/knotes-16.04.0.ebuild
@@ -63,12 +63,6 @@ RDEPEND="${DEPEND}
 	!kde-apps/noteshared:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON

diff --git a/kde-apps/knotes/knotes-16.04.49.9999.ebuild b/kde-apps/knotes/knotes-16.04.49.9999.ebuild
index 9d95213..4dc4833 100644
--- a/kde-apps/knotes/knotes-16.04.49.9999.ebuild
+++ b/kde-apps/knotes/knotes-16.04.49.9999.ebuild
@@ -61,12 +61,6 @@ RDEPEND="${DEPEND}
 	!kde-apps/noteshared:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON

diff --git a/kde-apps/knotes/knotes-9999.ebuild b/kde-apps/knotes/knotes-9999.ebuild
index 530165b..81c9cb4 100644
--- a/kde-apps/knotes/knotes-9999.ebuild
+++ b/kde-apps/knotes/knotes-9999.ebuild
@@ -62,12 +62,6 @@ RDEPEND="${DEPEND}
 	!kde-apps/noteshared:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_prepare() {
 	# knotes subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/konsolekalendar/konsolekalendar-16.04.0.ebuild b/kde-apps/konsolekalendar/konsolekalendar-16.04.0.ebuild
index 1d12874..3c2a40d 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-16.04.0.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-16.04.0.ebuild
@@ -31,12 +31,6 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-15.12.2:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 PATCHES=( "${FILESDIR}/kdepim-console.patch" )
 
 src_prepare() {

diff --git a/kde-apps/konsolekalendar/konsolekalendar-16.04.49.9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-16.04.49.9999.ebuild
index c43ae9c..18d832f 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-16.04.49.9999.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-16.04.49.9999.ebuild
@@ -31,12 +31,6 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-15.12.2:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 PATCHES=( "${FILESDIR}/kdepim-console.patch" )
 
 src_prepare() {

diff --git a/kde-apps/kontact/kontact-9999.ebuild b/kde-apps/kontact/kontact-9999.ebuild
index 0f3d8e5..a45b7b0 100644
--- a/kde-apps/kontact/kontact-9999.ebuild
+++ b/kde-apps/kontact/kontact-9999.ebuild
@@ -45,12 +45,6 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_prepare() {
 	# kontact subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/korganizer/korganizer-9999.ebuild b/kde-apps/korganizer/korganizer-9999.ebuild
index aa72cdc..2b99300 100644
--- a/kde-apps/korganizer/korganizer-9999.ebuild
+++ b/kde-apps/korganizer/korganizer-9999.ebuild
@@ -85,12 +85,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_prepare() {
 	# korganizer subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/ktnef/ktnef-16.04.0.ebuild b/kde-apps/ktnef/ktnef-16.04.0.ebuild
index 445b88e..31de0a9 100644
--- a/kde-apps/ktnef/ktnef-16.04.0.ebuild
+++ b/kde-apps/ktnef/ktnef-16.04.0.ebuild
@@ -33,12 +33,6 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-15.12.1-r2:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON

diff --git a/kde-apps/ktnef/ktnef-16.04.49.9999.ebuild b/kde-apps/ktnef/ktnef-16.04.49.9999.ebuild
index 9c9207d..7f09a9f 100644
--- a/kde-apps/ktnef/ktnef-16.04.49.9999.ebuild
+++ b/kde-apps/ktnef/ktnef-16.04.49.9999.ebuild
@@ -33,12 +33,6 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-15.12.1-r2:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}"
-fi
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON

diff --git a/kde-apps/ktnef/ktnef-9999.ebuild b/kde-apps/ktnef/ktnef-9999.ebuild
index bcc00cf..0ffdc27 100644
--- a/kde-apps/ktnef/ktnef-9999.ebuild
+++ b/kde-apps/ktnef/ktnef-9999.ebuild
@@ -31,15 +31,9 @@ DEPEND="
 	dev-libs/libxslt
 "
 RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-15.12.1-r2:5
+	!kde-apps/kdepim:5
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_prepare() {
 	# ktnef subproject does not contain doc nor searches for DocTools
 	# at least until properly split upstream

diff --git a/kde-apps/mboximporter/mboximporter-9999.ebuild b/kde-apps/mboximporter/mboximporter-9999.ebuild
index ca2a2b0..3218e48 100644
--- a/kde-apps/mboximporter/mboximporter-9999.ebuild
+++ b/kde-apps/mboximporter/mboximporter-9999.ebuild
@@ -32,9 +32,3 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim:5
 	!kde-apps/kdepim-common-libs:4
 "
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi

diff --git a/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild b/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild
index af95724..297aa8a 100644
--- a/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild
+++ b/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild
@@ -51,12 +51,6 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_prepare() {
 	# pimsettingsexporter subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/sieveeditor/sieveeditor-9999.ebuild b/kde-apps/sieveeditor/sieveeditor-9999.ebuild
index 6e8544e..13e109b 100644
--- a/kde-apps/sieveeditor/sieveeditor-9999.ebuild
+++ b/kde-apps/sieveeditor/sieveeditor-9999.ebuild
@@ -45,12 +45,6 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-common-libs:4
 "
 
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi
-
 src_prepare() {
 	# sieveeditor subproject does not contain doc
 	# at least until properly split upstream

diff --git a/kde-apps/storageservicemanager/storageservicemanager-9999.ebuild b/kde-apps/storageservicemanager/storageservicemanager-9999.ebuild
index b32e56b..913af8b 100644
--- a/kde-apps/storageservicemanager/storageservicemanager-9999.ebuild
+++ b/kde-apps/storageservicemanager/storageservicemanager-9999.ebuild
@@ -36,9 +36,3 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim:5
 	!kde-apps/kdepim-common-libs:4
 "
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	S="${WORKDIR}/${P}/${PN}"
-else
-	S="${WORKDIR}/${KMNAME}-${PV}/${PN}"
-fi


^ permalink raw reply related	[flat|nested] only message in thread
only message in thread, other threads:[~2016-05-11  9:52 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-11  9:51 [gentoo-commits] proj/kde:master commit in: eclass/, kde-apps/kmail/, kde-apps/storageservicemanager/, Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox