From 84b3c8ea900896452c2fafac4710ecf6dafd0349 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 17 May 2021 00:35:38 +0000 Subject: net-analyzer/vnstat: port 1.17, 2.6 to GLEP 81 too Signed-off-by: Sam James --- net-analyzer/vnstat/vnstat-1.17-r1.ebuild | 69 ++++++++++++++++++++++++++ net-analyzer/vnstat/vnstat-1.17.ebuild | 72 --------------------------- net-analyzer/vnstat/vnstat-2.6-r1.ebuild | 79 +++++++++++++++++++++++++++++ net-analyzer/vnstat/vnstat-2.6.ebuild | 82 ------------------------------- 4 files changed, 148 insertions(+), 154 deletions(-) create mode 100644 net-analyzer/vnstat/vnstat-1.17-r1.ebuild delete mode 100644 net-analyzer/vnstat/vnstat-1.17.ebuild create mode 100644 net-analyzer/vnstat/vnstat-2.6-r1.ebuild delete mode 100644 net-analyzer/vnstat/vnstat-2.6.ebuild (limited to 'net-analyzer/vnstat') diff --git a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild new file mode 100644 index 000000000000..fceff0f93ca9 --- /dev/null +++ b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc +inherit toolchain-funcs verify-sig + +DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" +HOMEPAGE="https://humdi.net/vnstat/" +SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" +SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86" +IUSE="gd selinux test" +RESTRICT="!test? ( test )" + +RDEPEND="gd? ( media-libs/gd[png] )" +DEPEND=" + ${RDEPEND} + test? ( dev-libs/check ) +" +RDEPEND+=" acct-group/vnstat + acct-user/vnstat + selinux? ( sec-policy/selinux-vnstatd )" +BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" + +src_prepare() { + default + + tc-export CC + + sed -i \ + -e 's|vnstat[.]log|vnstatd.log|' \ + -e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \ + -e 's|/var/run|/run|' \ + cfg/${PN}.conf || die + + sed -i \ + -e '/PIDFILE/s|/var/run|/run|' \ + src/common.h || die +} + +src_compile() { + emake ${PN} ${PN}d $(usex gd ${PN}i '') +} + +src_install() { + use gd && dobin vnstati + dobin vnstat vnstatd + + exeinto /etc/cron.hourly + newexe "${FILESDIR}"/vnstat.cron vnstat + + insinto /etc + doins cfg/vnstat.conf + fowners root:vnstat /etc/vnstat.conf + + newconfd "${FILESDIR}"/vnstatd.confd vnstatd + newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd + + use gd && doman man/vnstati.1 + doman man/vnstat.1 man/vnstatd.1 + + newdoc INSTALL README.setup + dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi +} diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild deleted file mode 100644 index 5a1f12b3e07d..000000000000 --- a/net-analyzer/vnstat/vnstat-1.17.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc -inherit toolchain-funcs user verify-sig - -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" -HOMEPAGE="https://humdi.net/vnstat/" -SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" -SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86" -IUSE="gd selinux test" -RESTRICT="!test? ( test )" - -RDEPEND="gd? ( media-libs/gd[png] )" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/check ) -" -RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" -BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" - -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /dev/null vnstat -} - -src_prepare() { - default - - tc-export CC - - sed -i \ - -e 's|vnstat[.]log|vnstatd.log|' \ - -e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \ - -e 's|/var/run|/run|' \ - cfg/${PN}.conf || die - - sed -i \ - -e '/PIDFILE/s|/var/run|/run|' \ - src/common.h || die -} - -src_compile() { - emake ${PN} ${PN}d $(usex gd ${PN}i '') -} - -src_install() { - use gd && dobin vnstati - dobin vnstat vnstatd - - exeinto /etc/cron.hourly - newexe "${FILESDIR}"/vnstat.cron vnstat - - insinto /etc - doins cfg/vnstat.conf - fowners root:vnstat /etc/vnstat.conf - - newconfd "${FILESDIR}"/vnstatd.confd vnstatd - newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd - - use gd && doman man/vnstati.1 - doman man/vnstat.1 man/vnstatd.1 - - newdoc INSTALL README.setup - dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi -} diff --git a/net-analyzer/vnstat/vnstat-2.6-r1.ebuild b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild new file mode 100644 index 000000000000..3d37feff320b --- /dev/null +++ b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd tmpfiles + +DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" +HOMEPAGE="https://humdi.net/vnstat/" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/vergoh/vnstat" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc + inherit verify-sig + + SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )" + + KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" + + BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="gd selinux test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-db/sqlite + gd? ( media-libs/gd[png] ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-libs/check ) +" +RDEPEND+=" acct-group/vnstat + acct-user/vnstat + selinux? ( sec-policy/selinux-vnstatd )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2-conf.patch + "${FILESDIR}"/${PN}-2.2-drop-root.patch + "${FILESDIR}"/${PN}-2.2-run.patch +) + +src_compile() { + emake ${PN} ${PN}d $(usex gd ${PN}i '') +} + +src_install() { + use gd && dobin vnstati + dobin vnstat vnstatd + + 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-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6.ebuild deleted file mode 100644 index e1ce66f909cb..000000000000 --- a/net-analyzer/vnstat/vnstat-2.6.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd user tmpfiles - -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" -HOMEPAGE="https://humdi.net/vnstat/" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/vergoh/vnstat" - inherit git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc - inherit verify-sig - - SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" - SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )" - - KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" - - BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="gd selinux test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-db/sqlite - gd? ( media-libs/gd[png] ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/check ) -" -RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2-conf.patch - "${FILESDIR}"/${PN}-2.2-drop-root.patch - "${FILESDIR}"/${PN}-2.2-run.patch -) - -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /var/lib/vnstat vnstat -} - -src_compile() { - emake ${PN} ${PN}d $(usex gd ${PN}i '') -} - -src_install() { - use gd && dobin vnstati - dobin vnstat vnstatd - - 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 -} -- cgit v1.2.3-65-gdbad