Update terraform and golang eclasses

Signed-off-by: Samuel Bernardo <samuelbernardo.mail@gmail.com>

7 files changed, 15 insertions, 126 deletions

diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 8f4bd6c..98d77c3 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1,7 +1,3 @@
-DIST terraform-0.11.3.tar.gz 9820598 BLAKE2B 929a20e3644fcac20fd117545ad7bf2fd2dbc31f37004a1a8f5a8e58d5fa590c02bc2353459bc15028bcee44fb0966c7c42e9b7837b61ecdbdacc0842aceb61f SHA512 983817f183181edd54a3c78260de6ee291beda2b7f8b2ee987c0ce6cf209ce09ca021fb32f1d839bb90c48d14921012ab3328d2ca160d40166e449b5af0236ba
-DIST terraform-0.11.7.tar.gz 10141085 BLAKE2B dc15a7a888f86ff36d642d5b77a63cfc0ea71ac49b2128cbda423e90e890c55cd9b86e78c775599d764fdcbfa9ff51a82cf650437c5cb9e23335a38d622ef4de SHA512 0ee0317bbca8b59698ae58cc090b7f6e11631885327bdcb805859312895c0f61e8eb87aa2fd4cd4ed7e4835fe50941a3f678b85aae8fc8b4585f9403d5c06de3
-DIST terraform-0.9.6.tar.gz 16881166 BLAKE2B debe3b49e4450011bb4661acab8796d01b086bdbcf937da3cb22d9cc33d5067bcb17881fa8f313ff3e2452571effd90986671502495dc186ed154d95e2a1b6eb SHA512 c0c937f4c5383c1324e2607ef956ace5e043503711539fe1ffd5348728b5d81da8d5fa2b0e8fcdf9d9f8fcd8b614bce031b18b30cad16f93431ab6b897954136
-EBUILD terraform-0.11.3.ebuild 925 BLAKE2B 3c54d436d0dbe002d8ed3cbea3ef825976a7f3c9f11010a15d68cb1f7b3dfd9d459e4a8b94aaf73b88f27be6798bc62331f8e31e3d8ebc2f035450708c54f9e2 SHA512 350a9f11785f0bb86664981cb2647e0b47f7b53bef3e629719105b7e88d371ce66948b7679081f2fc0b2c4dd6aa728c37d6199ade855dc98b078f7f77085bee1
-EBUILD terraform-0.11.7.ebuild 925 BLAKE2B 3c54d436d0dbe002d8ed3cbea3ef825976a7f3c9f11010a15d68cb1f7b3dfd9d459e4a8b94aaf73b88f27be6798bc62331f8e31e3d8ebc2f035450708c54f9e2 SHA512 350a9f11785f0bb86664981cb2647e0b47f7b53bef3e629719105b7e88d371ce66948b7679081f2fc0b2c4dd6aa728c37d6199ade855dc98b078f7f77085bee1
-EBUILD terraform-0.9.6.ebuild 1921 BLAKE2B 02f50a020df8c9b5547f5f42d6bd5c3dd0be898a14e2bd60844723ba3befa8996c1dadf98b78c9f8c689d9a0025364570dea05069b83d1afb9094d3f317e6baf SHA512 e0d39decd9313b3d0668b9a8782065621fa44fa148772a1c2bc6de75bde89f83aeffdbe775e46f715233a04e9be1023af79ac1d689a78e0abca0fc9df8fd93e6
+DIST terraform-1.8.5.tar.gz 6312380 BLAKE2B 464cb31f0af2e1ea046b8ba6461a4a4a8522b88771ba901c194c9853986a43cde26c33457669e75293a3664bce700ede07129704c7ee98fed39c46677f3c2720 SHA512 6b5e1a7aa3345a2c1087d6819215c9ed30e1e121c4314e9a6cebef13143064fb0ae43aa1446a66fd7e0d46b8b948e581fb8cc3b007e124ca5340523fcfa5ed61
+EBUILD terraform-1.8.5.ebuild 922 BLAKE2B 8de74a6ad3f9296e352e17632b00472ffd0951847e52fd67d748caa986e6f0d926b09e44c13f7ccc28ce062a93a253ca834c77cda1fca3f8d2a56afac34a972c SHA512 0d0db7fd214f6164a7764cfbffbccc01d9cea823808b440296173c588ff33635e31354efb017bc6f059e60e6dfd5b4f450185a1810eb949904a4f315cc5d2b38
 MISC metadata.xml 5113 BLAKE2B 2f911a04bd8622ed46504dc1dd0d6e9bb8b1791c9772525430da6237781c0fe4b6fdd32f8128d7c0372ed3026f307e02e405d803f53149af07db78dd50dc4aa3 SHA512 f84bf7d76e06179f4b74ab20ef6df64b05bbc6d0eed3cfed289d5204d6bd545853a4f99c290a9ea9de1c5fa7127faca8b634eef154a35df5aaf39c2ada621453
diff --git a/app-admin/terraform/terraform-0.11.7.ebuild b/app-admin/terraform/terraform-0.11.7.ebuild
deleted file mode 100644
index 7876b31..0000000
--- a/app-admin/terraform/terraform-0.11.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GOLANG_PKG_IMPORTPATH="github.com/hashicorp"
-GOLANG_PKG_ARCHIVEPREFIX="v"
-GOLANG_PKG_HAVE_TEST=1
-
-inherit golang-single
-
-DESCRIPTION="Terraform builds, changes, and combines infrastructure safely and efficiently"
-HOMEPAGE="http://www.terraform.io"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="zsh-completion fish-completion"
-
-RDEPEND="fish-completion? ( app-shells/fish )
-	zsh-completion? ( app-shells/zsh )"
-
-DOCS=(
-	README.md
-	examples/
-)
-
-src_install() {
-	golang-single_src_install
-
-	# Install fish completion files
-	if use fish-completion; then
-		insinto /usr/share/fish/functions/
-		newins contrib/fish-completion/${PN}.fish ${PN}.fish
-	fi
-
-	# Install zsh completion files
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh-completion/_${PN} _${PN}
-	fi
-}
diff --git a/app-admin/terraform/terraform-0.9.6.ebuild b/app-admin/terraform/terraform-0.9.6.ebuild
deleted file mode 100644
index c6e671c..0000000
--- a/app-admin/terraform/terraform-0.9.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-GOLANG_PKG_IMPORTPATH="github.com/hashicorp"
-GOLANG_PKG_ARCHIVEPREFIX="v"
-#GOLANG_PKG_USE_GENERATE=1
-GOLANG_PKG_HAVE_TEST=1
-
-inherit golang-single
-
-DESCRIPTION="Terraform builds, changes, and combines infrastructure safely and efficiently"
-HOMEPAGE="http://www.terraform.io"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 arm"
-
-COMMON_IUSE="chef"
-IUSE_PROVIDERS="atlas aws azure azurerm cloudflare cloudstack consul digitalocean dme dnsimple docker dyn google heroku librato mailgun +null openstack packet rundeck softlayer statuscake +template +tls vsphere vcd postgresql mysql powerdns"
-IUSE_PROVISIONERS="+file +local-exec +remote-exec"
-IUSE+=" $IUSE_PROVIDERS $IUSE_PROVISIONERS $COMMON_IUSE"
-
-# go-tools and codecgen are required by "go:generate stringer" directive
-#DEPEND="dev-go/go-tools
-#	dev-go/codecgen"
-
-src_compile() {
-	# build terraform binary
-	golang-single_src_compile
-
-	# build providers binaries
-	GOLANG_PKG_BUILDPATH+=" /builtin/bins/provider-${PN}"
-	local PROVIDERS="${IUSE_PROVIDERS} ${COMMON_IUSE}"
-	for provider in ${PROVIDERS}; do
-		provider="${provider//\+/}"
-		eval use ${provider} || continue
-
-		einfo "Building provider: ${provider}"
-		GOLANG_PKG_BUILDPATH+=" /builtin/bins/provider-${provider}"
-	done
-
-	# build provisioner binaries
-	local PROVISIONERS="${IUSE_PROVISIONERS} ${COMMON_IUSE}"
-	for provisioner in ${PROVISIONERS}; do
-		provisioner="${provisioner//\+/}"
-		eval use ${provisioner} || continue
-
-		einfo "Building provisioner: ${provisioner}"
-		GOLANG_PKG_BUILDPATH+=" /builtin/bins/provisioner-${provisioner}"
-	done
-	golang-single_src_compile
-}
-
-src_install() {
-	golang-single_src_install
-
-	# prefixing all the binaries
-	for pkg in "${ED}"/usr/bin/*; do
-		[[ "${PN}" == ${pkg##*/} ]] && continue
-		mv "${pkg}" "${ED}"/usr/bin/${PN}-${pkg##*/} || die
-	done
-}
diff --git a/app-admin/terraform/terraform-0.11.3.ebuild b/app-admin/terraform/terraform-1.8.5.ebuild
index 7876b31..717e667 100644
--- a/app-admin/terraform/terraform-0.11.3.ebuild
+++ b/app-admin/terraform/terraform-1.8.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 GOLANG_PKG_IMPORTPATH="github.com/hashicorp"
 GOLANG_PKG_ARCHIVEPREFIX="v"
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"