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
