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 E153715800A for ; Sat, 5 Aug 2023 22:41:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C004E2BC042; Sat, 5 Aug 2023 22:41:41 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 88BB12BC03E for ; Sat, 5 Aug 2023 22:41:41 +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 9A357340E64 for ; Sat, 5 Aug 2023 22:41:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B954F23 for ; Sat, 5 Aug 2023 22:41:37 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1691275200.02e526eb2bf6ba24f07b99fa8469bf2bb51ea37e.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-metrics/collectd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-metrics/collectd/collectd-5.12.0-r8.ebuild X-VCS-Directories: app-metrics/collectd/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 02e526eb2bf6ba24f07b99fa8469bf2bb51ea37e X-VCS-Branch: master Date: Sat, 5 Aug 2023 22:41:37 +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: 4abac915-1804-4aa4-ab67-21bcb4e42644 X-Archives-Hash: 8cd4a45296a191c72b3919df8bcfad4d commit: 02e526eb2bf6ba24f07b99fa8469bf2bb51ea37e Author: Conrad Kostecki gentoo org> AuthorDate: Sat Aug 5 22:36:05 2023 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Aug 5 22:40:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e526eb app-metrics/collectd: fix QA NonexistentDeps, ExcessiveLineLength Signed-off-by: Conrad Kostecki gentoo.org> app-metrics/collectd/collectd-5.12.0-r8.ebuild | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/app-metrics/collectd/collectd-5.12.0-r8.ebuild b/app-metrics/collectd/collectd-5.12.0-r8.ebuild index 0c8c8c88baa4..06e6d5ed301c 100644 --- a/app-metrics/collectd/collectd-5.12.0-r8.ebuild +++ b/app-metrics/collectd/collectd-5.12.0-r8.ebuild @@ -55,7 +55,7 @@ COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind buddyinfo capabilities ceph cgroups check_uptime chrony connectivity conntrack contextswitch cpu cpufreq cpusleep csv curl curl_json curl_xml dbi df disk dns drbd email entropy ethstat exec fhcount - filecount fscache gmond gps gpu_nvidia hddtemp hugepages interface ipc + filecount fscache gps gpu_nvidia hddtemp hugepages interface ipc ipmi iptables ipvs irq java lua load logfile logparser log_logstash madwifi match_empty_counter match_hashed match_regex match_timediff match_value mbmon mcelog md memcachec memcached memory modbus mqtt @@ -104,7 +104,6 @@ COMMON_DEPEND=" collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) - collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_gpu_nvidia? ( dev-util/nvidia-cuda-toolkit ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) @@ -476,10 +475,18 @@ src_install() { newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf - sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":#PIDFile "/run/collectd.pid":' "${ED}"/etc/collectd.conf || die - sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/run/collectd/collectd.socket":' "${ED}"/etc/collectd.conf || die - sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# \n# Globals true\n# :' "${ED}"/etc/collectd.conf || die - sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# \n# Globals true\n# :' "${ED}"/etc/collectd.conf || die + sed \ + -e 's:^.*PIDFile "/var/run/collectd.pid":#PIDFile "/run/collectd.pid":' \ + -i "${ED}"/etc/collectd.conf || die + sed \ + -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/run/collectd/collectd.socket":' \ + -i "${ED}"/etc/collectd.conf || die + sed \ + -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# \n# Globals true\n# :' \ + -i "${ED}"/etc/collectd.conf || die + sed \ + -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# \n# Globals true\n# :' \ + -i "${ED}"/etc/collectd.conf || die } pkg_postinst() {