summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorChris Reffett <creffett@gentoo.org>2014-01-04 17:57:19 -0500
committerChris Reffett <creffett@gentoo.org>2014-01-04 17:57:19 -0500
commit9014d7b816ec35fe6164f4df9bb29adb21832766 (patch)
tree2def19df9b5e9a3ea8992e0d5277cbbc0789f724 /eclass
parentb1fc8c8c5e9d7bb235635ca59e815cd4dcecf3a7 (diff)
downloadkde-9014d7b816ec35fe6164f4df9bb29adb21832766.tar.gz
kde-9014d7b816ec35fe6164f4df9bb29adb21832766.tar.bz2
kde-9014d7b816ec35fe6164f4df9bb29adb21832766.zip
[eclass/kde4-base.eclass] Remove base.eclass inherit. Add eerror if a
package with EAPI < 4 tries to inherit, that's long been unsupported anyway.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kde4-base.eclass13
1 files changed, 10 insertions, 3 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a8bbd2bf91f..e257ee3f32e 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -34,7 +34,14 @@ ___ECLASS_ONCE_KDE4_BASE="recur -_+^+_- spank"
# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
: ${VIRTUALX_REQUIRED:=manual}
-inherit kde4-functions toolchain-funcs fdo-mime flag-o-matic gnome2-utils base virtualx versionator eutils multilib
+inherit kde4-functions toolchain-funcs fdo-mime flag-o-matic gnome2-utils virtualx versionator eutils multilib
+
+case ${EAPI:-0} in
+ 4|5) ;;
+ 3|2|1|0) eerror "kde4-base.eclass only supports EAPIs >= 4." && die
+ ;;
+ *) die "Unknown EAPI, bug eclass maintainers." ;;
+esac
if [[ ${KDE_BUILD_TYPE} = live ]]; then
case ${KDE_SCM} in
@@ -673,8 +680,8 @@ kde4-base_src_prepare() {
esac
fi
- # Apply patches
- base_src_prepare
+ # Apply patches, cmake-utils does the job already
+ cmake-utils_src_prepare
# Save library dependencies
if [[ -n ${KMSAVELIBS} ]] ; then