gentoo resync : 04.05.2019

8 files changed, 55 insertions, 152 deletions

diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index f6fc4bbf383d..c74e4b02e956 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,6 +1,9 @@
 AUX vnstat-1.17-conf.patch 352 BLAKE2B d87c9de8abb481f3f6086ec056e4c0e78e7d0bf982e29ec635326b7c5b6b998109efe69750098e6cc1d0248b8917fd3797fde8f5ff5ce06e4843d6e23778ae5e SHA512 d95fd80ae1887137dda7b13812cdb962a35a06f60e182fc66017bcc68ee5aa9aaadca01745b8194f468f8ed453ebe347c87ae7ddb4985e0e88450a33a1f8830c
 AUX vnstat-1.17-drop-root.patch 359 BLAKE2B f2866f958a08aa7e09148bdbaddcf2942801dde16982e3dedaea927041c00a205c7f4d8f68dd4e3da028e203a2ceb3af33a4ebd7c4046ff56040818a200ba7e9 SHA512 9e0b5d5d8b26c0657f8af41e615365e8e71dda051225bda103466754dd39f2e77ae277ad9f539920c7ae77e86618a9944ee33fb4a35d60ee3593541a38549362
 AUX vnstat-1.17-run.patch 296 BLAKE2B 73d7de3444209da86390650ee4bae364bc849abb92508d665473d94877ebea7d25022985ec5939eb8e32f6ad4a9d45af91ff9e455f520d0119c7e2e4a46055a3 SHA512 4baacbe8c3f1bcfb585060e0502ea7bc24dc7e964ecd381dadc7fb33395aa5655c33e83726a402e5dba212b92a4a498926add3b50aebb674458542772cf51afd
+AUX vnstat-2.2-conf.patch 318 BLAKE2B 23e9e546a860c5b708fe4d67e5f67e5274e269d5fe6377b8d7921124894a585b9de15c992ae91313940ddc83c79b44ca3d2c529fe2f827d749a70e7c1a4d9031 SHA512 1d28d47adbed2e51eb22b7ed4773aa9ae6a94f1f9ab9e06b5e2501ca59d7ffdbd83ba862194dd2148e4b897c3d28ad4f63b6eb79f8b6ad3e43b7eea931a685a6
+AUX vnstat-2.2-drop-root.patch 415 BLAKE2B c027b6056ec7ae26c64165e170bae3d5823e5017f2d7d25d88b5f030b91d7d60cd1a898d352bc706436e1858e8f2b003e9f4325acddd858f707abf75a9f20d77 SHA512 95e7602f2bd3c7277e4cdabadf4c1379a8217125c72cb2d343d010f8bf877243d3ac02b539e39ce830e3c48e9cdca6c7f35a73d6852d3f66e87a071986a78231
+AUX vnstat-2.2-run.patch 297 BLAKE2B 120045cff99c18d9be8e8a1655f8f043906c2c77563f139973f049c55d8b4c56558f2c47f973e036cb2c5071aafc24e6a6881dc1e13e196fd095ceb20677ff94 SHA512 c1e01bc7e71b56ac958c8071400f6f82c312a5f157333a3298596b85011dab5beb65b8dbc51a5f62aed68b56562266f7306e1cef82a69664b7486b148814db43
 AUX vnstat.cron 220 BLAKE2B de51e83326485932b6112035ec9d25440685f9d110a854eaa7963a54b50ce078d6199d3e491a7e3bfc686af1866e250f0b30eeb2c246424b9805fe11717adf1f SHA512 c901385f97323d1a686cee63d015eaf9ad38ed195a1c0e25dae671dd7061ebc918498684c55b90b0674960891dfca4b83f458174892c1b9efb48cd362fdb8477
 AUX vnstat.cron-r1 177 BLAKE2B 1f015b8db93decce2877ce3c431cbc14c9bb2dd798f0762e5a7fb98d1c42e59e9839ecb6feb25312320cc2fb6b1aecd9b97323a6318a10a4426146c07094f2ae SHA512 8074d65cf2f28bd5c02fe741dbe20f8404bc2e25b94b43d0bcc829ca088828227805caf9cb8cae020ae0a9370d68dc3c757fedf07d48c0fc71ba944f2da1cb94
 AUX vnstatd.confd 216 BLAKE2B d8ffd76612a5a8ce6b62ba4056c3bc91385c1980683cb487cc5fe2432a8d2e363fbc7ebe1e21d553a3b8ea04dea735342fe6f681320c98e8b41d51a869721c4e SHA512 d645817913d5b52e928561b3d6a0e869d8ae5db81b97af91c1ebfc6a8cd2df666c1653e6dc5f91c0a890033a89692f77eaf081c1cae5590446c69a70ea263946
@@ -10,13 +13,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.18.tar.gz 242502 BLAKE2B 2190c33ddf1c0a573e638234a94a86eb44fcc39e106ce8ece1f5ee5314dcc1efee237376ec109eb0873b9cf27ac3fe663526512f98a130114d417380bcb82a31 SHA512 4f9f08a57586bc57ede3d66802ee977c69b5f76ab42aa36e942e8d827dfce806dfc04916646fac01f57b026742a639fc5f7395b141a1c03ad11a1f977d02aa68
-DIST vnstat-2.0.tar.gz 259439 BLAKE2B f28f10962ae2acf04fc6669268bf5cf911ca2a5c77422b773f82a1ae25a0f90c2022aa5981c701bfa0246340113e24e0c3854174f6b3bee17d5474b9ba0916f0 SHA512 d5c9012b692adc9032ca1abde8619bd6a5de53c7c03b0fcae5b4b901c9769285a9de0b3a4f1bc21cfd74b96cfb10130a95e90cf179126ea676a777e1a9579a62
 DIST vnstat-2.1.tar.gz 259622 BLAKE2B 703e1260d0ea81a016ed89dbfa830f97ff6e38ca2dd4c96ea08ca8293e71cde8cf0048e6a68b9cb6f2f94aaec66764bbfc718173897d40fd6e8166c07d7e627c SHA512 4c88795ee254cb550873e7db72a5f7b795553ef944c3f4df4c351e83376ea02ae6f3376b01edf727072fe2ba178372705a73483c24269acc4c173ee0e03f8930
-EBUILD vnstat-1.17-r3.ebuild 1516 BLAKE2B c1638aa8e9ae4f36fb1490e7133e48fcab98c2368ea2f673c3449dde1bbf1c4211209c2865837ccc1355fc9e635e7100430447b8906516369da45922f35ff9ca SHA512 49d2f2cc331e380d66dceedeab8ed04e5f9767f4efabc2cc3211618cdc2abcc949cc72038abd15cc89e57b7e2dfe672e27bbcf7e3a768d084dab93200786b447
+DIST vnstat-2.2.tar.gz 264037 BLAKE2B dc82798a0c619d2aea3d3cbdd42bb10f73769b0e64443407daabc8838e5af5b0ef718c0769321116269f1bc6f50e99133a1d38ccb730f658f3215a83180589b7 SHA512 47bd544ed071268774bf55a8269f50694d2af0b14fe3eb50b707c4f09c9a0c0653360ac892136275355b2a647a0fed731f007d135edf4bc9b04dc537bf248acc
 EBUILD vnstat-1.17.ebuild 1432 BLAKE2B 670816f4084b10dd622dd9ab90d95c01f185d9d7a51bddd430c5cb0b0fd7900b5cf3417310b814a7299102978c9d4f165e0991978defb025e2935f9922715059 SHA512 669b9f5f8638dcca0c97d2f1c0a160bbfbf24ac5dfa6c4e3c0d6b1280dc6fb5923c512924397576ccbe75c762464fa93aa4022c524fd167800da1c5195e8c9b4
-EBUILD vnstat-1.18.ebuild 1516 BLAKE2B c1638aa8e9ae4f36fb1490e7133e48fcab98c2368ea2f673c3449dde1bbf1c4211209c2865837ccc1355fc9e635e7100430447b8906516369da45922f35ff9ca SHA512 49d2f2cc331e380d66dceedeab8ed04e5f9767f4efabc2cc3211618cdc2abcc949cc72038abd15cc89e57b7e2dfe672e27bbcf7e3a768d084dab93200786b447
-EBUILD vnstat-2.0.ebuild 1528 BLAKE2B 757d07cd46bfd69e4095401ea4380ef235a7cce65c81274f694fe9f243345b26bc9d997a4442edac1ce6cc3f700057208a2992107a22e31292b5cb6ffcc2f268 SHA512 c61469e9817aa4c15e0bb1d8a7438e5f2cc5af01c9a9cc6f2429c5c180662a0eb38de51e6780984deb7d6070e55bdd8e9f8afbd0ac8d74c5042bd66fd960dabd
 EBUILD vnstat-2.1.ebuild 1528 BLAKE2B b9c5a2bb6af9f75f1576605a295a9beccbe17f031538132c592c04d1747936e92ca1d308342fe230996c7b330d32ab6356232a0ba05b7cebddc93c0b15a368b3 SHA512 84cfa2c2b275fdaec4c31586fb98736481c21f5cb7fe60e1a52eff45094712d631d370126e2fcb064d5ef72c46d79caa23938bb62f4b1c052ebdf6f1625c459a
-EBUILD vnstat-9999.ebuild 1499 BLAKE2B 55e75f51d727d550b7ce56ff65d8a14bd493ca074df2114ae18b1dad10061d1493f8e27ca28584b59730a3b75fbe7c5400c022174695362b864c3ebc7ac93526 SHA512 b618e04b5ffd88b00f9e0f744db908f2e637ef422b17889f12dedeec3f9d4e22e0f6161c4ea065ab3eac737b8ea711f8256aba0c9822f49af0a5fd7cf52a0e20
+EBUILD vnstat-2.2.ebuild 1525 BLAKE2B 6bd8f55fdc399980494b108f9152d8a4b5bf552feb98deaedafe82744a9f5f01e1517b01d8d616027dc714a8d78ea55b7d06ee8251d547239c9747f87e799b8c SHA512 049caeb2e5a1b717151bd57e88de2dd7a7df4fb2408bba910a4b0ecf5318997fb30db4e25c600e3a4c62d2fe84f88fc67222de931fbcd4b6e794df2f06cbcdbf
+EBUILD vnstat-9999.ebuild 1502 BLAKE2B 85b6e903a1cd01f95b3140ff957f06f2cae8e890279fde5b89d8e478e23a9a1e96cd4db7ad31d00fe1bfb269330a367f35c24e844e3399ec44774adc1c6d80c7 SHA512 8c8644661509f62cd77319e0d445371cfbf4b9533f4e0602978103c1b7460c64a1a242a2495aeb35ac81c6b2f5898d042bfc4f0c51d544e8156f5632a2a26b02
 MISC metadata.xml 603 BLAKE2B 6cd01f8334d5768e057d6866f9c8d739af3680787d9159638a504eeeb74b2f01a36775bfa3e2afeb169d2948e290e8995b2100d572603eaa5ffa44c96b15b385 SHA512 7dbda5d3a317201c8eb0000f2b55af6b2de6fd44368ab39b08c60ee8eb1355264a8886d9a484ab75d47c0c0ce3f41059a8f354f7d6480ae20e469e4c29ca31e2
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-conf.patch b/net-analyzer/vnstat/files/vnstat-2.2-conf.patch
new file mode 100644
index 000000000000..7bea5d8ffe97
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-2.2-conf.patch
@@ -0,0 +1,11 @@
+--- a/cfg/vnstat.conf
++++ b/cfg/vnstat.conf
+@@ -143,7 +143,7 @@
+ LogFile "/var/log/vnstat/vnstat.log"
+ 
+ # file used as daemon pid / lock file
+-PidFile "/var/run/vnstat/vnstat.pid"
++PidFile "/run/vnstat/vnstat.pid"
+ 
+ # 1 = 64-bit, 0 = 32-bit, -1 = old style logic, -2 = automatic detection
+ 64bitInterfaceCounters -2
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch b/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch
new file mode 100644
index 000000000000..2ed3ec1404a4
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch
@@ -0,0 +1,15 @@
+--- a/cfg/vnstat.conf
++++ b/cfg/vnstat.conf
+@@ -69,10 +69,10 @@
+ ##
+ 
+ # switch to given user when started as root (leave empty to disable)
+-DaemonUser ""
++DaemonUser "vnstat"
+ 
+ # switch to given group when started as root (leave empty to disable)
+-DaemonGroup ""
++DaemonGroup "vnstat"
+ 
+ # try to detect interface maximum bandwidth, 0 = disable feature
+ # MaxBandwidth will be used as fallback value when enabled
diff --git a/net-analyzer/vnstat/files/vnstat-2.2-run.patch b/net-analyzer/vnstat/files/vnstat-2.2-run.patch
new file mode 100644
index 000000000000..bb9222b5fe2f
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-2.2-run.patch
@@ -0,0 +1,11 @@
+--- a/src/common.h
++++ b/src/common.h
+@@ -229,7 +229,7 @@
+ #define CREATEDIRS 1
+ #define UPDATEFILEOWNER 1
+ #define LOGFILE "/var/log/vnstat/vnstat.log"
+-#define PIDFILE "/var/run/vnstat/vnstat.pid"
++#define PIDFILE "/run/vnstat/vnstat.pid"
+ #define IS64BIT -2
+ 
+ /* no transparency by default */
diff --git a/net-analyzer/vnstat/vnstat-1.17-r3.ebuild b/net-analyzer/vnstat/vnstat-1.17-r3.ebuild
deleted file mode 100644
index c3e6409650f7..000000000000
--- a/net-analyzer/vnstat/vnstat-1.17-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-
-COMMON_DEPEND="
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-vnstatd )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17-conf.patch
-	"${FILESDIR}"/${PN}-1.17-drop-root.patch
-	"${FILESDIR}"/${PN}-1.17-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.1
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
diff --git a/net-analyzer/vnstat/vnstat-1.18.ebuild b/net-analyzer/vnstat/vnstat-1.18.ebuild
deleted file mode 100644
index c3e6409650f7..000000000000
--- a/net-analyzer/vnstat/vnstat-1.18.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-
-COMMON_DEPEND="
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-vnstatd )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17-conf.patch
-	"${FILESDIR}"/${PN}-1.17-drop-root.patch
-	"${FILESDIR}"/${PN}-1.17-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.1
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
diff --git a/net-analyzer/vnstat/vnstat-2.0.ebuild b/net-analyzer/vnstat/vnstat-2.2.ebuild
index 8838083fcd65..c5e123218abe 100644
--- a/net-analyzer/vnstat/vnstat-2.0.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit systemd user
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
@@ -26,9 +26,9 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-vnstatd )
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.17-conf.patch
-	"${FILESDIR}"/${PN}-1.17-drop-root.patch
-	"${FILESDIR}"/${PN}-1.17-run.patch
+	"${FILESDIR}"/${PN}-2.2-conf.patch
+	"${FILESDIR}"/${PN}-2.2-drop-root.patch
+	"${FILESDIR}"/${PN}-2.2-run.patch
 )
 
 pkg_setup() {
diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild
index 5e41cb65356a..0b1d30191127 100644
--- a/net-analyzer/vnstat/vnstat-9999.ebuild
+++ b/net-analyzer/vnstat/vnstat-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3 systemd user
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
@@ -26,9 +26,9 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-vnstatd )
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.17-conf.patch
-	"${FILESDIR}"/${PN}-1.17-drop-root.patch
-	"${FILESDIR}"/${PN}-1.17-run.patch
+	"${FILESDIR}"/${PN}-2.2-conf.patch
+	"${FILESDIR}"/${PN}-2.2-drop-root.patch
+	"${FILESDIR}"/${PN}-2.2-run.patch
 )
 
 pkg_setup() {
@@ -63,6 +63,6 @@ src_install() {
 	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
+	newdoc INSTALL.md README.setup
+	dodoc CHANGES README.md UPGRADE.md FAQ examples/vnstat.cgi
 }