gentoo resync : 14.12.2020

5 files changed, 20 insertions, 6 deletions

diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index a30f0de4d304..efdbfced4aaa 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/fusioninventory-agent/Manifest b/app-metrics/fusioninventory-agent/Manifest
index 264a829e64b4..8a855bd2daf2 100644
--- a/app-metrics/fusioninventory-agent/Manifest
+++ b/app-metrics/fusioninventory-agent/Manifest
@@ -2,5 +2,5 @@ AUX fusioninventory-agent-2.5.2-dirs.patch 2227 BLAKE2B d75dbaf7a9dd1bb1a90e7d05
 AUX fusioninventory-agent.confd 71 BLAKE2B b00ff3f7d15e332956498ff1896f9c358b34f89382a272d7aa94fe2b6985b63ff3b62cdb7bbcaaad44bceb7500c61a9ba343627ccb3311bc9c71d5d6089890dd SHA512 d64c9c66857ce69ec566dcd720534ec8327aff5ee7a6919235f6bb6e62472096fa54d64d996cccef8e59a87bb38ade3e403f1f5ecb835361c0419d16d4c36bfc
 AUX fusioninventory-agent.initd 531 BLAKE2B 90e40812e76ad9d2d16e50b32dd228f9b55f7e519aae96ab8814ae3c977114dfd21e71b20497492f0dd52e0075110af0c50909c8eb23f311a6bd86a72444b626 SHA512 216814ea13b092bed24813914e5f1a481d6d6e75b2a4e3fc2d5b5393a21e516792550436546c59d364a8234a076fd6910de22002f1513763ed640576d14cbed7
 DIST fusioninventory-agent-2.5.2.tar.gz 2728830 BLAKE2B c6a26c4adb6b8e6bdaf829e46dffa47cc629731411f8b6e55a17eb83bd69536ca0e07899c5e3536ee3962326e643157c60ab8825971b2f44995e42f04e689321 SHA512 5bd39652fd3b857a4364fa300b07b8a2580bdafc6b84f95ab852b60b887ce8278bd99f85b74991b6da5cc21e1636f33c7125dbc27a02df915df4ea6f0ceffaed
-EBUILD fusioninventory-agent-2.5.2.ebuild 984 BLAKE2B 51aa8f0d4977edd6982a3b0e72858e5dc6f95828b53db1bbb2adff0d668e3ee6d9660e15aa77a5ce59eb9ae828896dc943f87f851dd56793bd8d57df0f0f87a5 SHA512 09c9dd855f9d781271778c0b42426aa234c29d566e39d17c0f23b060642585bff5ce342dd139f22722aac58df5881be78e8c005d422f813a1172a3c22af16516
+EBUILD fusioninventory-agent-2.5.2.ebuild 1349 BLAKE2B 67f1cb5d84d09403be0bbb22b6c3dee7a2f9c0e51640e7a0e9aae73619e0a99440406aff6874d35f028724d5eb6b4284d71d99bbc3f4716c60b479347f061006 SHA512 ce4bb5f3214a0ede764a3a53c44cc9eee67ae8f82fedd51464eb15c298814fb06b12cfacdfb57e32f2da0caeb4b8ce397303e3c8d3c47c879be7e899139dde35
 MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild b/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild
index 50d906752ad4..9756d4073782 100644
--- a/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild
+++ b/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild
@@ -23,17 +23,31 @@ DEPEND="
 	dev-perl/XML-TreePP
 	dev-perl/XML-XPath
 	virtual/perl-IO-Compress
+	virtual/perl-threads
 	dev-perl/HTTP-Daemon
 	dev-perl/IO-Socket-SSL
 	dev-perl/LWP-Protocol-https
 	dev-perl/Proc-Daemon
-	"
+"
 RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-perl/Module-Install
-	"
+	dev-perl/File-Copy-Recursive
+	app-portage/gentoolkit
+"
+
 PATCHES=( "${FILESDIR}/${P}-dirs.patch" )
 
+src_prepare() {
+	# gentoo has ip under /bin/ip and ifconfig under /bin/ifconfig
+	sed \
+		-e "s:/sbin/ifconfig:/bin/ifconfig:g" \
+		-e "s:/sbin/ip:/bin/ip:g" \
+		-i lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm \
+		-i lib/FusionInventory/Agent/Tools/Linux.pm || die
+	default
+}
+
 src_install() {
 	default
 	systemd_dounit contrib/unix/fusioninventory-agent.service
diff --git a/app-metrics/nginx-lua-prometheus/Manifest b/app-metrics/nginx-lua-prometheus/Manifest
index bc3f966afa78..3caa5dc73bcd 100644
--- a/app-metrics/nginx-lua-prometheus/Manifest
+++ b/app-metrics/nginx-lua-prometheus/Manifest
@@ -1,3 +1,3 @@
 DIST nginx-lua-prometheus-0.1_pre20170610.tar.gz 10307 BLAKE2B b08fcb126a6d7034c143c7e96709f3f2751d90f60f6b9225f55ed46f7f211ebcf5f1688bd8b2c82286e329dd23e09a5163ad316ba6568755936253e8e55590f1 SHA512 df1022a88e82e388e68146f81e51a53f9b0c1a14a43d58e468d258ac0ca9875c1c88af44c46c91d89dc7fc1fef0ffebdb9163f886d85fde995e61e2cac3b5c81
-EBUILD nginx-lua-prometheus-0.1_pre20170610.ebuild 828 BLAKE2B 1d0cf2b5a48155ed77c18942228f071b9a55e8106bb9ed6c9299adc1a427453726dc175a5502010aed6d412ce630ea167731138496748127b3ef986c846c5794 SHA512 d8fb080bce6eb397fd1fc895444f7162eaef5dd8f6be2aef75cc4e9d0de31426192bfec0ab3c545e63f595f8ab14ca061308d96baddf73f7a2cd8529451bf96b
+EBUILD nginx-lua-prometheus-0.1_pre20170610.ebuild 834 BLAKE2B 91067c5d303221ff5b032799d8a3214c7524050f5ccab781bc0307bee8f74a701050d2084e1c6a305d4b04f8f176b93a5c5647f284333901a3e3b9669a216606 SHA512 fb24df966359d0912cf3b725c07cae02b06abd06c92e2c1a60b7e613e0bc72c9141532df89d982fc985a25b26e2c3e2c6c7cea136e512cfdeb9ba8821122c6f0
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild b/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild
index b8af9afe146c..7f60758a8963 100644
--- a/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild
+++ b/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-COMMON_DEPEND=">=dev-lang/lua-5.1:="
+COMMON_DEPEND=">=dev-lang/lua-5.1:0="
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	www-servers/nginx[nginx_modules_http_lua]"