From 71f9cc21aab4168093940b3d2e267444d712bff5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Sep 2022 22:19:54 +0100 Subject: gentoo auto-resync : 03:09:2022 - 22:19:54 --- eclass/Manifest.gz | Bin 36966 -> 36980 bytes eclass/go-module.eclass | 5 +++-- eclass/haskell-cabal.eclass | 4 ++-- eclass/xemacs-packages.eclass | 16 ++++++---------- 4 files changed, 11 insertions(+), 14 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 8170c956ab8f..198c95d7338c 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass index a5dafb45cab8..681a5bca5561 100644 --- a/eclass/go-module.eclass +++ b/eclass/go-module.eclass @@ -68,7 +68,7 @@ if [[ -z ${_GO_MODULE} ]]; then _GO_MODULE=1 if [[ ! ${GO_OPTIONAL} ]]; then - BDEPEND=">=dev-lang/go-1.16" + BDEPEND=">=dev-lang/go-1.18" # Workaround for pkgcheck false positive: https://github.com/pkgcore/pkgcheck/issues/214 # MissingUnpackerDep: version ...: missing BDEPEND="app-arch/unzip" @@ -93,10 +93,11 @@ export GOCACHE="${T}/go-build" export GOMODCACHE="${WORKDIR}/go-mod" # The following go flags should be used for all builds. +# -buildvcs=false omits version control information # -modcacherw makes the build cache read/write # -v prints the names of packages as they are compiled # -x prints commands as they are executed -export GOFLAGS="-modcacherw -v -x" +export GOFLAGS="-buildvcs=false -modcacherw -v -x" # Do not complain about CFLAGS etc since go projects do not use them. QA_FLAGS_IGNORED='.*' diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index d437fc824f53..732ea83e653c 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -359,8 +359,8 @@ cabal-show-brokens() { elog "ghc-pkg check: 'checking for other broken packages:'" # pretty-printer $(ghc-getghcpkg) check 2>&1 \ - | egrep -v '^Warning: haddock-(html|interfaces): ' \ - | egrep -v '^Warning: include-dirs: ' \ + | grep -E -v '^Warning: haddock-(html|interfaces): ' \ + | grep -E -v '^Warning: include-dirs: ' \ | head -n 20 cabal-die-if-nonempty 'broken' \ diff --git a/eclass/xemacs-packages.eclass b/eclass/xemacs-packages.eclass index 2440ef835291..91621f5f52d3 100644 --- a/eclass/xemacs-packages.eclass +++ b/eclass/xemacs-packages.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xemacs-packages.eclass # @MAINTAINER: # xemacs@gentoo.org -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: Eclass to support elisp packages distributed by XEmacs. # @DESCRIPTION: # This eclass supports ebuilds for packages distributed by XEmacs. @@ -12,7 +12,7 @@ # @ECLASS_VARIABLE: XEMACS_PKG_CAT # @REQUIRED # @DESCRIPTION: -# The package category that the package is in. Can be either standard, +# The package category that the package is in. Can be either standard, # mule, or contrib. # @ECLASS_VARIABLE: XEMACS_EXPERIMENTAL @@ -20,12 +20,12 @@ # @DEFAULT_UNSET # @DESCRIPTION: # If set then the package is downloaded from the experimental packages -# repository, which is the staging area for packages upstream. Packages +# repository, which is the staging area for packages upstream. Packages # in the experimental repository are auto-generated from XEmacs VCS, so # they may not be well-tested. -case ${EAPI:-0} in - [67]) ;; +case ${EAPI} in + 6|7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -40,10 +40,6 @@ S="${WORKDIR}" : ${HOMEPAGE:="http://xemacs.org/"} : ${LICENSE:="GPL-2+"} -# Backwards compatibility code, to be removed after 2017-05-03 -: ${XEMACS_PKG_CAT:=${PKG_CAT}} -: ${XEMACS_EXPERIMENTAL:=${EXPERIMENTAL}} - if [[ -n ${XEMACS_EXPERIMENTAL} ]]; then : ${SRC_URI:="http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/${P}-pkg.tar.gz"} else -- cgit v1.2.3