From f78108598211053d41752a83e0345441bb9014ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Feb 2018 16:09:52 +0000 Subject: gentoo resync : 11.02.2018 --- eclass/Manifest.gz | Bin 41338 -> 41326 bytes eclass/bzr.eclass | 105 +++++++------------------------------------ eclass/kde5-functions.eclass | 4 ++ eclass/kernel-2.eclass | 1 + 4 files changed, 21 insertions(+), 89 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 25ed9c41c13a..5e36ab8be513 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass index 89c736427c27..710b64db28c0 100644 --- a/eclass/bzr.eclass +++ b/eclass/bzr.eclass @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # # @ECLASS: bzr.eclass # @MAINTAINER: -# No maintainer +# Ulrich Müller # @AUTHOR: # Jorge Manuel B. S. Vicetto # Mark Lee @@ -18,21 +18,20 @@ # Note: Just set EBZR_REPO_URI to the URI of the branch and src_unpack() # of this eclass will export the branch to ${WORKDIR}/${P}. -inherit eutils - EBZR="bzr.eclass" -case "${EAPI:-0}" in - 0|1) EXPORT_FUNCTIONS src_unpack ;; - *) EXPORT_FUNCTIONS src_unpack src_prepare ;; +case ${EAPI:-0} in + 2|3|4|5|6) ;; + *) die "${EBZR}: EAPI ${EAPI:-0} is not supported" ;; esac -DEPEND=">=dev-vcs/bzr-2.0.1" -case "${EAPI:-0}" in - 0|1) ;; - *) [[ ${EBZR_REPO_URI%%:*} = sftp ]] \ - && DEPEND=">=dev-vcs/bzr-2.0.1[sftp]" ;; -esac +EXPORT_FUNCTIONS src_unpack + +if [[ ${EBZR_REPO_URI%%:*} = sftp ]]; then + DEPEND=">=dev-vcs/bzr-2.6.0[sftp]" +else + DEPEND=">=dev-vcs/bzr-2.6.0" +fi # @ECLASS-VARIABLE: EBZR_STORE_DIR # @DESCRIPTION: @@ -57,7 +56,7 @@ esac # @ECLASS-VARIABLE: EBZR_UPDATE_CMD # @DESCRIPTION: # The Bazaar command to update the sources. -: ${EBZR_UPDATE_CMD:="bzr pull"} +: ${EBZR_UPDATE_CMD:="bzr pull --overwrite-tags"} # @ECLASS-VARIABLE: EBZR_EXPORT_CMD # @DESCRIPTION: @@ -85,9 +84,8 @@ esac # @DESCRIPTION: # The repository URI for the source package. # -# Note: If the ebuild uses an sftp:// URI, then in EAPI 0 or 1 it must -# make sure that dev-vcs/bzr was built with USE="sftp". In EAPI 2 or -# later, the eclass will depend on dev-vcs/bzr[sftp]. +# Note: If the ebuild uses an sftp:// URI, then the eclass will depend +# on dev-vcs/bzr[sftp]. # @ECLASS-VARIABLE: EBZR_INITIAL_URI # @DEFAULT_UNSET @@ -100,21 +98,6 @@ esac # # Normally, this variable needs not be set. -# @ECLASS-VARIABLE: EBZR_BOOTSTRAP -# @DEFAULT_UNSET -# @DESCRIPTION: -# Bootstrap script or command like autogen.sh or etc. - -# @ECLASS-VARIABLE: EBZR_PATCHES -# @DEFAULT_UNSET -# @DESCRIPTION: -# bzr.eclass can apply patches in bzr_bootstrap(). You can use regular -# expressions in this variable like *.diff or *.patch and the like. -# Note: These patches will be applied before EBZR_BOOTSTRAP is processed. -# -# Patches are searched both in ${PWD} and ${FILESDIR}. If not found in -# either location, the installation dies. - # @ECLASS-VARIABLE: EBZR_PROJECT # @DESCRIPTION: # The project name of your ebuild. Normally, the branch will be stored @@ -276,65 +259,9 @@ bzr_fetch() { popd > /dev/null } -# @FUNCTION: bzr_bootstrap -# @DESCRIPTION: -# Apply patches in ${EBZR_PATCHES} and run ${EBZR_BOOTSTRAP} if specified. -bzr_bootstrap() { - local patch lpatch - - pushd "${S}" > /dev/null || die "${EBZR}: can't chdir to ${S}" - - if [[ -n ${EBZR_PATCHES} ]] ; then - einfo "apply patches -->" - - for patch in ${EBZR_PATCHES} ; do - if [[ -f ${patch} ]] ; then - epatch "${patch}" - else - # This loop takes care of wildcarded patches given via - # EBZR_PATCHES in an ebuild - for lpatch in "${FILESDIR}"/${patch} ; do - if [[ -f ${lpatch} ]] ; then - epatch "${lpatch}" - else - die "${EBZR}: ${patch} is not found" - fi - done - fi - done - fi - - if [[ -n ${EBZR_BOOTSTRAP} ]] ; then - einfo "begin bootstrap -->" - - if [[ -f ${EBZR_BOOTSTRAP} ]] && [[ -x ${EBZR_BOOTSTRAP} ]] ; then - einfo " bootstrap with a file: ${EBZR_BOOTSTRAP}" - "./${EBZR_BOOTSTRAP}" \ - || die "${EBZR}: can't execute EBZR_BOOTSTRAP" - else - einfo " bootstrap with commands: ${EBZR_BOOTSTRAP}" - "${EBZR_BOOTSTRAP}" \ - || die "${EBZR}: can't eval EBZR_BOOTSTRAP" - fi - fi - - popd > /dev/null -} - # @FUNCTION: bzr_src_unpack # @DESCRIPTION: -# Default src_unpack(), calls bzr_fetch. For EAPIs 0 and 1, also calls -# bzr_src_prepare. +# Default src_unpack(), calls bzr_fetch. bzr_src_unpack() { bzr_fetch - case "${EAPI:-0}" in - 0|1) bzr_src_prepare ;; - esac -} - -# @FUNCTION: bzr_src_prepare -# @DESCRIPTION: -# Default src_prepare(), calls bzr_bootstrap. -bzr_src_prepare() { - bzr_bootstrap } diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 3df54d517242..cd0151eb296a 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -37,6 +37,10 @@ case ${CATEGORY} in [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} ;; kde-plasma) + if [[ ${PV} = 5.12* ]]; then + : ${QT_MINIMAL:=5.9.1} + : ${FRAMEWORKS_MINIMAL:=5.42.0} + fi if [[ ${KDE_BUILD_TYPE} = live ]]; then : ${QT_MINIMAL:=5.9.1} : ${FRAMEWORKS_MINIMAL:=9999} diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index a42d5f5ec24b..6ffbd37f300e 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -606,6 +606,7 @@ if [[ ${ETYPE} == sources ]]; then sys-devel/make dev-lang/perl sys-devel/bc + virtual/libelf )" SLOT="${PVR}" -- cgit v1.2.3