diff options
| -rw-r--r-- | eclass/kde4-base.eclass | 3 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 3 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 30a576cb287..c3ea214c0d5 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -10,7 +10,8 @@ # The kde4-base.eclass provides support for building KDE4 monolithic ebuilds # and KDE4 applications. # -# NOTE: This eclass NEEDS EAPI="2" or greater defined in ebuild. +# NOTE: KDE 4 ebuilds by default define EAPI="2", this can be redefined but +# eclass will fail with version older than 2. inherit base cmake-utils eutils multilib kde4-functions #live/normal diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index ceda83fab38..2cd098069bc 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -172,7 +172,7 @@ koffice_fix_libraries() { ### additional unmentioned stuff R_BAS_kowmf="libkowmf" for libname in ${LIB_ARRAY}; do - echo "Fixing library ${libname} with hardcoded path" + ebegin "Fixing library ${libname} with hardcoded path" for libpath in $(eval "echo \$R_BAS_${libname}"); do if [[ "${libpath}" != "\"/usr/"* ]]; then R="${R} \"${KDEDIR}/$(get_libdir)/${libpath}.so\"" @@ -188,6 +188,7 @@ koffice_fix_libraries() { -e "s:(${libname}):(${R}):g" \ -e "s: ${libname}$: ${R}:g" \ {} || die "Fixing library names failed." + eend $? done ;; esac diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 96c1b9b15ea..c884a9359ce 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -11,8 +11,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. -# -# NOTE: This eclass NEEDS EAPI="2" or greater defined in ebuild. # we want opengl optional in each koffice package if [[ "${KMNAME}" == "koffice" ]]; then |