diff options
author | Samuel Bernardo <samuelbernardo.mail@gmail.com> | 2024-06-09 22:50:39 +0100 |
---|---|---|
committer | Samuel Bernardo <samuelbernardo.mail@gmail.com> | 2024-06-09 22:50:39 +0100 |
commit | 47c7d27e95eab00137e4cd39cb34e824b5dea0b5 (patch) | |
tree | 96f4aa55a5fdc2a6ad3e6281ecd4a0acde9ee45c /eclass | |
parent | Correct icon description to IDEA Ultimate (diff) | |
download | ssnb-47c7d27e95eab00137e4cd39cb34e824b5dea0b5.tar.gz ssnb-47c7d27e95eab00137e4cd39cb34e824b5dea0b5.tar.bz2 ssnb-47c7d27e95eab00137e4cd39cb34e824b5dea0b5.zip |
Update terraform and golang eclasses
Signed-off-by: Samuel Bernardo <samuelbernardo.mail@gmail.com>
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/golang-common.eclass | 12 | ||||
-rw-r--r-- | eclass/golang-live.eclass | 4 | ||||
-rw-r--r-- | eclass/golang-single.eclass | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/eclass/golang-common.eclass b/eclass/golang-common.eclass index 5625c28..7d00fba 100644 --- a/eclass/golang-common.eclass +++ b/eclass/golang-common.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # $Id$ # @ECLASS: golang-utils.eclass # @MAINTAINER: -# Mauro Toffanin <toffanin.mauro@gmail.com> +# Samuel Bernardo <samuelbernardo.mail@gmail.com> # @AUTHOR: # Mauro Toffanin <toffanin.mauro@gmail.com> # @BLURB: Base eclass for GoLang packages @@ -15,14 +15,14 @@ # This eclass should not be inherited directly from an ebuild. # Instead, you should inherit golang-single or golang-live for GoLang packages. -inherit versionator eutils multiprocessing +inherit estack multiprocessing if [[ -z ${_GOLANG_BASE_ECLASS} ]]; then _GOLANG_BASE_ECLASS=1 # Silences repoman warnings. case "${EAPI:-0}" in - 5|6) + 8) case "${GOLANG_PKG_DEPEND_ON_GO_SUBSLOT:-yes}" in yes) GO_DEPEND="dev-lang/go:0=" @@ -596,7 +596,7 @@ golang-common_src_configure() { # Removes GoLang object files from package source directories (pkg/) # and temporary directories (_obj/ _test*/). local EGO_SUBPACKAGES="${GOLANG_PKG_IMPORTPATH_ALIAS}/${GOLANG_PKG_NAME}" - case $( get_version_component_range 1-2 ${GOLANG_VERSION} ) in + case $( ver_cut 1-2 ${GOLANG_VERSION} ) in 1.4*) ;; *) EGO_SUBPACKAGES+="/..." @@ -909,7 +909,7 @@ golang_do_build() { # Filters "=" chars from ldflags declaration. # NOTE: from go1.5+ linker syntax is no more compatible with <go1.4; # this hack ensures that the old behaviour is honoured. - if [[ $( get_version_component_range 1-2 ${GOLANG_VERSION} ) == "1.4" ]]; then + if [[ $( ver_cut 1-2 ${GOLANG_VERSION} ) == "1.4" ]]; then GOLANG_PKG_LDFLAGS="${GOLANG_PKG_LDFLAGS//=/ }" fi diff --git a/eclass/golang-live.eclass b/eclass/golang-live.eclass index 2d8902f..399f32b 100644 --- a/eclass/golang-live.eclass +++ b/eclass/golang-live.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # $Id$ # @ECLASS: golang-live.eclass # @MAINTAINER: -# Mauro Toffanin <toffanin.mauro@gmail.com> +# Samuel Bernardo <samuelbernardo.mail@gmail.com> # @AUTHOR: # Mauro Toffanin <toffanin.mauro@gmail.com> # @BLURB: Eclass for fetching and unpacking HEAD shapshot of go repositories diff --git a/eclass/golang-single.eclass b/eclass/golang-single.eclass index e8007f7..3440bc8 100644 --- a/eclass/golang-single.eclass +++ b/eclass/golang-single.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # $Id$ # @ECLASS: golang-single.eclass # @MAINTAINER: -# Mauro Toffanin <toffanin.mauro@gmail.com> +# Samuel Bernardo <samuelbernardo.mail@gmail.com> # @AUTHOR: # Mauro Toffanin <toffanin.mauro@gmail.com> # @BLURB: An eclass for GoLang packages not installed inside GOPATH/GOBIN. @@ -19,7 +19,7 @@ # Typical ebuild using golang-single.eclass: # # @CODE -# EAPI=5 +# EAPI=8 # # GOLANG_PKG_IMPORTPATH="github.com/captObvious" # GOLANG_PKG_ARCHIVESUFFIX=".zip" |