gentoo auto-resync : 21:11:2022 - 19:04:59

4 files changed, 32 insertions, 200 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4642abcc88e4..29589848fa5f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 13cbbefdcc5b..ffcf0796b8b4 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,7 +1,5 @@
-DIST conky-1.12.2.tar.gz 2407428 BLAKE2B b8d1b40dc4b547679b5ab4bf0328aabaac868025433729f48baf572c536da4a527a073a6d47f36c179851aecef58535dccb956e3a695700f06bf8e6ab170ae1f SHA512 55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a
 DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe48275364c4d0c973da6467ea044303d75f94cc0b963c3b423a7ec61d8eff26da30c102c557ccd5a4e8cf984db4f6 SHA512 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516
 DIST conky-1.15.0.tar.gz 1800684 BLAKE2B e3b8c682e99be42cd28ed9507c346f16afefb525269c31bf9731169fa2c52bcaac4f523ecd0ec8c722fb4e269226254f8579876e68a2b27c3a3f5685dd50b423 SHA512 d317b0a141355ce56c9dce5ba6e4b9dbe73b05b9b0b85d93d491f6d6da4194c1aceefbbc7e1b10e5fc233a9732933949e273630845194f6c16dce34a77ee5841
-EBUILD conky-1.12.2.ebuild 4790 BLAKE2B 233fd89ef019a015d1ebad697126bd2417410241cc377a81d5bdebd85cbe1ee664ca61db8b5a83d39a8dea05c63b8dbbf7b4bf7fed3ac0b76c7ae349d477b625 SHA512 36f90f9eae1c783a02dfca917ffcdc48694f8ec9175832c95b6867bbc94def480be40abeca1d172a2a7f4cb944ec827c3dd1766b5ae8310a2aa4ef700283a4e5
 EBUILD conky-1.13.1.ebuild 4790 BLAKE2B cb92375c4fd37347be0630fcfff04f3ace5139f48f28667ecaee71b7e9537a436a704586b201b6e0a9304701acd80c07c79bc5a60c2435f3e3b15dcf0dfb524e SHA512 dac5a9b5618532e8def0d09f0dafb4690588c9c8d9b18ed773a71cf6ebcbf904b88fc8fdd65f36b4ebf002e7e913ced21f6fcbb8c2599bca669c7fff2f18a4dc
-EBUILD conky-1.15.0.ebuild 4551 BLAKE2B 9be98d2a3b5498cceb2f8c9c2dafe86decc37f7a831bbd5b29cfd99ef58c69edf266407f15fae4f5a80958c04a04aa98362b9c927c24179012d03f803ecf7a31 SHA512 9cfbb6353e2c1dd362c124f0976fadb47bf726b9f29dd8466df2f4d5f13f1982c440e88235133a64e75a73f25d4e63bf9b6469f14e920dfe739acf79ef685190
+EBUILD conky-1.15.0.ebuild 5098 BLAKE2B 1e2cd75f456ae14378684f59e4be9aacfe8295fefb2788706ce27c7cc0ed0381896bb2829421f7115e28ae84e2a322c1d4582e575a9062e3b586eb0f9d8c08c3 SHA512 898fc78b1980a38bdacda5f4fe4655f7edec1df39d7a21f5160d961df8c908b8f1f468e336bdcbed4b7a4efdf01197ebae65de224d55b57ecd9fffcdd7484612
 MISC metadata.xml 2576 BLAKE2B 428d10d3666770317f470e6898d103180370866abdfcc55c81450c3df58a7c0eef5a2cf4d4980a36d22803479af7f10aaf3a4245041f729fefe26ccb0a29a516 SHA512 6db4ad92cf3d3afc81b7047c8f23d157d1efc6cf02aa5e4ab435c8785355445d6929e314fcadb007b2d084560c0f1afeff8889ff390852846fad8f52c29d8e48
diff --git a/app-admin/conky/conky-1.12.2.ebuild b/app-admin/conky/conky-1.12.2.ebuild
deleted file mode 100644
index 79a82febb401..000000000000
--- a/app-admin/conky/conky-1.12.2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake linux-info lua-single 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 hddtemp ical iconv imlib
-	intel-backlight iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc
-	mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd
-	thinkpad truetype vim-syntax weather-metar webserver wifi X xinerama
-	xmms2"
-
-COMMON_DEPEND="
-	cmus? ( media-sound/cmus )
-	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-sound/pulseaudio )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
-	systemd? ( sys-apps/systemd )
-	truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-	wifi? ( net-wireless/wireless-tools )
-	weather-metar? ( net-misc/curl )
-	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 )
-	hddtemp? ( app-admin/hddtemp )
-	moc? ( media-sound/moc )
-	nano-syntax? ( app-editors/nano )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-text/docbook2X dev-libs/libxslt )
-"
-
-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 the conky homepage
-or in ${ROOT}/usr/share/doc/${PF}/html when built with USE=doc.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
-	use ipv6 && linux-info_pkg_setup
-
-	lua-single_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	xdg_environment_reset
-
-	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
-		cmake/ConkyPlatformChecks.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs
-
-	if use X; then
-		mycmakeargs=(
-			-DBUILD_ARGB=yes
-			-DBUILD_X11=yes
-			-DBUILD_XDAMAGE=yes
-			-DBUILD_XDBE=yes
-			-DBUILD_XSHAPE=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_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=$(usex ipv6)
-		-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_WEATHER_METAR=$(usex weather-metar)
-		-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
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano/
-		doins "${S}"/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.15.0.ebuild b/app-admin/conky/conky-1.15.0.ebuild
index ec41cde86063..d3d700c1507a 100644
--- a/app-admin/conky/conky-1.15.0.ebuild
+++ b/app-admin/conky/conky-1.15.0.ebuild
@@ -4,8 +4,9 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-3 )
+PYTHON_COMPAT=( python{3_9,3_10,3_11} )
 
-inherit cmake linux-info lua-single readme.gentoo-r1 xdg
+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"
@@ -20,7 +21,6 @@ IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
 	webserver wifi X xinerama xmms2"
 
 COMMON_DEPEND="
-	cmus? ( media-sound/cmus )
 	curl? ( net-misc/curl )
 	ical? ( dev-libs/libical:= )
 	iconv? ( virtual/libiconv )
@@ -51,6 +51,7 @@ COMMON_DEPEND="
 RDEPEND="
 	${COMMON_DEPEND}
 	apcupsd? ( sys-power/apcupsd )
+	cmus? ( media-sound/cmus )
 	hddtemp? ( app-admin/hddtemp )
 	moc? ( media-sound/moc )
 	extras? (
@@ -60,10 +61,29 @@ RDEPEND="
 "
 DEPEND="
 	${COMMON_DEPEND}
-	doc? ( virtual/pandoc dev-python/pyyaml dev-python/jinja )
-	extras? ( dev-python/pyyaml dev-python/jinja )
+"
+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}]
+		')
+	)
 "
 
+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 )
@@ -88,13 +108,14 @@ Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wi
 
 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
 }
 
@@ -158,6 +179,10 @@ src_configure() {
 		-DRELEASE=yes
 	)
 
+	if use doc || use extras; then
+		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	fi
+
 	cmake_src_configure
 }