gentoo auto-resync : 05:05:2024 - 00:00:45

3 files changed, 247 insertions, 1 deletions

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index c31f6732e93e..56228ad40320 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,5 +1,6 @@
 DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4
 DIST conky-1.20.2.tar.gz 1837320 BLAKE2B 41aaa384366ee9229ec4e7df97f37a8c62fff4dd864b3f8f8d3d40c57e87646ee8309c3d1fb68c7d7f8ed802c7ce49a57bbe0c01d32eaacfe84fddbd65b81007 SHA512 b516db38af5c20b101520356cd4f50d147869e7ed2bc84287e8a464e32bb306655edbac074da278d4732ee87f02c52d99cb4c117556e0d08f5be911a2a789618
 EBUILD conky-1.19.8.ebuild 5805 BLAKE2B c56ad10b94d3fee046a955a7a25d7d1ed71d089c2a935af6260d3c64e3181a8db74b5fbb0a27983a542896816a1150a33bb74797c3a87842efc829b26603ff1f SHA512 8f8cafd306f8ac7deb5d63c924f7eddcb2a76582ece7a7d83355422ecbaf09e57cc214241445fe79d84b4da96f04d9344f05cce192f451a9bb732e64c5575efa
+EBUILD conky-1.20.2-r1.ebuild 5995 BLAKE2B b82b95e5ec969b9ad844d3470b4bd8763e78c03c01d93ccc301a967897ec1cfa21732fa85b59f6803d5f948881c7260da192ac529688930a63c33f7515bf9fdc SHA512 c89bd339bbd166a04a29f16384a41fe0528cad7b27e82dde3250bcbb441061877ce98168ba22f7cc5c4cb1678bbe5a2f219ab6cccc9fd60b428aaaebf204edc7
 EBUILD conky-1.20.2.ebuild 5809 BLAKE2B 616f9cf91272e3a704f3ee9474cb148a2b3b1226ae1e837d16071112b199afe4fe3746c01310b18472be861c2e0c24f4db23d5de2d0b9c7d70fd46ac4bda9674 SHA512 a1b6b42f304a7787d0ae5c11134a792f3a7deb62efa222ba5c020d1e36172cc25b84579e19e4bc462d7c4ab13344f164b5c9bfe67036968329d699dfac7959ca
-MISC metadata.xml 2408 BLAKE2B 744eae0e271850f1e2e43b7905c6c916bc8ae2d3853489056c84d8b99e72a599895910095a7e838281deffa0316d21a490715ec0b9ef092f6b4987c7d796ce21 SHA512 286613fba3bfbbaed9db8033d71bce06ee6a9884472042a8a8b2fc30ebcb07277c98c368e7971e68c40d7c3c4f7eb86fc3ee1e3dc41bfb97e3fbe7bd6093a297
+MISC metadata.xml 2504 BLAKE2B 64776b9337c836b0a5463e7b0857a5f0bb81c742867ac34701cd49e9edeb08854c34e8dc50757de6df59ee7a5f85d8c80a158a6a8c8eec20a4e3d23f9f7d7a62 SHA512 499f432fd332b882f27da281f72b7e0f3fb166ba9a4b20f300e5f81769df95607fb018333bdd698a4fc96b17bc8cde501267c4abdcec45d50f40de513e72c0f1
diff --git a/app-admin/conky/conky-1.20.2-r1.ebuild b/app-admin/conky/conky-1.20.2-r1.ebuild
new file mode 100644
index 000000000000..f134905d992c
--- /dev/null
+++ b/app-admin/conky/conky-1.20.2-r1.ebuild
@@ -0,0 +1,244 @@
+# 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 curl doc extras hddtemp ical iconv imlib
+	intel-backlight iostats irc lua-cairo lua-cairo-xlib lua-imlib lua-rsvg
+	math moc mpd mysql ncurses nvidia +portmon pulseaudio rss systemd test
+	thinkpad truetype wayland webserver wifi X xinerama 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="
+	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 )
+	nvidia? ( X )
+	rss? ( curl )
+	truetype? ( X )
+	xinerama? ( 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_XINPUT=yes
+			-DBUILD_MOUSE_EVENTS=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_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_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_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 7a0ba1bcf7e0..9f9d203f58f1 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -24,6 +24,7 @@
 		<flag name="iostats">Enable support for per-task I/O statistics</flag>
 		<flag name="irc">Enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag>
 		<flag name="lua-cairo">Enable if you want Lua Cairo bindings</flag>
+		<flag name="lua-cairo-xlib">Enable support for Cairo and Xlib interoperability for Lua</flag>
 		<flag name="lua-imlib">Enable if you want Lua Imlib2 bindings</flag>
 		<flag name="lua-rsvg">Enable if you want Lua RSVG bindings</flag>
 		<flag name="math">Enable support for glibc's libm math library</flag>