gentoo auto-resync : 09:02:2025 - 00:12:00

3 files changed, 2 insertions, 255 deletions

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 258165564ed1..586c45527a4d 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,7 +1,5 @@
 DIST conky-1.21.7.tar.gz 1961997 BLAKE2B 80ca17e0d1065655c410d8108668b3f09df574b761d57e374a2d51c946b51bd1ce4d29d320def0a197d465401cb4a665fb84a394406611903877c0acf42b4ad3 SHA512 52b6621e3e693654610ebd1b9e1adbeaec2ae2a2aaed4b038882a6825e6573f4afdea85f9156e1ffaa5999e30b3b05170b6b101f415980f0edab5c85151e9e6c
-DIST conky-1.21.9.tar.gz 1966277 BLAKE2B 90735ab5e4a42f31ccc12c27fa7a5ca35c6c6cc93d97a06d33f37ee7f1300e7c4546ed34f348338661c8efe7a598b32564977ded2f28dc48a0133696031fee69 SHA512 649b7cb2ab482bae33010239ee96deb08a5f3b6954e55e6380f45d753a7690ac446f4471682e293b25f94c3c68e7d5373f5b63a42fec69392e34c4336c6f1b96
 DIST conky-1.22.0.tar.gz 2030830 BLAKE2B b262b76fac24d74db0fe099e6e1c54be463d9453c5e9bcb9de33beeccda9e7b063287c189018f673bf0fc1d46029de9ac4f6c333c579b3f7fc86e2a7866e761e SHA512 df110bbec225127b6b9e2cb8998a21d99beb00225c7df6a6d35d6758135c8882d3e06c796f5c94eec7653da73af32f7a87ae631755b0e715306799f89de63cdd
 EBUILD conky-1.21.7.ebuild 6191 BLAKE2B 73e7886b22f926d38e91a5df4963f6a516fd79cd01dcd7dc88b432e9b4301d00b49f3448200c14ee03420bffcee24b966cdf54fbcabd013917a44ad56174e9f6 SHA512 db3bca80c15821fc298092144e2898a2d048a18281d780df6c9f5c7d2a387af5db295da7cc406fdffd7acfde38ceb8d4a89191bd3ed7c6112c52981c1eff4fd7
-EBUILD conky-1.21.9.ebuild 6195 BLAKE2B 1699bcadd7599c8a344a3ad12b329abbfd099cb3e1a47616b3639ff3f44f0430c77055bc6b49b05b110f563af1e7a4cd7973c00f69a4125bc4d5df5cee7b3456 SHA512 770140c4808a1ec0031c4278340606dd03a1d7cd60cb84f6c152b177509d5e0a57b0fab1b69679303b9a9ea1c3210bac59086fdb4bbc275cdd32abaf327a0a7d
-EBUILD conky-1.22.0.ebuild 6193 BLAKE2B 121e23a4eb7ba66f96f23526a965c9cb7f8b6c7734aa6c0b742903e1c8be2661e7bc2d7149c32e5e9841a2ff0a556a7d15f4134232a98bd34e918f13d12c635f SHA512 854c19d40d17d9fc4949cb448ffc7e321a0e751e0e0e660dee7533cd2c7e20fde39e5f95df217dc35161d667043f8e68adcf2e6ce8695f5f4e24b573ffbc15e4
+EBUILD conky-1.22.0.ebuild 6190 BLAKE2B 406bb475ed1a912d5bad442e21b8b6b00a8ddd4aed931d00227201e281fa700bcf3b40a735bacd3de047b6848761ea6ff67a94df16e85ca5268d2cf3cc1854f7 SHA512 dfcb5a294ed706d892cfb96de56920bbbf0ed30df968777f11423728f7742ce327c938e347cc92f53564fc8810e545c5fae53433c178d72349c7a1059ad9e5f6
 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
deleted file mode 100644
index 9598436ba46d..000000000000
--- a/app-admin/conky/conky-1.21.9.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# 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/conky/conky-1.22.0.ebuild b/app-admin/conky/conky-1.22.0.ebuild
index 3d106fec1f7d..8b0c49ed4571 100644
--- a/app-admin/conky/conky-1.22.0.ebuild
+++ b/app-admin/conky/conky-1.22.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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