gentoo resync : 28.04.2021

4 files changed, 42 insertions, 8 deletions

diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 6828d3f0151b..2378c1053feb 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -10,8 +10,10 @@ AUX vnstatd.initd-r2 874 BLAKE2B 4ce5936af3a375d30bc8ab1b5ea1ddf1c2b4910394b8a9e
 AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e9499754419b24179147a5b35f0c51cf61a3f7c4840c88f81d09101c427ba64b41f0922303b8c353caafb883db SHA512 35f9714641d1b3288bed659bd010ef1b8f0316f915622dcf5d3250e1acdd3b438762ae934fab2f6cd350274c7ec0f70a7d8946448bbc6db67be6f91cd86aa47c
 AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e21016c31fc227f9564218ca479455b7cf4eb697d18d8389ba65266b91d71c5bf22c83a9337ae1d861d9 SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac
 DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
+DIST vnstat-1.17.tar.gz.asc 819 BLAKE2B 3186e28dc29edb37eb0bbef9b29f1ea682e4a9de208b69b83a8bc99c81f272eb6865176aaa30e415bf8423d94f385e0725e1256eeb822c3152638eaace23b749 SHA512 c26af29daefe6431c1769812d04ba5bff92ac1241a6a49df11e28f0e51b21d4eb84ff1f1fb133a388fd8ac59967162bc5d60d5f02c409d34be5414acd34f7818
 DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b865689540b5838ddeb2629da968bc2ba655cb6ff909227a859f0334900a1597c78b772124a993343a4cf23 SHA512 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea
-EBUILD vnstat-1.17.ebuild 1425 BLAKE2B 13d7096fa03fd28c39a211fa261bdd6bedace4d1cef1bfd614c26dc63d0a988838de339a1a4b19b09605791a0ab1f279be40c39ca5218c44a09d05ad24bb54bb SHA512 8bef70d7837e76272fedfad2fc00edb48bf9c56d6ccf6fb75430add66919254be9073bf95cacbb9c87b1428b86079618f404813cb2853a451445ed1b7dedd55a
-EBUILD vnstat-2.6.ebuild 1529 BLAKE2B 790c85573a76c6ec9d6ce9632c25094a5e61b0403cbac89c5831a846c2949c609209883148e5a50765fee2f55bfc8b5db1cf0ad0e85b3101e8e6c6dcf1847688 SHA512 026157cb62aed814f7291901f2ea82695b2242c7311dec3181024163f2882f2368beb475531d8c9262064fa20d69cf17fe18e551ca715ebb4b0db4a40752f547
-EBUILD vnstat-9999.ebuild 1488 BLAKE2B 11f18a3b2fcaf87fbffc266e55fdc87f05274ba7fa88e5327b8155c4a35de6d25cd21325c2755d67e92c74920c6aff69ca63c74c72d8e1410f5e4a7b194a99f9 SHA512 50d488474af7616b17fcc555c15ded4ec07d1c173c59edf8c5120ebe826218993e86845e7146090bdf9cb0178aa4534fdd1e8a6559c63a045fa87dbd6bb97926
+DIST vnstat-2.6.tar.gz.asc 833 BLAKE2B 5e79d1b622dd4d37603a209b78018a3e88f2c404c700e1f439e4b98e2c2dd5bdf26e8ecd3b1b1242e14a725d7839c5a8b3b5448dc27e1f917cbeaf6012546656 SHA512 c643152bec14b70317465f8adc2256b41b8686e106b35ce492ad5030c2d5b32162441ac5fb2f309071da855efdf444076288cf075d8073bad0c0907067366e7f
+EBUILD vnstat-1.17.ebuild 1636 BLAKE2B 105d76a84e9dbfa5faf872a040815fb48a1579a52d9c6e11b83575bd19005211d6cb607f194d243cad11924e1ec32d7d699b8b506a053e92ee7075941bdce8d0 SHA512 2158ca138388c4e26e2e91d32163cfd8fe4be3b1c42926725b7a74c364140e7b65ba6667669ec874df36b4ee19aeebcdf0470d2e8d93425b266ae2584471bb4e
+EBUILD vnstat-2.6.ebuild 1864 BLAKE2B 1a39357dafe09afb2d7a9786adf30c8e1da186449853cb6d1ac0882c23ce206eca94955fb73c9be90ccd127f7ad6221d709a1742afe9e990af5c8907f95dd820 SHA512 ec17931121e4a52db571c2ca38a3d39ff51429e6e442f319b9b53e317f4c3c2586ba4402639fb3cc71126b724d9fadd7030ae7c7fd0ec447a3c7efcd14bc7e9d
+EBUILD vnstat-9999.ebuild 1880 BLAKE2B a861f7251830efe7e2d6714bf8ed828f0b09d1d6167a0e9e7ba34aca2682ca42ae92c8c73c2bb8bb17ba3a604c3d1d767eb92da2a3b2f80e890c866b2e65c1ff SHA512 01304ab549cfb81fdbf5895bce42d62e609b5291e944a9a003b452be01156a32c53ba24f40b11ef02797f61be825e551f795570ec128cf30f003c30c1b599344
 MISC metadata.xml 835 BLAKE2B 4798aa86fd444665d135f7b2ede84889049113260c965b01999a2f9000c826fefa6877e8d3267a813421df97b2a0076f0718278ad3e0cf376bfc91babaaf87f3 SHA512 1c51f11ba3524329dec2101494c89d26859eab16e862e36e49df9240ee3fddf0380bfd929ec1719fc0e21808fc26f381b3be06f5fc89127f4c7e2fd188b3e886
diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild
index 9207b1560e11..5a1f12b3e07d 100644
--- a/net-analyzer/vnstat/vnstat-1.17.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=7
 
-inherit toolchain-funcs user
+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"
@@ -21,6 +23,7 @@ DEPEND="
 	test? ( dev-libs/check )
 "
 RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )"
+BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )"
 
 pkg_setup() {
 	enewgroup vnstat
diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.6.ebuild
index bf03bc30dc4a..e1ce66f909cb 100644
--- a/net-analyzer/vnstat/vnstat-2.6.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.6.ebuild
@@ -7,11 +7,24 @@ inherit systemd user tmpfiles
 
 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"
+
+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"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="gd selinux test"
 RESTRICT="!test? ( test )"
 
@@ -61,6 +74,7 @@ src_install() {
 	newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
 
 	use gd && doman man/vnstati.1
+
 	doman man/vnstat.1 man/vnstatd.8
 
 	newdoc INSTALL README.setup
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index ff0d5392bc37..ef79532e70ff 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -3,11 +3,25 @@
 
 EAPI=7
 
-inherit git-r3 systemd user tmpfiles
+inherit systemd user tmpfiles
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
 HOMEPAGE="https://humdi.net/vnstat/"
-EGIT_REPO_URI="https://github.com/vergoh/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"
@@ -60,6 +74,7 @@ src_install() {
 	newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
 
 	use gd && doman man/vnstati.1
+
 	doman man/vnstat.1 man/vnstatd.1
 
 	newdoc INSTALL.md README.setup