commit: 4a18f7aaa5f167d114d848c3a82621761f721ac7 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Wed Jul 16 17:37:53 2014 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed Jul 16 17:37:53 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4a18f7aa
[eclass] Sync with portage. --- eclass/kde4-base.eclass | 10 ++-------- eclass/kde4-functions.eclass | 4 ++-- eclass/kde4-meta-pkg.eclass | 4 ++-- eclass/kde4-meta.eclass | 14 +++++++------- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index f08b307..8bb4016 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -13,8 +13,8 @@ # NOTE: KDE 4 ebuilds currently support EAPIs 4 and 5. This will be # reviewed over time as new EAPI versions are approved. -if [[ ${___ECLASS_ONCE_KDE4_BASE} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_KDE4_BASE="recur -_+^+_- spank" +if [[ -z ${_KDE4_BASE_ECLASS} ]]; then +_KDE4_BASE_ECLASS=1 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE # @DESCRIPTION: @@ -439,12 +439,6 @@ _calculate_src_uri() { 4.[1-7].[12345]) # Stable KDE SC with old .bz2 support SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;; - 4.11.7) - # Part of 4.12 actually, sigh. Not stable for next release! - SRC_URI="mirror://kde/stable/4.12.3/src/${_kmname_pv}.tar.xz" ;; - 4.11.8) - # Part of 4.12 actually, sigh. Not stable for next release! - SRC_URI="mirror://kde/stable/4.12.4/src/${_kmname_pv}.tar.xz" ;; 4.11.9) # Part of 4.12 actually, sigh. Not stable for next release! SRC_URI="mirror://kde/stable/4.12.5/src/${_kmname_pv}.tar.xz" ;; diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index c12df73..0a72e59 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -12,8 +12,8 @@ inherit versionator # This eclass contains all functions shared by the different eclasses, # for KDE 4 ebuilds. -if [[ ${___ECLASS_ONCE_KDE4_FUNCTIONS} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_KDE4_FUNCTIONS="recur -_+^+_- spank" +if [[ -z ${_KDE4_FUNCTIONS_ECLASS} ]]; then +_KDE4_FUNCTIONS_ECLASS=1 # @ECLASS-VARIABLE: EAPI # @DESCRIPTION: diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass index 73ff30a..535c36c 100644 --- a/eclass/kde4-meta-pkg.eclass +++ b/eclass/kde4-meta-pkg.eclass @@ -9,8 +9,8 @@ # @DESCRIPTION: # This eclass should only be used for defining meta packages for KDE4. -if [[ ${___ECLASS_ONCE_KDE4_META_PKG} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_KDE4_META_PKG="recur -_+^+_- spank" +if [[ -z ${_KDE4_META_PKG_ECLASS} ]]; then +_KDE4_META_PKG_ECLASS=1 inherit kde4-functions diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index cb3fc6f..1848977 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -12,8 +12,8 @@ # 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. -if [[ ${___ECLASS_ONCE_KDE4_META} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_KDE4_META="recur -_+^+_- spank" +if [[ -z ${_KDE4_META_ECLASS} ]]; then +_KDE4_META_ECLASS=1 [[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild" @@ -167,7 +167,7 @@ kde4-meta_src_extract() { || die "${escm}: can't export cmake files to '${S}'." fi # Copy all subdirectories - for subdir in $(__list_needed_subdirectories); do + for subdir in $(_list_needed_subdirectories); do targetdir="" if [[ $subdir = doc/* && ! -e "$wc_path/$subdir" ]]; then continue @@ -196,7 +196,7 @@ kde4-meta_src_extract() { tarfile="${DISTDIR}/${tarball}" # Detect real toplevel dir from tarball name - it will be used upon extraction - # and in __list_needed_subdirectories + # and in _list_needed_subdirectories topdir="${tarball%.tar.*}/" ebegin "Unpacking parts of ${tarball} to ${WORKDIR}" @@ -207,7 +207,7 @@ kde4-meta_src_extract() { do extractlist+=" ${topdir}${f}" done - extractlist+=" $(__list_needed_subdirectories)" + extractlist+=" $(_list_needed_subdirectories)" pushd "${WORKDIR}" > /dev/null @@ -228,7 +228,7 @@ kde4-meta_src_extract() { eend $? if [[ -n ${KDE4_STRICTER} ]]; then - for f in $(__list_needed_subdirectories fatal); do + for f in $(_list_needed_subdirectories fatal); do if [[ ! -e ${S}/${f#*/} ]]; then eerror "'${f#*/}' is missing" abort=true @@ -311,7 +311,7 @@ kde4-meta_create_extractlists() { debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEXTRACTONLY}" } -__list_needed_subdirectories() { +_list_needed_subdirectories() { local i j kmextra kmextra_expanded kmmodule_expanded kmcompileonly_expanded extractlist # We expand KMEXTRA by adding CMakeLists.txt files