commit: 317551a35c33eea19e6c75545bc3c10593d72282
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 24 11:26:56 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Nov 24 11:26:56 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=317551a3
Revert "[eclass] Sync kde4-functions with tree"
This reverts commit ff16e62967f4afebe715141599170941c24f706f.
The overlay version is more recent.
Conflicts:
eclass/kde4-functions.eclass
---
eclass/kde4-functions.eclass | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 69660ea..6b20250 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -2,8 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit versionator
-
# @ECLASS: kde4-functions.eclass
# @MAINTAINER:
# [email protected]
@@ -15,12 +13,14 @@ inherit versionator
if [[ -z ${_KDE4_FUNCTIONS_ECLASS} ]]; then
_KDE4_FUNCTIONS_ECLASS=1
+inherit versionator
+
# @ECLASS-VARIABLE: EAPI
# @DESCRIPTION:
# Currently kde4 eclasses support EAPI 4 and 5.
-case ${EAPI:-0} in
+case ${EAPI} in
4|5) : ;;
- *) die "EAPI=${EAPI} is not supported" ;;
+ *) die "EAPI=${EAPI:-0} is not supported" ;;
esac
# @ECLASS-VARIABLE: KDE_OVERRIDE_MINIMAL
@@ -40,10 +40,11 @@ if [[ ${CATEGORY} = kde-base || ${CATEGORY} = kde-apps ]];
then
debug-print "${ECLASS}: KDEBASE ebuild recognized"
KDEBASE=kde-base
elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
- debug-print "${ECLASS}: KDEVELOP ebuild recognized"
KDEBASE=kdevelop
fi
+debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
+
# determine the build type
if [[ ${PV} = *9999* ]]; then
KDE_BUILD_TYPE="live"
@@ -121,21 +122,6 @@ buildsycoca() {
done
}
-# @FUNCTION: comment_add_subdirectory
-# @USAGE: subdirectory
-# @DESCRIPTION:
-# Comment out an add_subdirectory call in CMakeLists.txt in the current
directory
-comment_add_subdirectory() {
- if [[ -z ${1} ]]; then
- die "comment_add_subdirectory must be passed the directory name
to comment"
- fi
-
- if [[ -a "CMakeLists.txt" ]]; then
- sed -e
"/add_subdirectory[[:space:]]*([[:space:]]*${1}[[:space:]]*)/s/^/#DONOTCOMPILE
/" \
- -i CMakeLists.txt || die "failed to comment
add_subdirectory(${1})"
- fi
-}
-
# @FUNCTION: comment_all_add_subdirectory
# @USAGE: [list of directory names]
# @DESCRIPTION:
