From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1486428-garchives=archives.gentoo.org@lists.gentoo.org>
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) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 1F7D115800F
for <garchives@archives.gentoo.org>; Tue, 14 Feb 2023 08:17:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4F998E076B;
Tue, 14 Feb 2023 08:17:51 +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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2E93FE076B
for <gentoo-commits@lists.gentoo.org>; Tue, 14 Feb 2023 08:17:51 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0F8C2340AD2
for <gentoo-commits@lists.gentoo.org>; Tue, 14 Feb 2023 08:17:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 13FE189F
for <gentoo-commits@lists.gentoo.org>; Tue, 14 Feb 2023 08:17:46 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1676362648.d5d4c2d9840cc52612c8fb895810cfe4586911e4.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
X-VCS-Directories: net-analyzer/monitoring-plugins/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: d5d4c2d9840cc52612c8fb895810cfe4586911e4
X-VCS-Branch: master
Date: Tue, 14 Feb 2023 08:17:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 06c93181-b04c-4ef0-9ce5-9fa716ae97a8
X-Archives-Hash: 2e6b05009fbe16067144bcf6873315df
commit: d5d4c2d9840cc52612c8fb895810cfe4586911e4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 08:15:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 08:17:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5d4c2d9
Revert "net-analyzer/monitoring-plugins: add temporary musl workaround"
This reverts commit 39db959d41ca077c06ff375aa2774d20e515ec24.
This seems to mess with the installation for gettext bits.
Bug: https://bugs.gentoo.org/892645
Closes: https://bugs.gentoo.org/894278
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../monitoring-plugins-2.3.3-r1.ebuild | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
index c5b2c08d156d..555d75dae179 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI="8"
-inherit autotools flag-o-matic
+inherit flag-o-matic
DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
HOMEPAGE="https://www.monitoring-plugins.org/"
@@ -53,7 +53,6 @@ RDEPEND="${DEPEND}
acct-group/nagios
acct-user/nagios
!net-analyzer/nagios-plugins"
-BDEPEND="sys-devel/gettext"
# At least one test is interactive.
RESTRICT="test"
@@ -63,19 +62,6 @@ PATCHES=(
"${FILESDIR}/${PN}-fix-check-http-segfault.patch" #893252
)
-src_prepare() {
- default
-
- # Refresh the gettext macro to fix musl build, bug #892645
- # This should be unnecessary in the next release (>2.3.3) as upstream
- # refreshed its copy of gnulib, so on next release:
- # - We may be able to drop the gettext BDEPEND (check!)
- # - Drop this cp call
- # - Drop eautoreconf
- cp "${BROOT}"/usr/share/aclocal/gettext.m4 gl/m4/ || die
- eautoreconf
-}
-
src_configure() {
append-flags -fno-strict-aliasing