From 1118729405d206538433388e0a8bd578f7ae7303 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 18 Jan 2020 18:48:55 +0000 Subject: gentoo resync : 18.01.2010 --- eclass/Manifest.gz | Bin 36960 -> 36962 bytes eclass/llvm.org.eclass | 4 ++-- eclass/qmail.eclass | 4 ++-- eclass/toolchain.eclass | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 6cc8cd591129..de2585ad8c52 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index d9ea22ab2aca..b4b80df06d85 100644 --- a/eclass/llvm.org.eclass +++ b/eclass/llvm.org.eclass @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: llvm.org.eclass @@ -44,7 +44,7 @@ esac # @DESCRIPTION: # The major version of current LLVM trunk. Used to determine # the correct branch to use. -_LLVM_MASTER_MAJOR=10 +_LLVM_MASTER_MAJOR=11 # @ECLASS-VARIABLE: _LLVM_SOURCE_TYPE # @INTERNAL diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass index 7e33611462be..d3a7ba3ed83f 100644 --- a/eclass/qmail.eclass +++ b/eclass/qmail.eclass @@ -267,9 +267,9 @@ qmail_tcprules_install() { } qmail_supervise_install_one() { - dosupervise ${i} + dosupervise ${1} diropts -o qmaill -g "${GROUP_ROOT}" -m 755 - keepdir /var/log/qmail/${i} + keepdir /var/log/qmail/${1} } qmail_supervise_install() { diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index bd3d024f9891..5acaa2ffc688 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -538,6 +538,10 @@ toolchain_src_prepare() { do_gcc_PIE_patches do_gcc_CYGWINPORTS_patches + if [[ ${PV} == *9999* ]] ; then + BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, commit ${EGIT_VERSION}" + fi + case ${EAPI:-0} in 5*) epatch_user;; 6|7) eapply_user ;; -- cgit v1.2.3