commit: 912d150938c9730009816bf4008ea9455cf07772
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jul 23 13:02:36 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 15:30:14 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=912d1509
kde5.eclass: More cleanup after 16.04 removal
eclass/kde5.eclass | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 14d4e87..a4e3768 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -109,12 +109,6 @@ if [[ ${KDEBASE} = kdel10n ]]; then
fi
fi
-# @ECLASS-VARIABLE: KDE_PIM_KEEP_SUBDIR
-# @DESCRIPTION:
-# If building a split package from KMNAME="kdepim", provide a list of
-# subdirectories that need to be present for a successful build.
-: ${KDE_PIM_KEEP_SUBDIR:=}
-
# @ECLASS-VARIABLE: KDE_PUNT_BOGUS_DEPS
# @DESCRIPTION:
# If set to "false", do nothing.
@@ -254,16 +248,7 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} &&
${KDE_BUILD_TYPE} = release ]]; then
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
+ S="${S}/${PN}"
fi
_kde_is_unreleased() {
