[gentoo-dev] [PATCH 0/3] Updates for chromium-2.eclass

[gentoo-dev] [PATCH 0/3] Updates for chromium-2.eclass

[Stephan Hartmann]

Small cleanup, small documentation improvements and EAPI 8 support.

Stephan Hartmann (3):
  chromium-2.eclass: remove GYP support
  chromium-2.eclass: update documentation
  chromium-2.eclass: enable EAPI 8

 eclass/chromium-2.eclass | 53 +++++++++++-----------------------------
 1 file changed, 14 insertions(+), 39 deletions(-)

-- 
2.31.1

[gentoo-dev] [PATCH 1/3] chromium-2.eclass: remove GYP support

[Stephan Hartmann]

Chromium project replaced GYP with GN in 2016 and nothing in
::gentoo is using GYP.

Signed-off-by: Stephan Hartmann <sultan@gentoo.org>
---
 eclass/chromium-2.eclass | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/eclass/chromium-2.eclass b/eclass/chromium-2.eclass
index 54df3b1394c..2543078df79 100644
--- a/eclass/chromium-2.eclass
+++ b/eclass/chromium-2.eclass
@@ -146,40 +146,4 @@ chromium_pkg_die() {
 	einfo
 }
 
-# @VARIABLE: EGYP_CHROMIUM_COMMAND
-# @DESCRIPTION:
-# Path to the gyp_chromium script.
-: ${EGYP_CHROMIUM_COMMAND:=build/gyp_chromium}
-
-# @VARIABLE: EGYP_CHROMIUM_DEPTH
-# @DESCRIPTION:
-# Depth for egyp_chromium.
-: ${EGYP_CHROMIUM_DEPTH:=.}
-
-# @FUNCTION: egyp_chromium
-# @USAGE: [gyp arguments]
-# @DESCRIPTION:
-# Calls EGYP_CHROMIUM_COMMAND with depth EGYP_CHROMIUM_DEPTH and given
-# arguments. The full command line is echoed for logging.
-egyp_chromium() {
-	set -- "${EGYP_CHROMIUM_COMMAND}" --depth="${EGYP_CHROMIUM_DEPTH}" "$@"
-	echo "$@"
-	"$@"
-}
-
-# @FUNCTION: gyp_use
-# @USAGE: <USE flag> [GYP flag] [true suffix] [false suffix]
-# @DESCRIPTION:
-# If USE flag is set, echo -D[GYP flag]=[true suffix].
-#
-# If USE flag is not set, echo -D[GYP flag]=[false suffix].
-#
-# [GYP flag] defaults to use_[USE flag] with hyphens converted to underscores.
-#
-# [true suffix] defaults to 1. [false suffix] defaults to 0.
-gyp_use() {
-	local gypflag="-D${2:-use_${1//-/_}}="
-	usex "$1" "${gypflag}" "${gypflag}"  "${3-1}" "${4-0}"
-}
-
 fi
-- 
2.31.1

[gentoo-dev] [PATCH 2/3] chromium-2.eclass: update documentation

[Stephan Hartmann]

Signed-off-by: Stephan Hartmann <sultan@gentoo.org>
---
 eclass/chromium-2.eclass | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/eclass/chromium-2.eclass b/eclass/chromium-2.eclass
index 2543078df79..b97a31e614e 100644
--- a/eclass/chromium-2.eclass
+++ b/eclass/chromium-2.eclass
@@ -26,7 +26,8 @@ fi
 # @FUNCTION: chromium_suid_sandbox_check_kernel_config
 # @USAGE:
 # @DESCRIPTION:
-# Ensures the system kernel supports features needed for SUID sandbox to work.
+# Ensures the system kernel supports features needed for SUID and User namespaces sandbox
+# to work.
 chromium_suid_sandbox_check_kernel_config() {
 	if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then
 		# Warn if the kernel does not support features needed for sandboxing.
@@ -50,6 +51,12 @@ chromium_suid_sandbox_check_kernel_config() {
 # @DESCRIPTION:
 # List of language packs available for this package.
 
+# @FUNCTION: _chromium_set_l10n_IUSE
+# @USAGE:
+# @INTERNAL
+# @DESCRIPTION:
+# Converts and adds CHROMIUM_LANGS to IUSE. Called automatically if
+# CHROMIUM_LANGS is defined.
 _chromium_set_l10n_IUSE() {
 	local lang
 	for lang in ${CHROMIUM_LANGS}; do
@@ -105,6 +112,10 @@ chromium_remove_language_paks() {
 	done
 }
 
+# @FUNCTION: chromium_pkg_die
+# @USAGE:
+# @DESCRIPTION:
+# EBUILD_DEATH_HOOK function to display some warnings/information about build environment.
 chromium_pkg_die() {
 	if [[ "${EBUILD_PHASE}" != "compile" ]]; then
 		return
-- 
2.31.1

[gentoo-dev] [PATCH 3/3] chromium-2.eclass: enable EAPI 8

[Stephan Hartmann]

Signed-off-by: Stephan Hartmann <sultan@gentoo.org>
---
 eclass/chromium-2.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/chromium-2.eclass b/eclass/chromium-2.eclass
index b97a31e614e..2800934537f 100644
--- a/eclass/chromium-2.eclass
+++ b/eclass/chromium-2.eclass
@@ -6,11 +6,11 @@
 # Chromium Project <chromium@gentoo.org>
 # @AUTHOR:
 # Mike Gilbert <floppym@gentoo.org>
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Shared functions for chromium and google-chrome
 
 case ${EAPI} in
-	7) ;;
+	7|8) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-- 
2.31.1

Re: [gentoo-dev] [PATCH 3/3] chromium-2.eclass: enable EAPI 8

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

>>>>> On Wed, 11 Aug 2021, Stephan Hartmann wrote:

>  case ${EAPI} in
> -	7) ;;
> +	7|8) ;;
>  	*) die "EAPI=${EAPI:-0} is not supported" ;;

Nitpick: Add "${ECLASS}: " at the beginning of the die message.

>  esac

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: [gentoo-dev] [PATCH 3/3] chromium-2.eclass: enable EAPI 8

[Stephan Hartmann]

On 8/12/21 1:16 PM, Ulrich Mueller wrote:
> 
>>   case ${EAPI} in
>> -	7) ;;
>> +	7|8) ;;
>>   	*) die "EAPI=${EAPI:-0} is not supported" ;;
> 
> Nitpick: Add "${ECLASS}: " at the beginning of the die message.

Thanks. Fixed locally.

> 
>>   esac