Merge updates from master

22 files changed, 72 insertions, 49 deletions

diff --git a/app-backup/dar/dar-2.6.10.ebuild b/app-backup/dar/dar-2.6.10.ebuild
index 8cce3a914ff9..f37ecb73ec03 100644
--- a/app-backup/dar/dar-2.6.10.ebuild
+++ b/app-backup/dar/dar-2.6.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
 IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
 
 RESTRICT="test" # need to be run as root
diff --git a/dev-libs/glib/glib-2.66.7.ebuild b/dev-libs/glib/glib-2.66.7.ebuild
index 14e97da5867d..417cda9f1dd4 100644
--- a/dev-libs/glib/glib-2.66.7.ebuild
+++ b/dev-libs/glib/glib-2.66.7.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-python/PyQt5/PyQt5-5.15.2.ebuild b/dev-python/PyQt5/PyQt5-5.15.2.ebuild
index c88cf0facfcb..69434bfb6142 100644
--- a/dev-python/PyQt5/PyQt5-5.15.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects, QtTextToSpeech
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
index cc9d7a994c87..3e2edbd11476 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/parameterized/parameterized-0.7.4.ebuild b/dev-python/parameterized/parameterized-0.7.4.ebuild
index 6fe93cc7ae3c..1c4c80440c4e 100644
--- a/dev-python/parameterized/parameterized-0.7.4.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/websockets/websockets-8.1.ebuild b/dev-python/websockets/websockets-8.1.ebuild
index 0e9ef5a25dea..c970424df02b 100644
--- a/dev-python/websockets/websockets-8.1.ebuild
+++ b/dev-python/websockets/websockets-8.1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~x86"
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
index f9fca629b608..12f3cadf0f20 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-tex/hevea/hevea-2.35.ebuild b/dev-tex/hevea/hevea-2.35.ebuild
index b83db16891b7..3bcb7ad36173 100644
--- a/dev-tex/hevea/hevea-2.35.ebuild
+++ b/dev-tex/hevea/hevea-2.35.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
 
 LICENSE="QPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt=]"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild
index 89df9ec75825..ce9171f385e4 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glib-utils/glib-utils-2.66.7.ebuild b/dev-util/glib-utils/glib-utils-2.66.7.ebuild
index 7e6f982ef1a5..8b84e0c8ae06 100644
--- a/dev-util/glib-utils/glib-utils-2.66.7.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.66.7.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
index f40a60ab632e..791def1339e3 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="!<dev-util/gtk-doc-${GNOME_ORG_PVP}"
 PDEPEND="virtual/pkgconfig"
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild
index 1604f67fe477..c47d56cb5e2c 100644
--- a/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="emacs test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 6a0187c3ab51..5f48909bca01 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index a46666146a85..610bd50821a6 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
diff --git a/net-libs/libhubbub/libhubbub-0.3.7.ebuild b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
index f1d11a3aa918..7f4b0c640210 100644
--- a/net-libs/libhubbub/libhubbub-0.3.7.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/net-p2p/mldonkey/files/mldonkey.confd-2.8 b/net-p2p/mldonkey/files/mldonkey.confd
index 1d1f282234f7..7cdb2b7134ed 100644
--- a/net-p2p/mldonkey/files/mldonkey.confd-2.8
+++ b/net-p2p/mldonkey/files/mldonkey.confd
@@ -33,6 +33,9 @@ SERVER="localhost"
 # port for webinterface, usually 4080
 PORT="4080"
 
+# port for telnet interface, usually 4000
+TELNET_PORT="4000"
+
 # to enable password restricted access,
 # uncomment and set BOTH following vars:
 #USERNAME="admin"
diff --git a/net-p2p/mldonkey/files/mldonkey.initd b/net-p2p/mldonkey/files/mldonkey.initd
index 12dd599de7be..b7e561372392 100644
--- a/net-p2p/mldonkey/files/mldonkey.initd
+++ b/net-p2p/mldonkey/files/mldonkey.initd
@@ -35,26 +35,55 @@ start() {
 	eend $?
 }
 
-setup_uri() {
-	BASE="http://"
+send_telnet_commands() {
+	if [ -z "${TELNET_PORT+x}" ]; then
+		return 1
+	fi
+	local cmds=
 	if [ -n "${USERNAME}" -a -n "${PASSWORD}" ]; then
-		BASE="${BASE}${USERNAME}:${PASSWORD}@"
+		cmds="auth ${USERNAME} ${PASSWORD}\n"
 	fi
-	BASE="${BASE}${SERVER}:${PORT}"
+	cmds="$cmds\nansi false\n"
+	while [ $# -gt 0 ]; do
+		cmds="$cmds$1\n"
+		shift
+	done
+	printf "$cmds\nexit\n" | nc -w "${MLDONKEY_TIMEOUT}" localhost "${TELNET_PORT}" 2> /dev/null
+	return $?
+}
+
+send_http_commands() {
+	if [ -z "${PORT+x}" ]; then
+		return 1
+	fi
+	local base="http://"
+	if [ -n "${USERNAME}" -a -n "${PASSWORD}" ]; then
+		base="${base}${USERNAME}:${PASSWORD}@"
+	fi
+	base="${base}${SERVER}:${PORT}"
+	local retval=0
+	while [ $retval -eq 0 -a $# -gt 0 ]; do
+		wget -q -O /dev/stdout --timeout="${MLDONKEY_TIMEOUT}" "${base}/submit?q=${1// /+}" 2> /dev/null
+		retval=$?
+		shift
+	done
+	return $retval
+}
+
+send_commands() {
+	send_telnet_commands "$@" &> /dev/null || send_http_commands "$@" &> /dev/null
+	return $?
 }
 
 stop() {
 	ebegin "Stopping ${SVCNAME} -- please wait"
 
-	setup_uri
-	wget --spider --timeout="${MLDONKEY_TIMEOUT}" "${BASE}"/submit?q=close_fds -q
-	wget --spider --timeout="${MLDONKEY_TIMEOUT}" "${BASE}"/submit?q=save -q
-	wget --spider --timeout="${MLDONKEY_TIMEOUT}" "${BASE}"/submit?q=kill -q
+	send_commands close_fds save kill
 
 	# give it a chance to die:
 	local timeout=${MLDONKEY_TIMEOUT}
 	while [ $timeout -gt 0 ]; do
-		if ! start-stop-daemon --test --quiet --stop \
+		if ! start-stop-daemon --test --quiet --quiet --stop \
 			--exec "${MLDONKEY_BINARY}" \
 			--pidfile /var/run/"${SVCNAME}".pid ; then
 			eend 0
@@ -87,32 +116,23 @@ reload() {
 
 slow() {
 	ebegin "Reducing bandwidth to ${LOW_DOWN}k/${LOW_UP}k"
-	setup_uri
-	wget --spider --timeout="${MLDONKEY_TIMEOUT}" \
-		"${BASE}/submit?q=set+max_hard_download_rate+${LOW_DOWN}" -q
-	wget --spider --timeout=${MLDONKEY_TIMEOUT} \
-		"${BASE}/submit?q=set+max_hard_upload_rate+${LOW_UP}" -q
+	send_commands "set max_hard_download_rate ${LOW_DOWN}" "set max_hard_upload_rate ${LOW_UP}"
 	eend $?
 }
 
 fast() {
 	ebegin "Increasing bandwidth to ${HIGH_DOWN}k/${HIGH_UP}k"
-
-	setup_uri
-	wget --spider --timeout="${MLDONKEY_TIMEOUT}" \
-		"${BASE}/submit?q=set+max_hard_upload_rate+${HIGH_UP}" -q
-	wget --spider --timeout="${MLDONKEY_TIMEOUT}" \
-		"${BASE}/submit?q=set+max_hard_download_rate+${HIGH_DOWN}" -q
+	send_commands "set max_hard_upload_rate ${HIGH_UP}" "set max_hard_download_rate ${HIGH_DOWN}"
 	eend $?
 }
 
 
 info() {
-	setup_uri
-	local result=$(wget --timeout="${MLDONKEY_TIMEOUT}" \
-		-O - "${BASE}"/submit?q=vo 2>/dev/null | \
-		grep -C1 max_hard_upload | \
-		grep value=\" | cut -d\" -f2)
+	set -o pipefail
+	local result=$(
+		send_telnet_commands "voo max_hard_upload_rate" | grep -a 'max_hard_upload_rate.* =' | cut -d \  -f 3 ||
+		send_http_commands "voo max_hard_upload_rate" | fgrep name=value | sed -e 's/.*value="//' -e 's/".*//'
+	)
 	if [ "${result}" = "${LOW_UP}" ]; then
 		einfo "${SVCNAME} runs slow"
 	else
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild b/net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild
index 07ce1065498f..0eaeac9e7461 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r1.ebuild
@@ -19,6 +19,7 @@ REQUIRED_USE="guionly? ( gtk )"
 
 RDEPEND="dev-lang/perl
 	dev-ml/camlp4:=
+	net-analyzer/netcat
 	gd? ( media-libs/gd[truetype] )
 	gtk? (
 		gnome-base/librsvg
@@ -137,7 +138,7 @@ src_install() {
 		done
 		use bittorrent && newbin "make_torrent${myext}" make_torrent
 
-		newconfd "${FILESDIR}/mldonkey.confd-2.8" mldonkey
+		newconfd "${FILESDIR}/mldonkey.confd" mldonkey
 		fperms 600 /etc/conf.d/mldonkey
 		newinitd "${FILESDIR}/mldonkey.initd" mldonkey
 	fi
diff --git a/net-wireless/kismet/kismet-2020.12.3.ebuild b/net-wireless/kismet/kismet-2020.12.3.ebuild
index f0e2888cb0b7..67cb96a98bc4 100644
--- a/net-wireless/kismet/kismet-2020.12.3.ebuild
+++ b/net-wireless/kismet/kismet-2020.12.3.ebuild
@@ -19,7 +19,7 @@ else
 
 	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~ppc ~x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 380a2f5c36cb..da23cb4e98f3 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,2 +1,2 @@
-DIST charliecloud-0.20.tar.gz 372770 BLAKE2B a5e6ad3fc93aa7219ec8d35ae112fc7320befc909d2cc805f5d67a356840112c245581c18d790a4fc755e70240e6444059cab8b9531eaedb3e3b941cf756aa55 SHA512 e3269bbf667462214ba88f8fc4651396c9621cd315a798113b66e8be0d4367ce1c18b8b956f325bd07049d644b46fd6837c5b712ced4bdf20a42bcc9aaafd8b7
 DIST charliecloud-0.21.tar.gz 386637 BLAKE2B a5b115a9d741a2c83596a302e7dd3d0d6096eb11f3e38925009b05f5a16f2d6fa4ff1c0023789feae1d359c94e4970dcc62d597437c6f7143f8152603b0e9a88 SHA512 89351e4dc039cd724c7503a4855f0980128d28aa4e2e98c5fd8cc5060e2c853e65280b830526691c8d4c7d85168658d578236893075637e3a38c6eb1df4e8dfe
+DIST charliecloud-0.22.tar.gz 402106 BLAKE2B 4c2d4bf77424c5b46e5593bc28bbe10891c353c23c8d382a9ca7515187538f5fef4d90b95f34572f65223f27433ccab9021bf9e4bc31931787894924d1dd02e2 SHA512 c528ffa9ecddbd4a26b0a8b6cc593340f3aaa0911cf45e1f6a5fe860178917f069ca9b31b7c1aee6220762bbe4b75114219eac4cdd3987bcb3f3338e2b6fb18e
diff --git a/sys-cluster/charliecloud/charliecloud-0.20.ebuild b/sys-cluster/charliecloud/charliecloud-0.22.ebuild
index 70ef80763985..828e7a1e5d33 100644
--- a/sys-cluster/charliecloud/charliecloud-0.20.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ HOMEPAGE="https://hpc.github.io/charliecloud/"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-IUSE="ch-grow doc"
+IUSE="ch-image doc"
 
 # Extensive test suite exists, but downloads container images
 # directly and via Docker and installs packages inside using apt/yum.
@@ -32,7 +32,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="
-	ch-grow? (
+	ch-image? (
 		$(python_gen_cond_dep '
 			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
 			dev-python/requests[${PYTHON_MULTI_USEDEP}]
@@ -55,7 +55,7 @@ src_configure() {
 	local econf_args=()
 	econf_args+=(
 		$(use_enable doc html)
-		$(use_enable ch-grow)
+		$(use_enable ch-image)
 		# Libdir is used as a libexec-style destination.
 		--libdir="${EPREFIX}"/usr/lib
 		# Attempts to call python-exec directly otherwise.
@@ -68,7 +68,7 @@ src_configure() {
 
 pkg_postinst() {
 	elog "Various builders are supported, as alternative "
-	elog "to the internal ch-grow. The following packages "
+	elog "to the internal ch-image. The following packages "
 	elog "can be installed to get the corresponding support "
 	elog "and related functionality."
 
diff --git a/sys-cluster/charliecloud/metadata.xml b/sys-cluster/charliecloud/metadata.xml
index 0e5ccf0b73ee..b580309d72a1 100644
--- a/sys-cluster/charliecloud/metadata.xml
+++ b/sys-cluster/charliecloud/metadata.xml
@@ -14,6 +14,5 @@
   </upstream>
   <use>
     <flag name='ch-image'>Build the internal builder ch-image (previously named ch-grow)</flag>
-    <flag name='ch-grow'>Build the internal builder ch-grow</flag>
   </use>
 </pkgmetadata>