gentoo auto-resync : 28:06:2024 - 07:59:59

3 files changed, 256 insertions, 1 deletions

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 5739c9c8c713..6e47e493def1 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,5 +1,7 @@
 DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4
 DIST conky-1.21.2.tar.gz 2147033 BLAKE2B c0ef67d7eca8b60a67c9c35bc689570f0f1271ed52470c3bc4049ab4e8aab3050b241e2cd21fedbfe30464c99533b404125bdcdf7ed8aa2302ef735a40f8d55a SHA512 4a2867b9e13d91ccda576be3bcfd38aab17ea82e99a05471aa68dbbed2020fcc92ab7038c944e36adc5ad1451121cfc293502d4a9e4272dbb700d73b280aae37
+DIST conky-1.21.3.tar.gz 2147056 BLAKE2B 0cc2e783f5e4cc0be688abaa96c4a68fa5d7be4a776866ad59d29d8338262fa11d929f9c3e3167b15c09c837cf4bafb16d201c8b13fff9b5e1a960a4bd33b420 SHA512 14ca23a15eaa2670b9c37939950077868e206aa301a24d88b765a11944ff149fc55695fe040782a73510d1b8eee964c51cec2614b9a51873379770545cd47570
 EBUILD conky-1.19.8.ebuild 5805 BLAKE2B c56ad10b94d3fee046a955a7a25d7d1ed71d089c2a935af6260d3c64e3181a8db74b5fbb0a27983a542896816a1150a33bb74797c3a87842efc829b26603ff1f SHA512 8f8cafd306f8ac7deb5d63c924f7eddcb2a76582ece7a7d83355422ecbaf09e57cc214241445fe79d84b4da96f04d9344f05cce192f451a9bb732e64c5575efa
 EBUILD conky-1.21.2.ebuild 6102 BLAKE2B 0b2d9da9ad05bb549be53427fdc68349040bcf3448ff33533991bc877b4bbd93d203f8bde9000a8ec3ea208a470a89d336086ef503996edb5a9d7402d48c0b37 SHA512 211177777e8479b128266886a6102e48429125dfccbfe2c04843bd721ba0c6778280ef4869512eb7dbee49cf698d21a86f8466bd87e763992f5d25ea73175eb1
-MISC metadata.xml 2574 BLAKE2B b3f3a78856ddd22337984d1b5800ba6c5e162897a5aadd919d7ca05e32d6b80cf89fb1a5e51544636167a37d4f06889cb7b867228f66b199bee83dd127416004 SHA512 90a9e83972438b43853794b23abbec4879465b8663ef2e39ec44c4df0a6605564c7ebe895bca221ca4b4dbbea3f7566166dafcb9131c3d424d142958195efb68
+EBUILD conky-1.21.3.ebuild 6192 BLAKE2B dceecd20db1019b7370af252394afb5e4fb51ef46628ae89f1b32090afd81a2673bd231337d08ba3729b17f96b782830d8c13cb516fcf4930249a998bc783ad5 SHA512 5a58c9c572cd997fc3a4986097f104bb74349ab20013c6e6fa08f4f6917af5ecaf0a4896d55183bbc93653a99d705e6c4ac6c5514009728bb0dc625ac5e13614
+MISC metadata.xml 2706 BLAKE2B ccd856ef7d804a1d4cea72124dc575dc3b94b6cad0b98b4bff8248f70f84b1705d862a58b0c98d1a67ea17c412e7d967a32d31678e8b51d5234c215d54389a57 SHA512 65bd968350ff45ed491a2cc36bb7d5640e38f3a4b4a0e0e3fe22d4e74563c2bf2a3d9f3cd9f3c67a0e9f8b756c387f72fcf8581c6876941112470f7f04e47ddf
diff --git a/app-admin/conky/conky-1.21.3.ebuild b/app-admin/conky/conky-1.21.3.ebuild
new file mode 100644
index 000000000000..93048f66b5fd
--- /dev/null
+++ b/app-admin/conky/conky-1.21.3.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/jinja[${PYTHON_USEDEP}]
+		')
+	)
+	extras? (
+		$(python_gen_any_dep '
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/jinja[${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/jinja[${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/conky/metadata.xml b/app-admin/conky/metadata.xml
index 0a8b212cb2c9..c9e45a10223f 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -30,11 +30,13 @@
 		<flag name="lua-rsvg">Enable if you want Lua RSVG bindings</flag>
 		<flag name="math">Enable support for glibc's libm math library</flag>
 		<flag name="moc">Enable monitoring of music played by <pkg>media-sound/moc</pkg></flag>
+		<flag name="mouse-events">Enable support for mouse events"</flag>
 		<flag name="mpd">Enable monitoring of music controlled by <pkg>media-sound/mpd</pkg></flag>
 		<flag name="nvidia">Enable reading of nvidia card temperature sensors via <pkg>x11-drivers/nvidia-drivers</pkg></flag>
 		<flag name="portmon">Enable support for tcp (ip4) port monitoring</flag>
 		<flag name="thinkpad">Enable support for IBM/Lenovo notebooks</flag>
 		<flag name="webserver">Enable support to act as a webserver serving conkys output using <pkg>net-libs/libmicrohttpd</pkg></flag>
 		<flag name="xmms2">Enable monitoring of music played by <pkg>media-sound/xmms2</pkg></flag>
+		<flag name="xinput">Enable support for Xinput 2 (slow)</flag>
 	</use>
 </pkgmetadata>