summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMaciej Mrozowski (reavertm) <reavertm@poczta.fm>2009-07-03 23:18:26 +0200
committerMaciej Mrozowski (reavertm) <reavertm@poczta.fm>2009-07-03 23:49:09 +0200
commit7ad09a0afe1187be2f41ecaa44670bc161b952f5 (patch)
treedb29cb26919002c1324867f2c07e7ef543108dd3 /eclass
parentc9e3aefe13d18ee0b17d9a256746c0edc65dccf3 (diff)
downloadkde-7ad09a0afe1187be2f41ecaa44670bc161b952f5.tar.gz
kde-7ad09a0afe1187be2f41ecaa44670bc161b952f5.tar.bz2
kde-7ad09a0afe1187be2f41ecaa44670bc161b952f5.zip
[eclass] Removed kdepim-runtime workarounds
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kde4-meta.eclass32
1 files changed, 12 insertions, 20 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 33f27bdea88..e102db5141f 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -12,22 +12,6 @@
# You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional.
# Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY.
-# SVN wrapping for various simplifying ebuilds
-# before inheriting so dont use BUILD_TYPE
-if [[ ${SLOT} = live || ${PV} = *9999* ]]; then
- case ${KMNAME} in
- extragear*|playground*)
- ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}"
- ESVN_PROJECT="${KMNAME}${ESVN_PROJECT_SUFFIX}"
- ;;
- kdepim-runtime)
- # for svn the kdepim module is not split
- # so just override KMNAME when needed.
- KMNAME="kdepim"
- ;;
- esac
-fi
-
inherit kde4-base versionator
EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
@@ -54,10 +38,6 @@ if [[ ${PN} != khelpcenter ]] && has handbook ${IUSE//+}; then
"
fi
-# akonadi fix for non-live things
-[[ ${KMNAME} = kdepim-runtime && ${BUILD_TYPE} != live ]] && \
- KMNOMODULE="true"
-
# Add dependencies that all packages in a certain module share.
case ${KMNAME} in
kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics)
@@ -139,6 +119,18 @@ esac
debug-print "line ${LINENO} ${ECLASS}: DEPEND ${DEPEND} - after metapackage-specific dependencies"
debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-specific dependencies"
+# Useful to build kde4-meta style stuff from extragear/playground (plasmoids etc)
+case ${BUILD_TYPE} in
+ live)
+ case ${KMNAME} in
+ extragear*|playground*)
+ ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}"
+ ESVN_PROJECT="${KMNAME}${ESVN_PROJECT_SUFFIX}"
+ ;;
+ esac
+ ;;
+esac
+
# @ECLASS-VARIABLE: KMNAME
# @DESCRIPTION:
# Name of the parent-module (e.g. kdebase, kdepim, ...). You _must_ set it