Merge updates from master

8 files changed, 214 insertions, 8 deletions

diff --git a/dev-python/cppy/cppy-1.2.0.ebuild b/dev-python/cppy/cppy-1.2.0.ebuild
index 95c34692b59f..c6cade545c7c 100644
--- a/dev-python/cppy/cppy-1.2.0.ebuild
+++ b/dev-python/cppy/cppy-1.2.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/fonttools/fonttools-4.30.0.ebuild b/dev-python/fonttools/fonttools-4.30.0.ebuild
index 8509d83f4d52..0b99594354ad 100644
--- a/dev-python/fonttools/fonttools-4.30.0.ebuild
+++ b/dev-python/fonttools/fonttools-4.30.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv sparc ~x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/jmespath/jmespath-1.0.0.ebuild b/dev-python/jmespath/jmespath-1.0.0.ebuild
index ca9ec7e6cf47..18253469abc7 100644
--- a/dev-python/jmespath/jmespath-1.0.0.ebuild
+++ b/dev-python/jmespath/jmespath-1.0.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 11798908daef..2a649942550c 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -2099,8 +2099,9 @@ ejavac() {
 		einfo "${compiler_executable} ${javac_args} ${@}"
 	fi
 
-	ebegin "Compiling"
-	${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
+	local args=( ${compiler_executable} ${javac_args} "${@}" )
+	echo "${args[@]}" >&2
+	"${args[@]}" || die "ejavac failed"
 }
 
 # @FUNCTION: ejavadoc
@@ -2125,8 +2126,9 @@ ejavadoc() {
 		einfo "javadoc ${javadoc_args} ${@}"
 	fi
 
-	ebegin "Generating JavaDoc"
-	javadoc ${javadoc_args} "${@}" || die "ejavadoc failed"
+	local args=( javadoc ${javadoc_args} "${@}" )
+	echo "${args[@]}" >&2
+	"${args[@]}" || die "ejavadoc failed"
 }
 
 # @FUNCTION: java-pkg_filter-compiler
diff --git a/kde-frameworks/plasma/files/plasma-5.93.0-fix-widget-popups.patch b/kde-frameworks/plasma/files/plasma-5.93.0-fix-widget-popups.patch
new file mode 100644
index 000000000000..7f95c6531a95
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.93.0-fix-widget-popups.patch
@@ -0,0 +1,29 @@
+From b62d83bef7733e4943e6f66787166b41198d1359 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Wed, 13 Apr 2022 16:05:32 +0200
+Subject: [PATCH] Dialog: Do not update layout parameters while hidden
+
+Wait until the dialog it's shown to position the components within.
+Otherwise we do it based on a random size.
+
+BUG: 452512
+---
+ src/plasmaquick/dialog.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
+index 09937ef0f..9ca2c8a66 100644
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -475,7 +475,7 @@ void DialogPrivate::getSizeHints(QSize &min, QSize &max) const
+ 
+ void DialogPrivate::updateLayoutParameters()
+ {
+-    if (!componentComplete || !mainItem || !mainItemLayout) {
++    if (!componentComplete || !mainItem || !mainItemLayout || q->visibility() == QWindow::Hidden) {
+         return;
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.93.0.ebuild b/kde-frameworks/plasma/plasma-5.93.0-r1.ebuild
index 8203773544a2..1548d3671d1d 100644
--- a/kde-frameworks/plasma/plasma-5.93.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.93.0-r1.ebuild
@@ -59,7 +59,10 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
 
-PATCHES=( "${FILESDIR}/${PN}-5.92.0-fix-blurry-buttons.patch" ) # KDE-bug 447977
+PATCHES=(
+	"${FILESDIR}/${PN}-5.92.0-fix-blurry-buttons.patch" # KDE-bug 447977
+	"${FILESDIR}/${P}-fix-widget-popups.patch" # bug 838661, KDE-bug 452512
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 8f89a54ee2c8..5749f04cd9b4 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -3,4 +3,5 @@ DIST neomutt-20211015.tar.gz 3727778 BLAKE2B 2a2c57014b089a86ee38a261251ef1ee8c0
 DIST neomutt-20211022.tar.gz 3731092 BLAKE2B 764b82e1fffda57949b063b2c7b9a0c747c2769cc546ff04e56d8f9d91e689be72fd9a7e05a772162b9fae3683dd72631982056ca12c8d4a061efeb8013ac55e SHA512 8e574cd9bed19880eeb1605bb8fac1e5933571c2b499364465efce4212e2bcd7c6bc9909bf8241b5dd0fa461a55f71fdd04f4b35fc1d92ffea4647ac2b3672d0
 DIST neomutt-20211029.tar.gz 3702926 BLAKE2B 28868799da89d0acfe75b07b6716b25cd827a187711ed011a46b90135358521eccf4a6cd8938983342d4cdd04ffc951cdbf4531f9f48e2209e58e8133932df3a SHA512 7335a4451aa8657aa83988b42fb78c5ebdc82ce4395d93d1eb2fded36b02d3fac9b8fed3cf1353042ecebe11e6ccdd9d403b99f068555693901b1700791e3ae0
 DIST neomutt-20220408.tar.gz 3764512 BLAKE2B a2f4d86960d6c47f91654af1752cf1d64df0a6822c9d8376ae31d070a2725f2a2d74eda9cd407b1bfe7f5145ef6311a3a7fc15a3d541dd4400d9ea5ddac12444 SHA512 c9cd4a36ca7bb349a510cc007884dfe677080805c69262de23dea4c29b7e42bd33d5c2abfd8924045e0baff0b6e23241433eee99600fac371b54bcb9b0b6d96d
+DIST neomutt-20220415.tar.gz 3770700 BLAKE2B 610632a8de6f407b2a33156890f33b64a7cfc80eef84cda4c5e18d1da87669c8a4cf2b4a0b269d6c338f546e83a349dc33608b9f21d1f6889efaa89d669f80e4 SHA512 8723416fe0ed325d8f0e49f6a77f2724e23e0e81c5786f15005cb05b47c0fc7f722f61a58fe0250dd5a2dac6f40b155b6bac202e6316662a1855265670affc92
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
new file mode 100644
index 000000000000..ec67e6bc7849
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20220415.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+fi
+
+TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
+SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.2
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb:= )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17:= )
+	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0= )
+	slang? ( sys-libs/slang )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl:=
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| (
+			www-client/lynx
+			www-client/w3m
+			www-client/elinks
+		)
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+RESTRICT="!test? ( test )"
+
+src_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+	fi
+	if [[ ${PV} =~ 99999999$ ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(use_enable gpgme)"
+		"$(use_enable pgp-classic pgp)"
+		"$(use_enable smime-classic smime)"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--with-ui=$(usex slang slang ncurses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	econf CCACHE=none CC_FOR_BUILD="$(tc-getCC)" "${myconf[@]}"
+}
+
+src_test() {
+	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	pushd ${test_dir} || die "Could not cd into test_dir"
+	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
+		|| die "Failed to run the setup.sh script"
+	popd || die "Could not cd back"
+	NEOMUTT_TEST_DIR="${test_dir}" emake test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one - here neomuttrc.5 (neomutt.1
+	# already exists)
+	if use !doc; then
+		sed -n \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
+			Makefile > docs/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			docs/Makefile.autosetup >> docs/Makefile.fakedoc || die
+		emake -f docs/Makefile.fakedoc docs/neomutt.1
+		emake -f docs/Makefile.fakedoc docs/neomuttrc.5
+		doman docs/neomutt.1 docs/neomuttrc.5
+	fi
+
+	dodoc LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use gpgme && ( use pgp-classic || use smime-classic ); then
+		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
+		ewarn "  and smime-classic (old smime) from your USE-flags and"
+		ewarn "  only enable gpgme."
+	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}