commit: 4315a67f1f687fa721f675d2b15f486e77b6c9a8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jun 2 20:12:16 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 2 21:31:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4315a67f
net-analyzer/vnstat: don't bypass build system We weren't passing anything to configure and instead NIHing src_compile and src_install. Stop doing that and gain some man pages. Closes: https://bugs.gentoo.org/957055 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{vnstat-9999.ebuild => vnstat-2.13-r1.ebuild} | 27 +++++++--------------- net-analyzer/vnstat/vnstat-9999.ebuild | 27 +++++++--------------- 2 files changed, 16 insertions(+), 38 deletions(-) diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-2.13-r1.ebuild similarity index 81% copy from net-analyzer/vnstat/vnstat-9999.ebuild copy to net-analyzer/vnstat/vnstat-2.13-r1.ebuild index 3c0d869f10c3..4bcb715c8cfa 100644 --- a/net-analyzer/vnstat/vnstat-9999.ebuild +++ b/net-analyzer/vnstat/vnstat-2.13-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -50,37 +50,26 @@ PATCHES=( "${FILESDIR}"/${PN}-2.9-conf.patch ) -src_compile() { - emake \ - ${PN} \ - ${PN}d \ - $(usev gd ${PN}i) +src_configure() { + local myeconfargs=( + $(use_enable gd image-output) + ) + + econf "${myeconfargs[@]}" } src_install() { - use gd && dobin vnstati - dobin vnstat vnstatd + default exeinto /usr/share/${PN} newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron - insinto /etc - doins cfg/vnstat.conf - fowners root:vnstat /etc/vnstat.conf - - keepdir /var/lib/vnstat - fowners vnstat:vnstat /var/lib/vnstat - newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf - use gd && doman man/vnstati.1 - - doman man/vnstat.1 man/vnstatd.8 - newdoc INSTALL README.setup dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi } diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild index 3c0d869f10c3..4bcb715c8cfa 100644 --- a/net-analyzer/vnstat/vnstat-9999.ebuild +++ b/net-analyzer/vnstat/vnstat-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -50,37 +50,26 @@ PATCHES=( "${FILESDIR}"/${PN}-2.9-conf.patch ) -src_compile() { - emake \ - ${PN} \ - ${PN}d \ - $(usev gd ${PN}i) +src_configure() { + local myeconfargs=( + $(use_enable gd image-output) + ) + + econf "${myeconfargs[@]}" } src_install() { - use gd && dobin vnstati - dobin vnstat vnstatd + default exeinto /usr/share/${PN} newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron - insinto /etc - doins cfg/vnstat.conf - fowners root:vnstat /etc/vnstat.conf - - keepdir /var/lib/vnstat - fowners vnstat:vnstat /var/lib/vnstat - newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf - use gd && doman man/vnstati.1 - - doman man/vnstat.1 man/vnstatd.8 - newdoc INSTALL README.setup dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi }
