gentoo resync : 14.07.2019

7 files changed, 8 insertions, 52 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 60dae65b8d78..fd78003555cd 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 64491cf01e31..c3ffdfbf862f 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,7 +1,7 @@
 DIST scapy-2.3.2.tar.gz 1166056 BLAKE2B bce5f37bd833dc457089cdfebd2dc019c4f7bed636935b4a6b51a2cf7355f5761fadaa304e93c276daa2200c48ab0e1c0a08bd278e30dfea1faa01321a0b957e SHA512 6b15e102708d1bd0ca0c910e2d82416cd172634409f93c506542a7dc6b69ddc9c9afef6ec07929f70cc0f8f4c455cdc84d9b35bc2c5b72f79dd7e6785306dc7a
 DIST scapy-2.4.2.tar.gz 3330071 BLAKE2B a40074594cd561b33d04364fba743fa5fe741b06b2ad8f8f9ebe9dfb0b9a3bc4f641cd16d99a4ba070fc0763d7cfeb8d3ecd056f162d509070cdd57d55d6ad9c SHA512 980f708a849ae26edca3eb6618a41668818c5883bca699f347f47a8964b3ee44a6ceefe4a12cb7d5fe6c13f5cbe2b7547938e53139f4ec9e6ef384e30c9bb6db
-DIST scapy-2.4.3_rc2.tar.gz 2785755 BLAKE2B 75c89f22beafbc9350d0f42fd186a4860d0c3146d543c66a6a8561d9c644ce92496c678740abfdfaf5811e3da01de211c76b590920c0860fc04c61e8f19bf0eb SHA512 09e45742a87be31f9230f6948f4d746f16fcd37aaae257d456deefa4ed7d9adcd93f647910210d0fc7d8d1db05a6d62a3937550d560d6099672a3360dfd0c88d
-DIST scapy-2.4.3_rc3.tar.gz 2947417 BLAKE2B c01528cfdd96c39f5d4b103e4537b5f2b59019a9aaa86a6a264565f709e60adaa934bad1036b62a236127e81c82dda30c7f14aac23394eb90bdaed7377c9aaf5 SHA512 135f5112f97e6a7ea88dff7b7c81ceb9acd3b76a63cdc66f579400b9dd4a19ce908cd4037dbe8a98ae7581d8e51451426527f2f401f46ef83866a5b8c2744d1d
+DIST scapy-2.4.3_rc2.tar.gz 2785738 BLAKE2B f0318b90d02f2e54033d1d2c6c0d3eff63302a3df3e4b6f14913741c7f677b3cfa79abcfcfed38c81dfb893434009eb3f809dfccb8b493a0f42c8547d67f7a18 SHA512 0d7dac163028fcb596175c532b594fe8bf80f1382518e971259c9e92eafd8c7665e517d9bc7bf8f335b147fcc14d0225d7e24fd08adca0029fb5e4e6e5ae09c5
+DIST scapy-2.4.3_rc3.tar.gz 2947420 BLAKE2B 43c9ffebfd87c6918c15dd403a58e85cb44f38c540fd28117a5586b2ad1f341ad793a5f6b2e5c1a8204e9c682c1ef6da3c20a313c0ba7f4ff3617ec674f5bb2d SHA512 ef0c6ef97868a3489eaa30acbd7eb203a61f311e50ecd9ec375fb05ae78ba5f33f854928440aa84dbd35e4178469c93a4f6073a33082572b133df93ee18000bd
 EBUILD scapy-2.3.2-r1.ebuild 869 BLAKE2B a1695ad6505bc5367342dfc3ffbd9a5d8e537f3cbdda910e69f617e1a93932d4f2bdd2a7bba2b1d887de7bb7f79a14dca981d12a7c4468683fe3eaae7820a67c SHA512 375c40a3da50a5ba136034c2c3cccba46d61c6ac63ff29c12d0ceeb3e20fece28812b0a1bd22710ec1ec0be62c57263f5744a652052bdd461099f657d63636f5
 EBUILD scapy-2.4.2.ebuild 1015 BLAKE2B 84ed365afa54aca1f499902ebc7a200f3464f9f7e9157fdab17749ce59cf25524e18ae9f7181e09e760d2a02ddd701eeccb5b10371573e33961f0037ebfced13 SHA512 434e19fcee3d9c71b7967440cd8af2dd2cae36f8e26f99e9b02de202fe80116a0e8eb501be8db7ff7d633f6f1bec7202b5b65826a7a21881042f1b9b5f723dc4
 EBUILD scapy-2.4.3_rc2.ebuild 1015 BLAKE2B 4217feb98a994332d8efc0f8a5ab46352aaccc3125fd962ed18a1da49731399a5826ccbe8de1c963ca8becf9c9d1c5f7389d995a3d763e9fbcf822bf30a231ab SHA512 990f4c97c5f86a33c41f1af6ea761eabcccfff6bc7f492f0c552765fcaf6c0b6122940da696d06cea3b08de1b702b38ac17cc29aeed7513ad6d6107e5c29fad7
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index c74e4b02e956..233ad5d23ec6 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,6 +1,3 @@
-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
@@ -13,10 +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-2.1.tar.gz 259622 BLAKE2B 703e1260d0ea81a016ed89dbfa830f97ff6e38ca2dd4c96ea08ca8293e71cde8cf0048e6a68b9cb6f2f94aaec66764bbfc718173897d40fd6e8166c07d7e627c SHA512 4c88795ee254cb550873e7db72a5f7b795553ef944c3f4df4c351e83376ea02ae6f3376b01edf727072fe2ba178372705a73483c24269acc4c173ee0e03f8930
 DIST vnstat-2.2.tar.gz 264037 BLAKE2B dc82798a0c619d2aea3d3cbdd42bb10f73769b0e64443407daabc8838e5af5b0ef718c0769321116269f1bc6f50e99133a1d38ccb730f658f3215a83180589b7 SHA512 47bd544ed071268774bf55a8269f50694d2af0b14fe3eb50b707c4f09c9a0c0653360ac892136275355b2a647a0fed731f007d135edf4bc9b04dc537bf248acc
+DIST vnstat-2.3.tar.gz 269907 BLAKE2B b935c7baec34f15213b3fe320add4e3ecf0d3cd43d5934231eb9b96f3bc8171aa056e1a08d42cafdc2d06b9e6108d04392a1452a3d24bdbaf748722c53f64f23 SHA512 244aae8a127fb93407918e90efefe09d901410abbfda715272f1d754692661f2036ea98cc7f75ebc53ec27249ba676f84463af24ed7e19a9a130d6ce29b32677
 EBUILD vnstat-1.17.ebuild 1432 BLAKE2B 670816f4084b10dd622dd9ab90d95c01f185d9d7a51bddd430c5cb0b0fd7900b5cf3417310b814a7299102978c9d4f165e0991978defb025e2935f9922715059 SHA512 669b9f5f8638dcca0c97d2f1c0a160bbfbf24ac5dfa6c4e3c0d6b1280dc6fb5923c512924397576ccbe75c762464fa93aa4022c524fd167800da1c5195e8c9b4
-EBUILD vnstat-2.1.ebuild 1528 BLAKE2B b9c5a2bb6af9f75f1576605a295a9beccbe17f031538132c592c04d1747936e92ca1d308342fe230996c7b330d32ab6356232a0ba05b7cebddc93c0b15a368b3 SHA512 84cfa2c2b275fdaec4c31586fb98736481c21f5cb7fe60e1a52eff45094712d631d370126e2fcb064d5ef72c46d79caa23938bb62f4b1c052ebdf6f1625c459a
 EBUILD vnstat-2.2.ebuild 1525 BLAKE2B 6bd8f55fdc399980494b108f9152d8a4b5bf552feb98deaedafe82744a9f5f01e1517b01d8d616027dc714a8d78ea55b7d06ee8251d547239c9747f87e799b8c SHA512 049caeb2e5a1b717151bd57e88de2dd7a7df4fb2408bba910a4b0ecf5318997fb30db4e25c600e3a4c62d2fe84f88fc67222de931fbcd4b6e794df2f06cbcdbf
+EBUILD vnstat-2.3.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-1.17-conf.patch b/net-analyzer/vnstat/files/vnstat-1.17-conf.patch
deleted file mode 100644
index 5bcbdafb2a74..000000000000
--- a/net-analyzer/vnstat/files/vnstat-1.17-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cfg/vnstat.conf
-+++ b/cfg/vnstat.conf
-@@ -115,10 +115,10 @@
- UpdateFileOwner 1
- 
- # file used for logging if UseLogging is set to 1
--LogFile "/var/log/vnstat/vnstat.log"
-+LogFile "/var/log/vnstat/vnstatd.log"
- 
- # file used as daemon pid / lock file
--PidFile "/var/run/vnstat/vnstat.pid"
-+PidFile "/run/vnstat/vnstatd/vnstatd.pid"
- 
- 
- # vnstati
diff --git a/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch b/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch
deleted file mode 100644
index c0446c3b3410..000000000000
--- a/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cfg/vnstat.conf
-+++ b/cfg/vnstat.conf
-@@ -81,10 +81,10 @@
- ##
- 
- # switch to given user when started as root (leave empty to disable)
--DaemonUser ""
-+DaemonUser "vnstat"
- 
- # switch to given user when started as root (leave empty to disable)
--DaemonGroup ""
-+DaemonGroup "vnstat"
- 
- # how often (in seconds) interface data is updated
- UpdateInterval 30
diff --git a/net-analyzer/vnstat/files/vnstat-1.17-run.patch b/net-analyzer/vnstat/files/vnstat-1.17-run.patch
deleted file mode 100644
index 4afe449ceed3..000000000000
--- a/net-analyzer/vnstat/files/vnstat-1.17-run.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/common.h
-+++ b/src/common.h
-@@ -198,7 +198,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"
- 
- /* no transparency by default */
- #define TRANSBG 0
diff --git a/net-analyzer/vnstat/vnstat-2.1.ebuild b/net-analyzer/vnstat/vnstat-2.3.ebuild
index b28272d8b5d6..c5e123218abe 100644
--- a/net-analyzer/vnstat/vnstat-2.1.ebuild
+++ b/net-analyzer/vnstat/vnstat-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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() {