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

2 files changed, 30 insertions, 19 deletions

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index de91a76689d0..76a9b4d6c9ec 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,5 +1,5 @@
-DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4
 DIST conky-1.21.7.tar.gz 1961997 BLAKE2B 80ca17e0d1065655c410d8108668b3f09df574b761d57e374a2d51c946b51bd1ce4d29d320def0a197d465401cb4a665fb84a394406611903877c0acf42b4ad3 SHA512 52b6621e3e693654610ebd1b9e1adbeaec2ae2a2aaed4b038882a6825e6573f4afdea85f9156e1ffaa5999e30b3b05170b6b101f415980f0edab5c85151e9e6c
-EBUILD conky-1.19.8.ebuild 5808 BLAKE2B cac5958fc1695a88d5673764a0206495ab5afc2dd6e1b6dfc3bf04cdf23ec894989408695df68b1c36434ea9badf84fae911d105b44335ce2b050b2983afe12b SHA512 d5fac8834e630d0281374e7d47bbaa1b787c30ebfb55f52208187db788e70e3e4e786c59275ece8a816928df44a944e55d91e07debe289f0788c537c3afe0bb5
+DIST conky-1.21.8.tar.gz 1963431 BLAKE2B 86b93971cb442fc6c2c61b7f681b6ad11e5b3dbfdcb39231da1dc70501497b364a0e99007d961d4310a7f76b9568114d3fce41455d461077cf703b795a53f278 SHA512 72c5cadc89760445888029cc54320267ad0d2ada8d76a6ee85056a9822005232900df2e8c7c1667c970ab72316115f6b2c5d6af72a9b5810aa6a024fbb487001
 EBUILD conky-1.21.7.ebuild 6191 BLAKE2B 73e7886b22f926d38e91a5df4963f6a516fd79cd01dcd7dc88b432e9b4301d00b49f3448200c14ee03420bffcee24b966cdf54fbcabd013917a44ad56174e9f6 SHA512 db3bca80c15821fc298092144e2898a2d048a18281d780df6c9f5c7d2a387af5db295da7cc406fdffd7acfde38ceb8d4a89191bd3ed7c6112c52981c1eff4fd7
+EBUILD conky-1.21.8.ebuild 6195 BLAKE2B 1699bcadd7599c8a344a3ad12b329abbfd099cb3e1a47616b3639ff3f44f0430c77055bc6b49b05b110f563af1e7a4cd7973c00f69a4125bc4d5df5cee7b3456 SHA512 770140c4808a1ec0031c4278340606dd03a1d7cd60cb84f6c152b177509d5e0a57b0fab1b69679303b9a9ea1c3210bac59086fdb4bbc275cdd32abaf327a0a7d
 MISC metadata.xml 2706 BLAKE2B ccd856ef7d804a1d4cea72124dc575dc3b94b6cad0b98b4bff8248f70f84b1705d862a58b0c98d1a67ea17c412e7d967a32d31678e8b51d5234c215d54389a57 SHA512 65bd968350ff45ed491a2cc36bb7d5640e38f3a4b4a0e0e3fe22d4e74563c2bf2a3d9f3cd9f3c67a0e9f8b756c387f72fcf8581c6876941112470f7f04e47ddf
diff --git a/app-admin/conky/conky-1.19.8.ebuild b/app-admin/conky/conky-1.21.8.ebuild
index 44c127c1b800..9598436ba46d 100644
--- a/app-admin/conky/conky-1.19.8.ebuild
+++ b/app-admin/conky/conky-1.21.8.ebuild
@@ -14,11 +14,12 @@ 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"
-IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
-	intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
-	mysql ncurses nvidia +portmon pulseaudio rss systemd test thinkpad
-	truetype wayland webserver wifi X xinerama xmms2"
+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
@@ -32,7 +33,8 @@ COMMON_DEPEND="
 	iconv? ( virtual/libiconv )
 	imlib? ( >=media-libs/imlib2-1.11.0[X] )
 	irc? ( net-libs/libircclient )
-	lua-cairo? ( x11-libs/cairo[X] )
+	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 )
@@ -41,7 +43,6 @@ COMMON_DEPEND="
 	pulseaudio? ( media-libs/libpulse )
 	rss? (
 		dev-libs/libxml2
-		net-misc/curl
 		dev-libs/glib:2
 	)
 	systemd? ( sys-apps/systemd )
@@ -56,10 +57,11 @@ COMMON_DEPEND="
 	wifi? ( net-wireless/wireless-tools )
 	webserver? ( net-libs/libmicrohttpd:= )
 	X? (
-		x11-libs/libX11
 		x11-libs/libXdamage
 		x11-libs/libXfixes
 		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libX11
 	)
 	xinerama? ( x11-libs/libXinerama )
 	xmms2? ( media-sound/xmms2 )
@@ -82,6 +84,9 @@ DEPEND="
 	)
 "
 BDEPEND="
+	colour-name-map? (
+		dev-util/gperf
+	)
 	doc? (
 		virtual/pandoc
 		$(python_gen_any_dep '
@@ -107,12 +112,16 @@ python_check_deps() {
 REQUIRED_USE="
 	${LUA_REQUIRED_USE}
 	imlib? ( X )
-	lua-cairo? ( X  bundled-toluapp )
-	lua-imlib? ( X  bundled-toluapp )
-	lua-rsvg? ( X  bundled-toluapp )
+	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"
@@ -149,15 +158,13 @@ src_configure() {
 
 	if use X; then
 		mycmakeargs+=(
-			-DBUILD_ARGB=yes
-			-DBUILD_X11=yes
+			-DOWN_WINDOW=yes
 			-DBUILD_XDAMAGE=yes
-			-DBUILD_XDBE=yes
 			-DBUILD_XFIXES=yes
+			-DBUILD_ARGB=yes
+			-DBUILD_XDBE=yes
 			-DBUILD_XSHAPE=yes
-			-DBUILD_XINPUT=yes
-			-DBUILD_MOUSE_EVENTS=yes
-			-DOWN_WINDOW=yes
+			-DBUILD_X11=yes
 		)
 	else
 		mycmakeargs+=(
@@ -170,6 +177,7 @@ src_configure() {
 		-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)
@@ -186,10 +194,12 @@ src_configure() {
 		-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)
@@ -203,6 +213,7 @@ src_configure() {
 		-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