From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id 5C5D31582EF for ; Sun, 09 Mar 2025 12:47:07 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 404643430D8 for ; Sun, 09 Mar 2025 12:47:07 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 41E04110370; Sun, 09 Mar 2025 12:47:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id 372E1110370 for ; Sun, 09 Mar 2025 12:47:06 +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 D59BB3430D8 for ; Sun, 09 Mar 2025 12:47:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4135827E6 for ; Sun, 09 Mar 2025 12:47:04 +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: <1741524362.10705667c9bb98570725c18821a7615682e09d1f.billie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/conky/Manifest app-admin/conky/conky-1.21.7.ebuild X-VCS-Directories: app-admin/conky/ X-VCS-Committer: billie X-VCS-Committer-Name: Daniel Pielmeier X-VCS-Revision: 10705667c9bb98570725c18821a7615682e09d1f X-VCS-Branch: master Date: Sun, 09 Mar 2025 12:47:04 +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: 456c9204-40d4-4cf3-a5d9-f80a308af579 X-Archives-Hash: 5793c14e35284393c39617f182bfbac3 commit: 10705667c9bb98570725c18821a7615682e09d1f Author: Daniel Pielmeier gentoo org> AuthorDate: Sun Mar 9 12:46:02 2025 +0000 Commit: Daniel Pielmeier gentoo org> CommitDate: Sun Mar 9 12:46:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10705667 app-admin/conky: drop 1.21.7 Signed-off-by: Daniel Pielmeier gentoo.org> app-admin/conky/Manifest | 1 - app-admin/conky/conky-1.21.7.ebuild | 251 ------------------------------------ 2 files changed, 252 deletions(-) diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index ccb4ba355d7a..e0c786cdb6e8 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,2 +1 @@ -DIST conky-1.21.7.tar.gz 1961997 BLAKE2B 80ca17e0d1065655c410d8108668b3f09df574b761d57e374a2d51c946b51bd1ce4d29d320def0a197d465401cb4a665fb84a394406611903877c0acf42b4ad3 SHA512 52b6621e3e693654610ebd1b9e1adbeaec2ae2a2aaed4b038882a6825e6573f4afdea85f9156e1ffaa5999e30b3b05170b6b101f415980f0edab5c85151e9e6c DIST conky-1.22.0.tar.gz 2030830 BLAKE2B b262b76fac24d74db0fe099e6e1c54be463d9453c5e9bcb9de33beeccda9e7b063287c189018f673bf0fc1d46029de9ac4f6c333c579b3f7fc86e2a7866e761e SHA512 df110bbec225127b6b9e2cb8998a21d99beb00225c7df6a6d35d6758135c8882d3e06c796f5c94eec7653da73af32f7a87ae631755b0e715306799f89de63cdd diff --git a/app-admin/conky/conky-1.21.7.ebuild b/app-admin/conky/conky-1.21.7.ebuild deleted file mode 100644 index 2a9e724a9ff8..000000000000 --- a/app-admin/conky/conky-1.21.7.ebuild +++ /dev/null @@ -1,251 +0,0 @@ -# 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 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 -# 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=" - colour-name-map? ( - dev-util/gperf - ) - doc? ( - virtual/pandoc - $(python_gen_any_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/jinja2[${PYTHON_USEDEP}] - ') - ) - extras? ( - $(python_gen_any_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/jinja2[${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/jinja2[${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 ) - mouse-events? ( X wayland ) - nvidia? ( X ) - rss? ( curl ) - truetype? ( X ) - xinerama? ( X ) - xinput? ( 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_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_COLOUR_NAME_MAP=$(usex colour-name-map) - -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_MOUSE_EVENTS=$(usex mouse-events) - -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_XINPUT=$(usex xinput) - -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 -}