gentoo auto-resync : 14:10:2023 - 11:10:46

4 files changed, 15 insertions, 227 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2fb6dc51fd94..7358aa78e7bc 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index f4d6d89e1fb2..e7d8a07858e6 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,9 +1,7 @@
-DIST conky-1.17.0.tar.gz 1699311 BLAKE2B 9aead9e1e9bf4bf61c1b3e09c6e319135ccce19c43740c1bb3c6142c936c2a045820078f4684ea037fc26a8b02343e11b5372f74258fdf2c5386459410498cc9 SHA512 4da55ba3835e8ff42747f2bc01c34a94b2819e08eb74ddb913fd34bf4b682d75331119745ee006d842d3d2142fc53eeada16afdf698a60f37b566f55896aa2db
 DIST conky-1.19.2.tar.gz 1715080 BLAKE2B 1e7ee050ab6525a1cc0dd513e25ea2e98a21fa6a70a3f3feb95cda9dc4b3bfa4625889c91093f7643746325f897e7165b199da38308699c9dadeb87cdebfc896 SHA512 a9b565ab2e6b92efe8a10db69e88fb720ba00f09e63b21a5741f95c8a05c78dd58aa23fdbf34f8f0c9137e04ce76b1fe197594ebc1b2ad99d7fd9bf8e6127ad3
-DIST conky-1.19.3.tar.gz 1722486 BLAKE2B 46f9d2750f30b4afec1e7cdb9590a1e0cdad8dfe1552be43473857ecd7bca028f087e8987e44b0ea916061b7c2cd2f4b7e9be90e789104e6d4bfb66e8d7aca46 SHA512 6677d423836deac52502f2e9c31cf70d8c16f5c8b867b54db1965b1a790122ed05ee45e9e590dc82fe9607ee8a478e0d4711112ad2def9e27d084842ac80ac55
 DIST conky-1.19.4.tar.gz 1724291 BLAKE2B 478c9f1c3c9ced8d1f9384a5d1d9b918245049ee9282304828c5c5e4ccbb96cd0404d6095f5d03b6d8efd06b7f6b2f34f070734877c1496efff7cd49cb06faee SHA512 3856a059d2c21da3df9cad42a4bd36cccc5ba87b2b581985c1b7d9b04b3465e99f230b5b973ab4f5b986058abf02afcc9779e1ab05696791c7952372c2e29615
-EBUILD conky-1.17.0-r1.ebuild 5305 BLAKE2B 3be64246dc3d608306fb826df96995e781e33bf5788c3ba4489fbca341232bb739167a9054cb0f6632eb0d6297f28f9ddc4a4200d144caa2aca22cf37159eb7e SHA512 ad743614c1e277985f2d31ec2c73f2470ffb5b32b0de8c4767c4aab54c0e3dd80ddac64a9df1dbfc681e79f05d8505e48531dcfaaee99821a31e5dfc362caaa0
+DIST conky-1.19.6.tar.gz 1727487 BLAKE2B 2ef2b0acd354559679b9d7d442de7a709e932418e27459b02bdf2f8b6dbdcf7911964932ab9851bab213e7f68d9a82034acab96892752544ab1a26d68c174c09 SHA512 9f1900f495125c668835334239b69fc098c30fe450a384786d873eb3d3e955ff0f06ca70c3a94f47a4b38a42d4510be77efd13873411f11ff84d8bfdc2869fde
 EBUILD conky-1.19.2-r1.ebuild 5444 BLAKE2B 742797b5ce98325914c24294911ada0b9f96adf17a24fb86c0af6894aacd0eb110572f64178cb2c584cb3c2c8f8fe92287a8f22c37423c4614bd35b7a3e781fd SHA512 2e2fcde3e935aad1cf27b0c085d9a078cc02bced6cec5af0674526ab44ae2af7db710961f749ca9ba663d2ecc67b1d086ba1db9ed7dc98b42015e5defa8aa8be
-EBUILD conky-1.19.3.ebuild 5448 BLAKE2B e823cc8c1e50c12038b1f4dd08d3e98cf1bac7c0113f9e41ed572d1558eb706828a820067d22439177d5e5eba59fd45592926b88f8076e9ba9f36ba290bd3136 SHA512 0654cdfc34052e08c4142865af6e95a4279a8a7fc84a1887f8b97711066e15556a962c5b2ac6a2cc7f929c47afc4db0bb675f8655becdb272e2cd507159491b1
 EBUILD conky-1.19.4.ebuild 5467 BLAKE2B 78c1ad9da78914b44ae11b5e3be4504eba942f60235ad0ea8ddb4d3eb5e3dc3604e69a93682d3661f2f712d40c179b69c296685a0be9d957e926329c13eace3d SHA512 0354b92185c4558b42b0b878cedbc1a7d65f2980166483823c18f6ffe73dfcede80cc5e5d35460b8606f5d617167c7f36be85dfbc8bfd23813249fbc334060f5
+EBUILD conky-1.19.6.ebuild 5467 BLAKE2B 78c1ad9da78914b44ae11b5e3be4504eba942f60235ad0ea8ddb4d3eb5e3dc3604e69a93682d3661f2f712d40c179b69c296685a0be9d957e926329c13eace3d SHA512 0354b92185c4558b42b0b878cedbc1a7d65f2980166483823c18f6ffe73dfcede80cc5e5d35460b8606f5d617167c7f36be85dfbc8bfd23813249fbc334060f5
 MISC metadata.xml 2406 BLAKE2B d535320fc855c3ee9e321a7181153f0928b43820fdb72a4e3c4e68239070e4ec8a1a5ced292e559d5f19337622a369647f4bf21a2fc3c0c3c573cb24110cb36e SHA512 36e5a0fc2c570577b64e1ccdd7378d9f0ffac100ce6d322d4d9f09b0e1e287dd97347ef82db8507c5b8e8c615b02917fe45113a7091ef1a2faec2456304a9326
diff --git a/app-admin/conky/conky-1.17.0-r1.ebuild b/app-admin/conky/conky-1.17.0-r1.ebuild
deleted file mode 100644
index 034f8d77c987..000000000000
--- a/app-admin/conky/conky-1.17.0-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-3 )
-PYTHON_COMPAT=( python{3_9,3_10,3_11} )
-
-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-imlib lua-rsvg math moc mpd
-	mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
-	wayland webserver wifi X xinerama xmms2"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	ical? ( dev-libs/libical:= )
-	iconv? ( virtual/libiconv )
-	imlib? ( media-libs/imlib2[X] )
-	irc? ( net-libs/libircclient )
-	lua-cairo? ( x11-libs/cairo[X] )
-	lua-imlib? ( media-libs/imlib2[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 net-misc/curl 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/libX11
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-		x11-libs/libXext
-	)
-	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 )
-	extras? (
-		app-editors/nano
-		|| ( app-editors/vim app-editors/gvim )
-		)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	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="
-	imlib? ( X )
-	lua-cairo? ( X  bundled-toluapp )
-	lua-imlib? ( X  bundled-toluapp )
-	lua-rsvg? ( X  bundled-toluapp )
-	nvidia? ( X )
-	truetype? ( X )
-	xinerama? ( X )
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md AUTHORS )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/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() {
-	cmake_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	if use X; then
-		mycmakeargs+=(
-			-DBUILD_ARGB=yes
-			-DBUILD_X11=yes
-			-DBUILD_XDAMAGE=yes
-			-DBUILD_XDBE=yes
-			-DBUILD_XSHAPE=yes
-			-DBUILD_MOUSE_EVENTS=yes
-			-DOWN_WINDOW=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_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_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/conky-1.19.3.ebuild b/app-admin/conky/conky-1.19.6.ebuild
index b5c218c1bec0..41a5bd379f95 100644
--- a/app-admin/conky/conky-1.19.3.ebuild
+++ b/app-admin/conky/conky-1.19.6.ebuild
@@ -33,9 +33,16 @@ COMMON_DEPEND="
 	ncurses? ( sys-libs/ncurses:= )
 	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	pulseaudio? ( media-libs/libpulse )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+	rss? (
+		dev-libs/libxml2
+		net-misc/curl
+		dev-libs/glib:2
+	)
 	systemd? ( sys-apps/systemd )
-	truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+	truetype? (
+		x11-libs/libXft
+		>=media-libs/freetype-2
+	)
 	wayland? (
 		dev-libs/wayland
 		x11-libs/pango
@@ -60,8 +67,11 @@ RDEPEND="
 	moc? ( media-sound/moc )
 	extras? (
 		app-editors/nano
-		|| ( app-editors/vim app-editors/gvim )
+		|| (
+			app-editors/vim
+			app-editors/gvim
 		)
+	)
 "
 DEPEND="
 	${COMMON_DEPEND}