From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3BBA8158064 for ; Sat, 4 May 2024 09:03:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8112DE2BCC; Sat, 4 May 2024 09:03:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6B76DE2BCC for ; Sat, 4 May 2024 09:03:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B00E5343108 for ; Sat, 4 May 2024 09:03:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B27B1779 for ; Sat, 4 May 2024 09:03:44 +0000 (UTC) From: "Daniel Pielmeier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Daniel Pielmeier" Message-ID: <1714813193.033154a0f3de539559744c97f4c29c1696cd02b6.billie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/conky/conky-1.20.2-r1.ebuild app-admin/conky/metadata.xml X-VCS-Directories: app-admin/conky/ X-VCS-Committer: billie X-VCS-Committer-Name: Daniel Pielmeier X-VCS-Revision: 033154a0f3de539559744c97f4c29c1696cd02b6 X-VCS-Branch: master Date: Sat, 4 May 2024 09:03:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 666b45be-cb29-4049-83ea-4c9206208c2d X-Archives-Hash: e4714756a43e6a65bfca416e84b823a5 commit: 033154a0f3de539559744c97f4c29c1696cd02b6 Author: Daniel Pielmeier gentoo org> AuthorDate: Sat May 4 08:59:53 2024 +0000 Commit: Daniel Pielmeier gentoo org> CommitDate: Sat May 4 08:59:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=033154a0 app-admin/conky: Fix dependencies Try to better support X vs Wayland Closes: https://bugs.gentoo.org/931153 Signed-off-by: Daniel Pielmeier gentoo.org> app-admin/conky/conky-1.20.2-r1.ebuild | 244 +++++++++++++++++++++++++++++++++ app-admin/conky/metadata.xml | 1 + 2 files changed, 245 insertions(+) diff --git a/app-admin/conky/conky-1.20.2-r1.ebuild b/app-admin/conky/conky-1.20.2-r1.ebuild new file mode 100644 index 000000000000..f134905d992c --- /dev/null +++ b/app-admin/conky/conky-1.20.2-r1.ebuild @@ -0,0 +1,244 @@ +# 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 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 +# 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=" + 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=" + ${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 ) + nvidia? ( X ) + rss? ( curl ) + truetype? ( X ) + xinerama? ( 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_XINPUT=yes + -DBUILD_MOUSE_EVENTS=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_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_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_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/metadata.xml b/app-admin/conky/metadata.xml index 7a0ba1bcf7e0..9f9d203f58f1 100644 --- a/app-admin/conky/metadata.xml +++ b/app-admin/conky/metadata.xml @@ -24,6 +24,7 @@ Enable support for per-task I/O statistics Enable support for displaying everything from an irc channel using net-libs/libircclient Enable if you want Lua Cairo bindings + Enable support for Cairo and Xlib interoperability for Lua Enable if you want Lua Imlib2 bindings Enable if you want Lua RSVG bindings Enable support for glibc's libm math library