diff options
34 files changed, 14 insertions, 199 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 4228f130ce4..9597a76060e 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 cf0a29f13b8..e55f968c056 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 d9aea495e72..9a70cc1960a 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 3adb3412abd..5381aa52949 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 056c12616ed..b0387e64b62 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 81d1437e3eb..6cb7b579170 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 f21d962c7d0..49414467f11 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 f45404f4575..c39d848fa9e 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 8e150332d23..a72f3b8dfc7 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 410781e0169..0ed21ffe1ea 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 066184178e9..91669512d31 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 5642c8e215d..3518ac5eae5 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 f604a9dccc3..f6c1d5a7559 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 4a3340017a7..d4f975bade6 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 c3df8973c05..f8ed079e5d0 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 83586cd3b67..3a4fd1fe429 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 c6fc25615a7..f658f88b6ac 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 e6789f630a2..c5f305d400c 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 7ee374d8176..25e8062b6f4 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 d5734fcf0ba..45092c859d0 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 350c22c0eca..7a212825384 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 9d95213d8a2..4dc4833c18e 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 530165bd805..81c9cb4068e 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 1d12874a4f6..3c2a40d699a 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 c43ae9c515a..18d832f0097 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 0f3d8e555ff..a45b7b0e097 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 aa72cdc2740..2b99300c588 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 445b88efc1e..31de0a96686 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 9c9207d0372..7f09a9f9592 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 bcc00cf9d6c..0ffdc27f1de 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 ca2a2b09bb9..3218e48b627 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 af95724d7ad..297aa8a6dd6 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 6e8544efd55..13e109b7fd6 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 b32e56b126a..913af8b26d0 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 |