gentoo auto-resync : 29:05:2024 - 00:07:15

3 files changed, 27 insertions, 16 deletions

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 56228ad40320..b8ca273cfecf 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,6 +1,7 @@
 DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4
 DIST conky-1.20.2.tar.gz 1837320 BLAKE2B 41aaa384366ee9229ec4e7df97f37a8c62fff4dd864b3f8f8d3d40c57e87646ee8309c3d1fb68c7d7f8ed802c7ce49a57bbe0c01d32eaacfe84fddbd65b81007 SHA512 b516db38af5c20b101520356cd4f50d147869e7ed2bc84287e8a464e32bb306655edbac074da278d4732ee87f02c52d99cb4c117556e0d08f5be911a2a789618
+DIST conky-1.21.1.tar.gz 2146994 BLAKE2B 7c19813dad6a7a701cfedfba6d424d61bd5c960dc836c6aa6668031c7e096e214559177f0a8186fda1a770a956c301274d24d45a21c9d2d8faf62ce2f76610fd SHA512 4b7f243943a7d04942ee86dc6d5cdd75c6999a4ff0616efb5b00c47ad100a5b83dd4ca618764fc1ce97f0fc77118dabc87fa691fb1181fb54ab1b38d862f5229
 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 2504 BLAKE2B 64776b9337c836b0a5463e7b0857a5f0bb81c742867ac34701cd49e9edeb08854c34e8dc50757de6df59ee7a5f85d8c80a158a6a8c8eec20a4e3d23f9f7d7a62 SHA512 499f432fd332b882f27da281f72b7e0f3fb166ba9a4b20f300e5f81769df95607fb018333bdd698a4fc96b17bc8cde501267c4abdcec45d50f40de513e72c0f1
+EBUILD conky-1.21.1.ebuild 6102 BLAKE2B 0b2d9da9ad05bb549be53427fdc68349040bcf3448ff33533991bc877b4bbd93d203f8bde9000a8ec3ea208a470a89d336086ef503996edb5a9d7402d48c0b37 SHA512 211177777e8479b128266886a6102e48429125dfccbfe2c04843bd721ba0c6778280ef4869512eb7dbee49cf698d21a86f8466bd87e763992f5d25ea73175eb1
+MISC metadata.xml 2574 BLAKE2B b3f3a78856ddd22337984d1b5800ba6c5e162897a5aadd919d7ca05e32d6b80cf89fb1a5e51544636167a37d4f06889cb7b867228f66b199bee83dd127416004 SHA512 90a9e83972438b43853794b23abbec4879465b8663ef2e39ec44c4df0a6605564c7ebe895bca221ca4b4dbbea3f7566166dafcb9131c3d424d142958195efb68
diff --git a/app-admin/conky/conky-1.20.2.ebuild b/app-admin/conky/conky-1.21.1.ebuild
index 1db4f0fdeff5..d76b4731f0d6 100644
--- a/app-admin/conky/conky-1.20.2.ebuild
+++ b/app-admin/conky/conky-1.21.1.ebuild
@@ -15,10 +15,11 @@ 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"
+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 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
@@ -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,10 +112,12 @@ 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 )
 	nvidia? ( X )
+	rss? ( curl )
 	truetype? ( X )
 	xinerama? ( X )
 "
@@ -149,15 +156,15 @@ 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,6 +194,7 @@ 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)
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 9f9d203f58f1..0a8b212cb2c9 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag>
 		<flag name="bundled-toluapp">Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags</flag>
 		<flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag>
+		<flag name="colour-name-map">Include mappings of colour name</flag>
 		<flag name="extras">Enable syntax highlighting for <pkg>app-editors/nano</pkg>and app-editors/vim</flag>
 		<flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag>
 		<flag name="intel-backlight">Enable support for Intel backlight</flag>