gentoo auto-resync : 03:12:2024 - 02:07:18

11 files changed, 451 insertions, 8 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index cf46b90bd908..59b28f31183b 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 77f182ae33e6..eb24908915b9 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,7 +1,9 @@
 DIST aws-cli-1.36.12.gh.tar.gz 2842234 BLAKE2B b9f333d7fa8b7aa9c0452b6da87c3b097f1b5027f1f9c36888448f5e5763a93696e1d25cca167a17d9ab7332c5491be500a44462eed44c18f886ec9f0816a248 SHA512 b7797a29230628201d808958c4f9660768646f1c1a3f53c39c09791fb8ff0cbfab000b950abc87541ff9e54723b726913a487cf5f164c8b82e609fd92dae7b14
+DIST aws-cli-1.36.13.gh.tar.gz 2845931 BLAKE2B 53a4dc5bfa111ea32a89aa1e6f8795a2007419dd65b092abd5f9d0040d7f1750c570b480071e427ce1738a37d4ac8f5e56628d9f4462cdfbdfe90509bc1c83f7 SHA512 df2ce608b52efb2d8641e1ecea201507def53c11ef7dfd85e4a83423fdfbff75ff94f3e3c0ab1e9ebbce56442fface5b13d95e441519abb3b05af14f77145a2c
 DIST aws-cli-1.36.4.gh.tar.gz 2825870 BLAKE2B 3a13a50077087633972c0eb908e0116e432f0036871f4d5a5e2429ea86dfc0c5d40a87e0950c02bc7622fb0e56b9a3ee9fc8ee9a6a1ed8ae17728bf479401d13 SHA512 735a228d52b525cfc4a9a403ad8364bfb9c558ba86daf6966743126eb21de6d0f49d76fd21d9c7a0fd29f229b4b71e0778d4b1ccd0b2e27b0c794f1e11cd6c83
 DIST aws-cli-1.36.9.gh.tar.gz 2836018 BLAKE2B aada8a63f5bedd5aeeddd56fe18bb49ae1763ba5c737f72aa2f2e00b57fa4e1ab52ec266ca6883859ec633ec2b1658383426809870ba1372d86f9d8e0a055ac6 SHA512 ec47c26012027071732d60f9bd8b3322c1c75b2362dffe7affd8cd6d70732e6239bfbb6531759a247bcb2f29613a88b196d10f405302d25a05ada7968bd7574e
 EBUILD awscli-1.36.12.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
+EBUILD awscli-1.36.13.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
 EBUILD awscli-1.36.4.ebuild 3179 BLAKE2B b08625a4293f13915f076119919380f482a550799f0b4a8ba37f413fb23314bd5f8ee153658520d17560e91fc464ffdb0bc61f444dda692627baa6ddc80fd97b SHA512 2acdae36bf23c5c4c4bf23ca22ef04df62e76f08fc3ecc9acf6ba28bd4c6b9bd325f301123c9cb5694b62991cf41bfcff797ce4c72ae07e0d7c490df02adae4c
 EBUILD awscli-1.36.9.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.36.13.ebuild b/app-admin/awscli/awscli-1.36.13.ebuild
new file mode 100644
index 000000000000..2960403cf7e0
--- /dev/null
+++ b/app-admin/awscli/awscli-1.36.13.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y-1).(z+59)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=(
+		"${serial_tests[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest
index 559709b56f58..100ecd192779 100644
--- a/app-admin/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -1,3 +1,5 @@
+DIST Bitwarden-2024.11.2-amd64.deb 84510298 BLAKE2B 7decb80519111fd9d2d29c27aba59acd7bf6ca9733ee06a0e798364a9aad1f91e44e4ed30a021da5e527b562a6b908aa50f07568bae69450d938f89668716364 SHA512 ff5d77afaca6c2579bcd9f4f23be9da4de871cef4288a2fc85bae98517c86eda6040b6affee40256a25e1451bc48c098cf33a83bbcaba69cd7acf13fd1bef794
 DIST Bitwarden-2024.9.0-amd64.deb 83998696 BLAKE2B adce754866e47c82de6defe08bdb91135dca744e11b460d116c9b23d45cef1e95302ea04c5d1f9c77c7c52fb125490272bce0bbeae0ac3738f4fc6cd2529572e SHA512 e0ed593fe1501f40c1721f23e1673e5ea6bda265ffc65c526956a0c26ebc33d88d314bd9db8138a4052fd35c3827a355d36fbf4f171f9702d21f3bbab4ea9fa8
+EBUILD bitwarden-desktop-bin-2024.11.2.ebuild 1805 BLAKE2B e5e6c437437b4fd95b2e6989449215196eff6cc103cddfd6708273beb91bc6ba8be47b215ace74d5d369163b21ea2866fd1f0eb82ba5481b090d6e6d54727c72 SHA512 4ebdcf238d3bc035381dc8e6dd08c91c1a18224bd5609f05cdff0e379e25abe01b896ad90d2098a9b2eacdcc43514505e39ec0b9a709eff28ff0a2c216353e1c
 EBUILD bitwarden-desktop-bin-2024.9.0-r1.ebuild 1805 BLAKE2B e5e6c437437b4fd95b2e6989449215196eff6cc103cddfd6708273beb91bc6ba8be47b215ace74d5d369163b21ea2866fd1f0eb82ba5481b090d6e6d54727c72 SHA512 4ebdcf238d3bc035381dc8e6dd08c91c1a18224bd5609f05cdff0e379e25abe01b896ad90d2098a9b2eacdcc43514505e39ec0b9a709eff28ff0a2c216353e1c
 MISC metadata.xml 323 BLAKE2B 3f1affe8fb7b242a0ea072faaebcccd37bf005ee68c7519857701c37fe6a11b0dffe1692af141b54218367ee8c8361cb0e6608621453d424d52b061b569563d1 SHA512 95ab28dcb844ac6d2ba4573699e86a4c303aa46b4c2eddf1273ecf37a3bbb751b9a478b535fbdcbc12424bc4f826b4b0781cfb8079e5563ed41f12ce68b35908
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.11.2.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.11.2.ebuild
new file mode 100644
index 000000000000..ebc9617b1482
--- /dev/null
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.11.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop unpacker xdg-utils
+
+MY_PN="Bitwarden"
+
+DESCRIPTION="Bitwarden password manager desktop client"
+HOMEPAGE="https://bitwarden.com/"
+SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/wayland
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libxshmfence
+	x11-libs/libXtst
+	x11-libs/pango
+"
+IDEPEND="
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+"
+
+QA_PREBUILT="
+	opt/Bitwarden/*.so*
+	opt/Bitwarden/bitwarden
+	opt/Bitwarden/bitwarden-app
+	opt/Bitwarden/chrome-sandbox
+	opt/Bitwarden/chrome_crashpad_handler
+"
+
+src_install() {
+	insinto /opt
+	doins -r opt/${MY_PN}
+	fperms 755 /opt/Bitwarden/bitwarden \
+		/opt/Bitwarden/bitwarden-app
+	fperms 4755 /opt/Bitwarden/chrome-sandbox
+
+	domenu usr/share/applications/bitwarden.desktop
+
+	local x
+	for x in 16 32 64 128 256 512; do
+		doicon -s ${x} usr/share/icons/hicolor/${x}*/*
+	done
+
+	dosym -r "/opt/Bitwarden/bitwarden" "usr/bin/${PN}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 76a9b4d6c9ec..b4579cbc69da 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,5 +1,7 @@
 DIST conky-1.21.7.tar.gz 1961997 BLAKE2B 80ca17e0d1065655c410d8108668b3f09df574b761d57e374a2d51c946b51bd1ce4d29d320def0a197d465401cb4a665fb84a394406611903877c0acf42b4ad3 SHA512 52b6621e3e693654610ebd1b9e1adbeaec2ae2a2aaed4b038882a6825e6573f4afdea85f9156e1ffaa5999e30b3b05170b6b101f415980f0edab5c85151e9e6c
 DIST conky-1.21.8.tar.gz 1963431 BLAKE2B 86b93971cb442fc6c2c61b7f681b6ad11e5b3dbfdcb39231da1dc70501497b364a0e99007d961d4310a7f76b9568114d3fce41455d461077cf703b795a53f278 SHA512 72c5cadc89760445888029cc54320267ad0d2ada8d76a6ee85056a9822005232900df2e8c7c1667c970ab72316115f6b2c5d6af72a9b5810aa6a024fbb487001
+DIST conky-1.21.9.tar.gz 1966277 BLAKE2B 90735ab5e4a42f31ccc12c27fa7a5ca35c6c6cc93d97a06d33f37ee7f1300e7c4546ed34f348338661c8efe7a598b32564977ded2f28dc48a0133696031fee69 SHA512 649b7cb2ab482bae33010239ee96deb08a5f3b6954e55e6380f45d753a7690ac446f4471682e293b25f94c3c68e7d5373f5b63a42fec69392e34c4336c6f1b96
 EBUILD conky-1.21.7.ebuild 6191 BLAKE2B 73e7886b22f926d38e91a5df4963f6a516fd79cd01dcd7dc88b432e9b4301d00b49f3448200c14ee03420bffcee24b966cdf54fbcabd013917a44ad56174e9f6 SHA512 db3bca80c15821fc298092144e2898a2d048a18281d780df6c9f5c7d2a387af5db295da7cc406fdffd7acfde38ceb8d4a89191bd3ed7c6112c52981c1eff4fd7
 EBUILD conky-1.21.8.ebuild 6195 BLAKE2B 1699bcadd7599c8a344a3ad12b329abbfd099cb3e1a47616b3639ff3f44f0430c77055bc6b49b05b110f563af1e7a4cd7973c00f69a4125bc4d5df5cee7b3456 SHA512 770140c4808a1ec0031c4278340606dd03a1d7cd60cb84f6c152b177509d5e0a57b0fab1b69679303b9a9ea1c3210bac59086fdb4bbc275cdd32abaf327a0a7d
+EBUILD conky-1.21.9.ebuild 6195 BLAKE2B 1699bcadd7599c8a344a3ad12b329abbfd099cb3e1a47616b3639ff3f44f0430c77055bc6b49b05b110f563af1e7a4cd7973c00f69a4125bc4d5df5cee7b3456 SHA512 770140c4808a1ec0031c4278340606dd03a1d7cd60cb84f6c152b177509d5e0a57b0fab1b69679303b9a9ea1c3210bac59086fdb4bbc275cdd32abaf327a0a7d
 MISC metadata.xml 2706 BLAKE2B ccd856ef7d804a1d4cea72124dc575dc3b94b6cad0b98b4bff8248f70f84b1705d862a58b0c98d1a67ea17c412e7d967a32d31678e8b51d5234c215d54389a57 SHA512 65bd968350ff45ed491a2cc36bb7d5640e38f3a4b4a0e0e3fe22d4e74563c2bf2a3d9f3cd9f3c67a0e9f8b756c387f72fcf8581c6876941112470f7f04e47ddf
diff --git a/app-admin/conky/conky-1.21.9.ebuild b/app-admin/conky/conky-1.21.9.ebuild
new file mode 100644
index 000000000000..9598436ba46d
--- /dev/null
+++ b/app-admin/conky/conky-1.21.9.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+PYTHON_COMPAT=( python3_{10,11,12} )
+
+inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus colour-name-map curl doc extras hddtemp ical
+	iconv imlib intel-backlight iostats irc lua-cairo lua-cairo-xlib
+	lua-imlib lua-rsvg math moc mouse-events mpd mysql ncurses nvidia
+	+portmon pulseaudio rss systemd test thinkpad truetype wayland webserver
+	wifi X xinerama xinput xmms2"
+RESTRICT="!test? ( test )"
+
+# Note: toluapp is bundled in conky since 1.11.2
+# Note: maintainer mode "-DMAINTAINER_MODE=yes" sets CMAKE_BUILD_TYPE Debug
+#       which creates debug symbols and enables "-DBUILD_TESTS" which also
+#       results in conky_core debug library getting installed
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	ical? ( dev-libs/libical:= )
+	iconv? ( virtual/libiconv )
+	imlib? ( >=media-libs/imlib2-1.11.0[X] )
+	irc? ( net-libs/libircclient )
+	lua-cairo? ( x11-libs/cairo[X?] )
+	lua-cairo-xlib? ( x11-libs/cairo[X] )
+	lua-imlib? ( >=media-libs/imlib2-1.11.0[X] )
+	lua-rsvg? ( gnome-base/librsvg )
+	mysql? ( dev-db/mysql-connector-c )
+	ncurses? ( sys-libs/ncurses:= )
+	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	pulseaudio? ( media-libs/libpulse )
+	rss? (
+		dev-libs/libxml2
+		dev-libs/glib:2
+	)
+	systemd? ( sys-apps/systemd )
+	truetype? (
+		x11-libs/libXft
+		>=media-libs/freetype-2
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/pango
+	)
+	wifi? ( net-wireless/wireless-tools )
+	webserver? ( net-libs/libmicrohttpd:= )
+	X? (
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libX11
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xmms2? ( media-sound/xmms2 )
+	${LUA_DEPS}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	apcupsd? ( sys-power/apcupsd )
+	cmus? ( media-sound/cmus )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-cpp/catch
+	)
+	wayland? (
+		dev-libs/wayland-protocols
+	)
+"
+BDEPEND="
+	colour-name-map? (
+		dev-util/gperf
+	)
+	doc? (
+		virtual/pandoc
+		$(python_gen_any_dep '
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/jinja2[${PYTHON_USEDEP}]
+		')
+	)
+	extras? (
+		$(python_gen_any_dep '
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/jinja2[${PYTHON_USEDEP}]
+		')
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+python_check_deps() {
+	use doc || use extras || return 0
+	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/jinja2[${PYTHON_USEDEP}]"
+}
+
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	imlib? ( X )
+	lua-cairo? ( || ( X wayland ) bundled-toluapp )
+	lua-cairo-xlib? ( X  bundled-toluapp )
+	lua-imlib? ( X bundled-toluapp )
+	lua-rsvg? ( || ( X wayland ) bundled-toluapp )
+	mouse-events? ( X wayland )
+	nvidia? ( X )
+	rss? ( curl )
+	truetype? ( X )
+	xinerama? ( X )
+	xinput? ( X )
+"
+
+CONFIG_CHECK="~IPV6"
+
+DOCS=( README.md AUTHORS )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at /usr/share/doc/${PF}.
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking.
+
+There are pretty html docs available at https://conky.cc/.
+
+Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	lua-single_pkg_setup
+	if use doc || use extras; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# pin lua 5.4
+	sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \
+		cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
+
+	cmake_src_prepare
+	xdg_environment_reset
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	if use X; then
+		mycmakeargs+=(
+			-DOWN_WINDOW=yes
+			-DBUILD_XDAMAGE=yes
+			-DBUILD_XFIXES=yes
+			-DBUILD_ARGB=yes
+			-DBUILD_XDBE=yes
+			-DBUILD_XSHAPE=yes
+			-DBUILD_X11=yes
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_X11=no
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_AUDACIOUS=no
+		-DBUILD_BUILTIN_CONFIG=yes
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_COLOUR_NAME_MAP=$(usex colour-name-map)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_EXTRAS=$(usex extras)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_I18N=yes
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IMLIB2=$(usex imlib)
+		-DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_IPV6=yes
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+		-DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib)
+		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MOUSE_EVENTS=$(usex mouse-events)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_NVIDIA=$(usex nvidia)
+		-DBUILD_OLD_CONFIG=yes
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_WAYLAND=$(usex wayland)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_XFT=$(usex truetype)
+		-DBUILD_XINERAMA=$(usex xinerama)
+		-DBUILD_XINPUT=$(usex xinput)
+		-DBUILD_XMMS2=$(usex xmms2)
+		-DDOC_PATH=/usr/share/doc/${PF}
+		-DMAINTAINER_MODE=no
+		-DRELEASE=yes
+	)
+
+	if use doc || use extras; then
+		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use extras; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
+
+		insinto /usr/share/nano/
+		doins "${BUILD_DIR}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_pkg_postinst
+}
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index dae9f5addcec..c33da7a3b0f9 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,7 +1,7 @@
 AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
 DIST password-store-1.7.3.tar.xz 63416 BLAKE2B 5931608e0208dfe6965b79f586c153a4930d1c3d3b74433d026ee0bc5889fcc29334c637ca4fb68308d0169bad7c8235b6632e9f80eda1e24f0f5721353f88e3 SHA512 89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7
 DIST password-store-1.7.4.tar.xz 65272 BLAKE2B db1a34b5900802731deaf09d3ade1d3f00022fd21eb0b21140dca3d399c89183dc901e5bce15d7bb6041e62017e2b8b6df61c6ec3eadb1df6c0278dbc6c2bc11 SHA512 1fe108895b224451b54e545d399b6a97040e094049448509f92ae33164a5cf9044a91f52edfc705fcf333f6526df1a478deeebc4df109764d58100f9e3e22681
-EBUILD pass-1.7.3-r2.ebuild 2032 BLAKE2B 985058844f7411b50f63c54855ddd01e021c5edae6c3180419e20b628b88934f98599bb43dd5c967bcdaf40aa092eb3d4e8732de82c98d038cb13565fb63adc2 SHA512 bb467e9c138abaddf07cbba7faef54a6e17396e866ed001221854a83265a7db01972a9e244c74d8bbd17db6045f2e65922168451a971a67d9c4cfd6270205d02
-EBUILD pass-1.7.4-r2.ebuild 2096 BLAKE2B 933d2627e6baca8fc4ca92b4503aa861ebfafbc687fb32dd846866501a2d4409913d9be0c86ab37ca7ff2f8902af105b2821055a2ddebf0330999915bd6a2783 SHA512 f8a8af74e82060aaf51a469b829b25aa926b3bea189756e8549749981555a1a422094869e32bd294a3cf2f6d201dd258e3f63a9aae653f4a77fbfb861415bed4
-EBUILD pass-9999.ebuild 2190 BLAKE2B 92d8eb826d3daea48e146f947125df3fb3914eb852ee4448316646a32070c232a038486bf0cbed174fa414078bc76f49da3c97f36779a01b3dcb72bb9e53b34e SHA512 5e5296f6308dec46ef2f87a2f41a5667cb948536eb469d10e1ac4365a0351688abad90c7f09342ec4a28925e3c2d1820bef07915ea5af399094ece0961dea2c7
+EBUILD pass-1.7.3-r2.ebuild 2033 BLAKE2B 7709424c47e60a45c67d840029dd8587526dcf4a5573bec3d83c96dcd5af7f1559958c3330b1595c67415a449d91d2616fb03fcef0791172360673c60189b8e4 SHA512 bcb986dcc07bb98a9bf62be74162407e6c0db4d842f3b34f4e1524c1c02e19713a63e5be60745aa29fdfa1e98f570164536c272f2b086726ac4d3cd7284b5a21
+EBUILD pass-1.7.4-r2.ebuild 2097 BLAKE2B 16a2160a6e7b5d2b875afb830fd8e770b6376b1b3cc4ed688827516475f701d14fd8b08bc77f1f25b24cc6495d9e6edcc89985f90b62437dc71874de1b7afa6e SHA512 30bc924ce7e0724413df7d82a230cdf3a685fa808b51932912cd2ca12816d64c66ceea50e3510e385a3114617a121f4df18e58accdd0c962f3150f7c6c81485b
+EBUILD pass-9999.ebuild 2191 BLAKE2B f5be6086dc83bd7f46507dcd62d32bc7ba2b21b936728f3ab4b9da79dbc6c11dfee68e617aa30251d9540ce389ca632c94069483aa929b2c6341925f4abf9ad8 SHA512 70a3f7b45a8ddcfe22a6017fa4ddfa1ae481ec28abae918283d8ac41b67a6f0840241f45141217ee8e14cc80de3076ddd5e1bc53fb94b0b26ebad161ec81b12a
 MISC metadata.xml 682 BLAKE2B 7f15c097f132cde3ee8647189fda93dabbcc5e0451380a6fde8f58c1d0b7c10df4cb8012832f282101795568cf170157d119bb668164005f8aeebe10682a918b SHA512 12d14970489971fea7766469584bce2881ebdadfebd4aece7efff56a5e7bdc0a3d12703134691c80da2635a5863a81c39c212bcdc7ae1b717ae5f1e0065212f2
diff --git a/app-admin/pass/pass-1.7.3-r2.ebuild b/app-admin/pass/pass-1.7.3-r2.ebuild
index 1a8952ad9f5b..d4b827ebe313 100644
--- a/app-admin/pass/pass-1.7.3-r2.ebuild
+++ b/app-admin/pass/pass-1.7.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.passwordstore.org/"
 SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
 S="${WORKDIR}/password-store-${PV}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 IUSE="+git X emacs dmenu importers"
diff --git a/app-admin/pass/pass-1.7.4-r2.ebuild b/app-admin/pass/pass-1.7.4-r2.ebuild
index a70dea5f4464..ddac8d5bcc2d 100644
--- a/app-admin/pass/pass-1.7.4-r2.ebuild
+++ b/app-admin/pass/pass-1.7.4-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.passwordstore.org/"
 SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
 S="${WORKDIR}/password-store-${PV}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 IUSE="+git wayland X emacs dmenu importers"
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
index 0fd8dcb77e6b..ed545c7288ab 100644
--- a/app-admin/pass/pass-9999.ebuild
+++ b/app-admin/pass/pass-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ fi
 DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
 HOMEPAGE="https://www.passwordstore.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+git wayland X emacs dmenu importers"