diff options
| author | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2020-12-13 23:25:30 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2020-12-13 23:25:30 +0000 |
| commit | fddf516add4924cfe9d698f116342e30b27d67b8 (patch) | |
| tree | 37bb83a30233d4ffaecaf215788d57e89040a1df /eclass | |
| parent | 8d7804efbd907eec22d8470e8200dcfd3c5bdd93 (diff) | |
| download | baldeagleos-repo-21.1.0.tar.gz baldeagleos-repo-21.1.0.tar.xz baldeagleos-repo-21.1.0.zip | |
Updating liguros repo21.1.0
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ecm.eclass | 25 | ||||
| -rw-r--r-- | eclass/kde.org.eclass | 9 |
2 files changed, 6 insertions, 28 deletions
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 8d358a91f989..c763957bf893 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -19,13 +19,6 @@ # # This eclass's phase functions are not intended to be mixed and matched, so if # any phase functions are overridden the version here should also be called. -# -# Porting from kde5.class -# - Convert all add_*_dep dependency functions to regular dependencies -# - Manually set LICENSE -# - Manually set SLOT -# - Rename vars and function names as needed, see kde5.eclass PORTING comments -# - Instead of FRAMEWORKS_MINIMAL, define KFMIN in ebuilds and use it for deps if [[ -z ${_ECM_ECLASS} ]]; then _ECM_ECLASS=1 @@ -267,24 +260,6 @@ DEPEND+=" ${COMMONDEPEND}" RDEPEND+=" ${COMMONDEPEND}" unset COMMONDEPEND -# @FUNCTION: _ecm_banned_var -# @INTERNAL -# @DESCRIPTION: -# Banned kde5*.eclass variables are banned. -_ecm_banned_var() { - die "$1 is banned. use $2 instead." -} - -if [[ -z ${_KDE5_ECLASS} ]] ; then - [[ -n ${KDE_DEBUG} ]] && _ecm_banned_var KDE_DEBUG ECM_DEBUG - [[ -n ${KDE_EXAMPLES} ]] && _ecm_banned_var KDE_EXAMPLES ECM_EXAMPLES - [[ -n ${KDE_HANDBOOK} ]] && _ecm_banned_var KDE_HANDBOOK ECM_HANDBOOK - [[ -n ${KDE_DOC_DIR} ]] && _ecm_banned_var KDE_DOC_DIR ECM_HANDBOOK_DIR - [[ -n ${KDE_PO_DIRS} ]] && _ecm_banned_var KDE_PO_DIRS ECM_PO_DIRS - [[ -n ${KDE_QTHELP} ]] && _ecm_banned_var KDE_QTHELP ECM_QTHELP - [[ -n ${KDE_TEST} ]] && _ecm_banned_var KDE_TEST ECM_TEST -fi - # @ECLASS-VARIABLE: KDE_GCC_MINIMAL # @DEFAULT_UNSET # @DESCRIPTION: diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass index b8fec445755c..819b73d5dfa4 100644 --- a/eclass/kde.org.eclass +++ b/eclass/kde.org.eclass @@ -8,7 +8,7 @@ # @BLURB: Support eclass for packages that are hosted on kde.org infrastructure. # @DESCRIPTION: # This eclass is mainly providing facilities for the upstream release groups -# Frameworks, Plasma, Applications to assemble default SRC_URI for tarballs, +# Frameworks, Plasma, Release Service to assemble default SRC_URI for tarballs, # set up git-r3.eclass for stable/master branch versions or restrict access to # unreleased (packager access only) tarballs in Gentoo KDE overlay, but it may # be also used by any other package hosted on kde.org. @@ -63,7 +63,7 @@ esac # @ECLASS-VARIABLE: KDE_UNRELEASED # @INTERNAL -# @DESCRIPTION +# @DESCRIPTION: # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream. # Any package matching this will have fetch restriction enabled, and receive # a proper error message via pkg_nofetch. @@ -220,7 +220,10 @@ kde.org_pkg_nofetch() { case ${CATEGORY} in kde-frameworks) sched_uri+="/Frameworks" ;; kde-plasma) sched_uri+="/Plasma_5" ;; - kde-apps) sched_uri+="/Applications/$(ver_cut 1-2)_Release_Schedule" ;; + *) + [[ ${KDE_RELEASE_SERVICE} = true ]] && + sched_uri+="/release_service/$(ver_cut 1-2)_Release_Schedule" + ;; esac eerror " _ _ _ _ ____ _____ _ _____ _ ____ _____ ____ " |