gentoo new year resync : 01.01.2021

6 files changed, 9 insertions, 147 deletions

diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 0ba3841269a2..623708153107 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -10,12 +10,8 @@ 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-2.4.tar.gz 270907 BLAKE2B 4666c39c05cb0bd2a89db7e57bfd72b542ccda02ba09a9da6097b58957141042a5e63a2ee4863bb61b686b3e4c374a690d798398136760699755187fdca5e27c SHA512 e2f23b375a6afcd9e51770769c741d3a5fc139aec22e535bc98da09e4a6677a0c820fb04727a79f23569be29f031e9ee897b6d569146c42ed917f5f83399b7b6
-DIST vnstat-2.5.tar.gz 274765 BLAKE2B 65117717d5522ce17e40f05f62d0328f74f5cc3ab42353c93b7a2af0e74df1d36b3a64dd778cd4def2985120bfbc6e1cf8e83a7615ef236ea1af1dbd8d898965 SHA512 5f44f2ee7fa4bdaf0cfd48b35927ec590f5344cc497b5e02a999ece40e53812a7bf725cf1ddaf08c7316bf83ed567f370a72f00b279553cb1d06dfec26c3c1c8
 DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b865689540b5838ddeb2629da968bc2ba655cb6ff909227a859f0334900a1597c78b772124a993343a4cf23 SHA512 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea
-EBUILD vnstat-1.17.ebuild 1456 BLAKE2B 33050a01343457432c73bd2018a443a649faa7d34c8f68bda4f0eed5285dbd2c21dc6166fe94f8cc7011b957c4c4c60b51e3ba369899ae3e0b68f65b86d79053 SHA512 8465ee23f4ceadb1e9fb485bc992eb9196b75e747c7833c9d2a9ad12e86c79255667ed706b62b1131301d3b8d29221d6517fb4fd36bc1b06f52e13c2e29d3c2c
-EBUILD vnstat-2.4.ebuild 1552 BLAKE2B 84bc2e8bbbc9dd8187865e7c7850ef9392c1adcc81b5c3af7001630389115d0ea076e20a89127ca32de26cf8713e0ab910408bb5d9ae6e991beea8b737185868 SHA512 b3dcdda38271d8e1f454c1d99270967e9c1a361533425cf57eea490e7094a2ce6ff96611c9766e0ab25a33a78fdff86a17e38c3ed087cccac1501e93339e12dc
-EBUILD vnstat-2.5.ebuild 1552 BLAKE2B e1a12480531ea51b8faab7877a3f2f2fa619afb9f0a940b4b280ef8dba508bc5591537e3730eb4cbaa8abfb5fd0a37ecca01eac16fe1163d95092586b5686526 SHA512 38404752568f265e3b589e72e957f95a917736177abfce0e02dd643c0c90849e6ac54f1e4ca557ad51465ea8d7b59ad1c661b5d771897068150f27ecc3d07c67
-EBUILD vnstat-2.6.ebuild 1558 BLAKE2B 551564174e941fb9465a0b04fc1102a90a7602fd13ef0834c744da5ec558167eb1a7f3f742671b9739e2ad489cbca6ddc85372288af94e8736d42b5931cde866 SHA512 2cf654577d9f848b54cc4973662f03910310903f52047b81315108134dc9624b409ee2604300a8d3e03d11d3b1a959b888e1d624b58010d6276e4e785d453347
+EBUILD vnstat-1.17.ebuild 1457 BLAKE2B 12c17ab149bdc4c7963055eee8cbf3efa2360379a1bdd7230a365b95a508f20c84bd1b77111faa3d3f97034dcd05fd75c9187de8fca23bd7d9c8f7fe3e709c54 SHA512 8070ce34140862b64d1f3d1c5b9eb6fa398cd605513905caf9c8cdb825c0c083f83ae73fd0282cbe0285e5c46e7c0b4dbdedc6a52547b247f673eee1e3eebbe0
+EBUILD vnstat-2.6.ebuild 1559 BLAKE2B b86d3ab528efecafb9f874a8b8c820e7520eb89683a8ed37b248d1ac76bb945c4989b3deb20e12735051f8c85c8f7ee4327ed8ce6e2d09102dfab66095164609 SHA512 62c5cfccd5c8ee4156eca7654124a7eb146f1d77ed60954c836d34faffda8bbaae6143558f4d2b166436b4fce9b1317e5c910fd097ce998110dc2861eebb6859
 EBUILD vnstat-9999.ebuild 1529 BLAKE2B ebc7b0f707be6e17a4592107c159e128420350e3ed03963bd60915ed044df6d65485beb008113864ebe40de4b9d7b642f4a46dd818bb68edb519f38a4986b9c4 SHA512 3491048ea7993c399e220760774814e8df47d416dcfedf99bddf074be1d4c6addbf804fbd0179b13c809ea6df9b6e01c8e60f5368a556fe789ffad460452a143
-MISC metadata.xml 699 BLAKE2B 8c76aff9b720d3601cd2e10e7dde191eda8874c32747b73c408e81e44cdb06608bd7558088bf5e507ec4c387cb70e8972f3776ccd528c21f5dfdea0d5b39933b SHA512 7d3c8203145fcd9c1b83987a36c30477e66de7406e984c3b48d3deaa9e0ea1d052b5d07d5405bd168c0f08c9331f4a9d182c49eeb82ff43871f608e17ab28c1a
+MISC metadata.xml 835 BLAKE2B 4798aa86fd444665d135f7b2ede84889049113260c965b01999a2f9000c826fefa6877e8d3267a813421df97b2a0076f0718278ad3e0cf376bfc91babaaf87f3 SHA512 1c51f11ba3524329dec2101494c89d26859eab16e862e36e49df9240ee3fddf0380bfd929ec1719fc0e21808fc26f381b3be06f5fc89127f4c7e2fd188b3e886
diff --git a/net-analyzer/vnstat/metadata.xml b/net-analyzer/vnstat/metadata.xml
index 8519b3380b92..815914aa1466 100644
--- a/net-analyzer/vnstat/metadata.xml
+++ b/net-analyzer/vnstat/metadata.xml
@@ -15,4 +15,8 @@
 		The traffic information is analyzed from the /proc filesystem. That way vnStat
 		can be used even without root permissions.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">vergoh/vnstat</remote-id>
+		<changelog>https://humdi.net/vnstat/CHANGES</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild
index d48e9aa70bab..66f0ce74f2df 100644
--- a/net-analyzer/vnstat/vnstat-1.17.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
 IUSE="gd selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/vnstat/vnstat-2.4.ebuild b/net-analyzer/vnstat/vnstat-2.4.ebuild
deleted file mode 100644
index 3c08307f0cf8..000000000000
--- a/net-analyzer/vnstat/vnstat-2.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd user
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gd selinux test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-db/sqlite
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	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
-	systemd_newtmpfilesd "${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.5.ebuild b/net-analyzer/vnstat/vnstat-2.5.ebuild
deleted file mode 100644
index 12983f11d965..000000000000
--- a/net-analyzer/vnstat/vnstat-2.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd user
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gd selinux test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-db/sqlite
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	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
-	systemd_newtmpfilesd "${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
index 50688b8280f3..990a6e1d9dc2 100644
--- a/net-analyzer/vnstat/vnstat-2.6.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="gd selinux test"
 RESTRICT="!test? ( test )"