| 1 |
commit: 9014d7b816ec35fe6164f4df9bb29adb21832766 |
| 2 |
Author: Chris Reffett <creffett <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 4 22:57:19 2014 +0000 |
| 4 |
Commit: Chris Reffett <creffett <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 4 22:57:19 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9014d7b8 |
| 7 |
|
| 8 |
[eclass/kde4-base.eclass] Remove base.eclass inherit. Add eerror if a |
| 9 |
package with EAPI < 4 tries to inherit, that's long been unsupported |
| 10 |
anyway. |
| 11 |
|
| 12 |
--- |
| 13 |
eclass/kde4-base.eclass | 13 ++++++++++--- |
| 14 |
1 file changed, 10 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass |
| 17 |
index a8bbd2b..e257ee3 100644 |
| 18 |
--- a/eclass/kde4-base.eclass |
| 19 |
+++ b/eclass/kde4-base.eclass |
| 20 |
@@ -34,7 +34,14 @@ ___ECLASS_ONCE_KDE4_BASE="recur -_+^+_- spank" |
| 21 |
# for tests you should proceed with setting VIRTUALX_REQUIRED=test. |
| 22 |
: ${VIRTUALX_REQUIRED:=manual} |
| 23 |
|
| 24 |
-inherit kde4-functions toolchain-funcs fdo-mime flag-o-matic gnome2-utils base virtualx versionator eutils multilib |
| 25 |
+inherit kde4-functions toolchain-funcs fdo-mime flag-o-matic gnome2-utils virtualx versionator eutils multilib |
| 26 |
+ |
| 27 |
+case ${EAPI:-0} in |
| 28 |
+ 4|5) ;; |
| 29 |
+ 3|2|1|0) eerror "kde4-base.eclass only supports EAPIs >= 4." && die |
| 30 |
+ ;; |
| 31 |
+ *) die "Unknown EAPI, bug eclass maintainers." ;; |
| 32 |
+esac |
| 33 |
|
| 34 |
if [[ ${KDE_BUILD_TYPE} = live ]]; then |
| 35 |
case ${KDE_SCM} in |
| 36 |
@@ -673,8 +680,8 @@ kde4-base_src_prepare() { |
| 37 |
esac |
| 38 |
fi |
| 39 |
|
| 40 |
- # Apply patches |
| 41 |
- base_src_prepare |
| 42 |
+ # Apply patches, cmake-utils does the job already |
| 43 |
+ cmake-utils_src_prepare |
| 44 |
|
| 45 |
# Save library dependencies |
| 46 |
if [[ -n ${KMSAVELIBS} ]] ; then |
Archives