gentoo resync : 21.01.2020

5 files changed, 4 insertions, 4 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a91d90488e05..70a6ef27760a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/ethflop/Manifest b/net-misc/ethflop/Manifest
index 7f87f9463e2e..1b7234ff09b6 100644
--- a/net-misc/ethflop/Manifest
+++ b/net-misc/ethflop/Manifest
@@ -3,5 +3,5 @@ AUX ethflopd.confd 270 BLAKE2B f88ff41ed7b083b3251b0aed5612eefbb4e6d652f4ba7fcba
 AUX ethflopd.initd 236 BLAKE2B 938ff83700a252586b83b4d3f209a71bafe3b9ec87e1fff8ac86ceecd00ddc245c2e74dc7f66aed940fc7fa858c027c7ea1482343f0c59e86aaba393ec9b16f7 SHA512 974369721f6da77da247bdac70e077f4b93323af4ccb3ba5db30e6901c5a6962007592dcece1650c1e6fec12be9b9c8088b42fddec3db2ecb506e044292a5b8e
 AUX ethflopd.service 204 BLAKE2B b97258123ec2ef1e9b556fe5f81c33c14b3bfac7a8a345ec4be75d1a12882acbbfd5eb8ad3f766395ef8d3e59a5e71cba338cc2fc43bd61928f01b250a242752 SHA512 83a0421825835c35d0f0c7244e2d444002bde0459ed0aa3e4589aba67a6a7758958a7b8087ec9a181e37f8d5af428d53a06957ed0d5e099a63f9e9dc600c2efe
 DIST ethflop-20191003.zip 29858 BLAKE2B e5a4068d45c398d6c7bfd08299b57566c3d30bea4ef79692cae065adb61f3c41fd3ed568260e82e19d90e17c7b6d92c0698bb7f7c40edea9d44804a7a61e18ae SHA512 808e65d45e2ff74380bc2f1a31b7bb59fdca4acdf44eb7f60deef9aa0976462ddc64982e8a7b7c225d7f88e11a33dfcdf73fd7169f942018976d4d086e7ec477
-EBUILD ethflop-20191003.ebuild 799 BLAKE2B 356835bc9eb411024a4f06d9df6d875e5a27a52bdccd38301bc119dd9529cc7bee07f6318c702ebb42cc7f0920f1e8356d952b283e69fca1e763f40ffffaa21f SHA512 7a0d1a77e2383d5a92db717a51970a62e908e27dc3fd09fca28bc9b931816f9a9df939384a5f6f32ec86d550e6fad07d0cc0dfccd9ce56fe931dbfe22cda05ea
+EBUILD ethflop-20191003.ebuild 798 BLAKE2B b86ca09cfcf9c159ffa74b0e29d2dcdb5c8fa3eb8035bdc71f9b74b41d12610b7cbdd0cf6fd9f9d8cb170ea75568009b1a993a51b5a2bfc8efcb2ecddd3ebb6e SHA512 b2501ae191944588e26f273a550c660d6d240e659bc1f084c88c608f7ac3998102ccb4e2f4e74ecd09fbbdce81da28330d51615f064a358d2d94c3e8840d0346
 MISC metadata.xml 1004 BLAKE2B 7180c03af4f161c41f3acf22dc218405837c04802890770fd2acde2130af5ed73d1e445ea9f9634856ac88fb5ace65b74e9323fb64f8626afc03516867322658 SHA512 90869b4e0606a66705500611fef60372426a830a1afd1df05b4717fb4176e17b53c6d0fad2822161ebf5f4cec3f53d8ea0b325c8ec1c30b7734b7f874764217e
diff --git a/net-misc/ethflop/ethflop-20191003.ebuild b/net-misc/ethflop/ethflop-20191003.ebuild
index 00f6de46a927..2849cf041382 100644
--- a/net-misc/ethflop/ethflop-20191003.ebuild
+++ b/net-misc/ethflop/ethflop-20191003.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tsr"
 
 BDEPEND="
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index e13de0a8c65b..92261498a9f7 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -6,5 +6,5 @@ AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11
 AUX networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch 1350 BLAKE2B 4cffb7d29c1ffdff7106485e2fe1a74ec403c8b9cb5235a066021fd91d0231aef7b9f621cd82706e58adbe27085d13600a651f5957e6a20f3ca241af483cf88c SHA512 f541c873f097b8424e04fdc0fb2ca6256a3e17cb60021f1c931908ff39bbf95de3e40975ea62b19c18aa35476a5f7e07fc96135a0fb0bc1128acc5b62724bd3e
 DIST NetworkManager-1.18.4.tar.xz 4875196 BLAKE2B 9c58d6d7317562332dfa9639f8e236a0a7f6b58e7dad5af83916b1c6178899a6bcf12bc289fb401d84fd6420306364b4c4c0a25eda2a08eef812acde1862a18a SHA512 9fd22775a400ee8d20c75ebddfee842bfbd8780966444dd537e371a65918f41640e921d2c441853afe8f72d693e9b4c1415435136a07004666a6af4799fd3350
 EBUILD networkmanager-1.18.4-r1.ebuild 11317 BLAKE2B d1708bae2519251123071b311d68703cc4df21912023506d277bf7c134e8cf28fc3dc325014fb8c0497ec85dbe53676b60e4dc230c68a9e3a9616fd2598d0c5f SHA512 091027b715f06d8f347f504c35e70de20f3a1042bb263dde8b2a7366e651f4c3a59bd64ae90ebd6498d5b442696e18bbe525ad130049d6076af773a0fefc7ddc
-EBUILD networkmanager-1.18.4-r2.ebuild 11471 BLAKE2B bb508b98f9b9e85e9919a442feb46f1ae5a2332470876a70dffd40caa6126db42a5cc924653b1550f452a8354c572c05f053cc31de2dc275d033bafc645df3cd SHA512 2222703afc4e96afb876be3ea21d0e95fa92c68311f833a301a58854308bdd6ac6ad336e13cc5406bc8bc877ace8b63854c61835a9795c8eed18acae6849e980
+EBUILD networkmanager-1.18.4-r3.ebuild 11461 BLAKE2B 524f22c3e62a572233431741196dba110d977956a79ed82eb8e33499a23db54029fef31594f39459602fe1f3d443e2218c6d018705be26c5bd2d01162a83c321 SHA512 9fd2a839fadb5fa4e3e6b59a645deb880325df545ec333b4469a0404bec46b399ba5a921276974164c1457f054a8fe53827153b17cd048c43667b4865783216f
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r2.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
index b5aa6112e4ec..a90f9a4b1cb8 100644
--- a/net-misc/networkmanager/networkmanager-1.18.4-r2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
@@ -262,7 +262,7 @@ multilib_src_install() {
 		# Install completions at proper place, bug #465100
 		gnome2_src_install completiondir="$(get_bashcompdir)"
 		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/{30-anon,31-mac-addr-change}.conf
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
 	else
 		local targets=(
 			install-libLTLIBRARIES