gentoo resync : 16.04.2018

28 files changed, 344 insertions, 108 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 2a7381b1ef74..9d686db9288b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest
index 7ebe9e2e373a..f00327ec881c 100644
--- a/sys-apps/colorized-logs/Manifest
+++ b/sys-apps/colorized-logs/Manifest
@@ -1,5 +1,3 @@
-DIST colorized-logs-2.1.tar.gz 9997 BLAKE2B 5d6b184102c63dad8526f1feebbd84531a18f2505801f4bedd62cbdfa04bd919b750b60b37fec5449b1a5b98500dcbd7feec7b7155ca0c779d31ea66d8305e28 SHA512 d03919cfa19d6df41bcb9dd6bb29e436febff4ed4d50d9ce83910bfdb61acbf323ecd4dcf9eaa9cfae3bb338b2107f1d156815848b8da8b470c50651650dfee1
 DIST colorized-logs-2.3.tar.gz 10270 BLAKE2B 3b0798139e96512b4d544c76bcbece81283a77dd7deca8b018bb0ddd9535eb80f88b8f10a9a9a20c4f98b67cc97bb7673de80339bcc45c5ce46b8e8dfe53a53b SHA512 a15616f0548c0a91dc290fb6a9c6a8376b66ebc2fb1af21e1caed03c95c07b8536d8a81dd9e199d54ffa5339d0f777cabe75e23fda3bb916575fe3ac31bf51f9
-EBUILD colorized-logs-2.1.ebuild 654 BLAKE2B 071c425ab82afe77eeebbf396dc06febd8b517a700ed4f33ac84ca4489fee4c09f714763c4e4a46edc410330df9b8854a9039218da8c9ef606402e00311804bb SHA512 0b3354ed6b78821856f61b70a9925ee2bb27972a44c1982bd287a539674bfb7c961016f3d8685a751b4a1e3262c7fb2753bc0faa3ed143eb335d7e9abb5b8bc3
-EBUILD colorized-logs-2.3.ebuild 656 BLAKE2B 09244339e9bde0e720701a761edd70dcd3b4dd3a87c57c306b67fe16e2acad1ba41c4db9e8c02c989fcd7735157c1e7a3e795db9af5d1b59ea2571668623e6a8 SHA512 85028ef83188725dbe0a17ef341ca9f4f550453b5cd4aa92560b1e8cd9e36dc311e0cbe58846ec73bdb1b2f2bffe7cd542a0b120b0054360c9ce071025c7c28a
+EBUILD colorized-logs-2.3.ebuild 654 BLAKE2B 071c425ab82afe77eeebbf396dc06febd8b517a700ed4f33ac84ca4489fee4c09f714763c4e4a46edc410330df9b8854a9039218da8c9ef606402e00311804bb SHA512 0b3354ed6b78821856f61b70a9925ee2bb27972a44c1982bd287a539674bfb7c961016f3d8685a751b4a1e3262c7fb2753bc0faa3ed143eb335d7e9abb5b8bc3
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-apps/colorized-logs/colorized-logs-2.1.ebuild b/sys-apps/colorized-logs/colorized-logs-2.1.ebuild
deleted file mode 100644
index 0e22beb33d1e..000000000000
--- a/sys-apps/colorized-logs/colorized-logs-2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Tools for logs with ANSI color"
-HOMEPAGE="https://github.com/kilobyte/colorized-logs/"
-SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	# Rename to not collide with dev-python/ansi2html
-	mv "${ED}/usr/bin/ansi2html" "${ED}/usr/bin/cl-ansi2html" || die
-	mv "${ED}/usr/share/man/man1/ansi2html.1" "${ED}/usr/share/man/man1/cl-ansi2html.1" || die
-}
diff --git a/sys-apps/colorized-logs/colorized-logs-2.3.ebuild b/sys-apps/colorized-logs/colorized-logs-2.3.ebuild
index bee91bfd74a9..0e22beb33d1e 100644
--- a/sys-apps/colorized-logs/colorized-logs-2.3.ebuild
+++ b/sys-apps/colorized-logs/colorized-logs-2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 1414d757d34f..b88f7abd4e58 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,5 +1,5 @@
 DIST dmidecode-3.0.tar.xz 58704 BLAKE2B d3e22cfeb8f537f461523d0927cc5eb5fa6214638b8a9360b2159abff1b9f60c8a8753f24a233a77f7c413b074f9a910f000a0c49ca166ebf3297ad673e9fb93 SHA512 fa31190e43ae7a0b61f6313b45f5eba3ab66390accd587129419e48fca931b631cbb331d6893cf0c1bfca94c86ff8c557215166e0881dee93b3af10a86878eb1
 DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9
 EBUILD dmidecode-3.0.ebuild 1145 BLAKE2B 874b9c55f5e927b9418f7f4a41bdc97cb8c461c279007052a3bb7f182154ad7602508eb406a20c5d4e786662e1aec90d01536f5727cf0bc4e172e9f441729433 SHA512 9a361a7c80194bb062b6d27d9f06bb8446298da1a09801223ab9c52e275904486945229a769b8441c51eb0c508982ee6eae116027ef3b22bded76b9f132edada
-EBUILD dmidecode-3.1.ebuild 1146 BLAKE2B 276c7369480310f754f4326227f85a49c34b6e9438b326efce710372b56c73f7435c5c2842e720c4ff2ace3591cfbe7d17e2700c521a30e7a775a587c2b50dd4 SHA512 495447b41de16bf2ce1b84c4afe76d47f93393a27b7a7e0e224bcb1469bc4888b450bc6fe9e7bea5d6ec5237d2a3aabff42672be2aafd66d9ce90071a4fb477c
+EBUILD dmidecode-3.1.ebuild 1145 BLAKE2B a470eaf8f3dc2d9739a2010fcef5366f3669b4e34eb14a9ad96a44bcaa1c2b71db4fa7a1b50cfb9418d3a703be603f12f7b7d70d6ad5ad97eb86c8cb4df6a319 SHA512 29421a3b94aebd1491e26a2f1a255de47b1c222964b90214675db853c368b8966d1345a7a713c520fad7f44e6996b5cdcad52e3b69cd659dde9e1c24f5ba2dcd
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-3.1.ebuild b/sys-apps/dmidecode/dmidecode-3.1.ebuild
index 55312c80fbf6..7745384ae385 100644
--- a/sys-apps/dmidecode/dmidecode-3.1.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
+KEYWORDS="-* amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index ab2fda4589a5..cb65a51f9edb 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,13 +1,9 @@
-DIST ethtool-3.18.tar.xz 198780 BLAKE2B 18484b9b7af3b9bffe3d05a12bcee0587587f5c1e2ba3f91de43ccf8045140e6f4b76118261f061a3df1c1d57e9d2e17347ed750e7a30c9540d16345d2db9057 SHA512 06fba3458c69bd414f5c5edaba006f39e0777614521e5dc37859d1947d3069f7c04f8ea2513f16a930183fb98fc4b6e7cc374a2070787a750673cbf01943eb62
-DIST ethtool-4.10.tar.xz 216320 BLAKE2B 7144fd9d5741c5d855910f5493ab626b8f1a7f60c5d8c479c1eda3daba62d5226fe5dbc23f9de1f45a25f6171840352fe0f33604dcb2064b90049e8687eb3e7c SHA512 6766c468e141300b4828e6bdc98e7e720d35bb122405fc05d4ae94bbdce50b98e48ddd0505b09c990040da67e942e08a88b28b46d94aca8d544caf0aee4aac36
 DIST ethtool-4.13.tar.xz 217472 BLAKE2B be60c4763a06dba4b246c17b76dd10bf956e69d19d02c09b6370b1cf92c5c8a6e97f5048c98dfbb3a72b8c5889302538d8f11b9771120724b53949f9aedd11c6 SHA512 d0f881b88379b959cd34949c924b0e4d4fb1af0873192cdf8ec9cc2d2d677a4de13021efabb0a1aea1932ef38a6952d9f3eb040c478a9af770054a6170777789
 DIST ethtool-4.15.tar.xz 219408 BLAKE2B 7667f3e24f62c6dbaeb2590e79b59198d15ee44a46440c9af917154a5e5b6fde5f29b88ada03fdc195a642c2585c16ae503cf04b1be941d98413a596e4396ee4 SHA512 7ffd76b17b56de4182a14c2a77bf3026715f4af4c60809aed192f5631cb72173ed3c5d451e54711a73b65fee8339d58c857e83ddf60b85057bfed20863476527
-DIST ethtool-4.5.tar.xz 204244 BLAKE2B 39a5cbd22e330e3368130be3753cd7743b1b1b5c080edf302a733d38aa3bc0fd3a4c345d25109d973793f75abfc8dee0116d4e1744abb43e5a028ec432c89d3d SHA512 fa5b4547de0315c54113d9c7baea53dd4bb6e46c9340255cecf9a39f549190cb5de9db98ad4330a6eeced3a1f9ed6f2ae42cf5a602c0ef1c5a9fd17c825558a4
+DIST ethtool-4.16.tar.xz 220676 BLAKE2B 12eb2e69493bb83b3789747a8019e3f8b7d6d39dbff7b1fc5fa6352943334881dd47c35d355d53a07ba517e91663aa623afb5ecdc1a1f57137dd44f20f492954 SHA512 c0cd28ca34e7fdc9af3335fd0b666b4b879ecbaf0c0bccf032aa36fdd66cbb01b6ddf16c6b60823d46a81f9b5f377047422ac88cc7cd0a869e239a3171966c66
 DIST ethtool-4.8.tar.xz 214932 BLAKE2B bbfbc7eb23a7fe057e28f22fad962bc8b46c581e4c6fc35612c345863b300478232b95569a2e35fd26f76eb48f824bdf7dcd0cdb8bdcc136e7494c5d39361f2b SHA512 ab1f13db57129fdef6018d8d8ee4ad9733041813aa0b7a29d46407e93d3c264a42aa24e2f1892084d523ed9946c62c6b9d2ae886629aeb013a58a0946fd6be96
-EBUILD ethtool-3.18.ebuild 447 BLAKE2B 18c946f8af0c88973aa4cb9ba8457f465fb167d9ceea426ccd1396248a31234b72004e13242188110632baea78259641a0d443a3d260c8599a2a589b18551c50 SHA512 f3c0c56e661f8b4c5a927783074d4d7cfc9d5b8250fad6ca78c8cd2bbf5c839ef966a8795109d686ba646a63f854a3d14fe0d388c958808a264e440178f40e3d
-EBUILD ethtool-4.10.ebuild 463 BLAKE2B 4a5d0363ff7782e7cbaf29e7ea00a43ff4f1caa6288f13f5658eb7877d67e22d3a6f73b243cb2cddffedd3ba4136b06455efaa16d07d3de6d4c57fe7f5cbadef SHA512 6cdaf830de48e35773664091b1d249cf5648afe6717f02f225d380578cda2c5fc344acd2c2729ae1262c898979149da9bd34bf67e3e65ca2253cf0c48b86ec0e
-EBUILD ethtool-4.13.ebuild 463 BLAKE2B 4a5d0363ff7782e7cbaf29e7ea00a43ff4f1caa6288f13f5658eb7877d67e22d3a6f73b243cb2cddffedd3ba4136b06455efaa16d07d3de6d4c57fe7f5cbadef SHA512 6cdaf830de48e35773664091b1d249cf5648afe6717f02f225d380578cda2c5fc344acd2c2729ae1262c898979149da9bd34bf67e3e65ca2253cf0c48b86ec0e
+EBUILD ethtool-4.13.ebuild 460 BLAKE2B 42b2f1e5e6b5ae5f551fe2aff268141a24492136b760c3f67fab984282899bbf8c9a3f5adf35ee83cff71f648cf084856951724f4ea358768936f16abae58765 SHA512 e271529689e8297a0420aaf64da8d9e2bf1091e8b62efbfd62916190c0259abdac7f1d903e7dfdcd13e46629daaf2cb9a689eb9ab9e0a1585b8227680ac85403
 EBUILD ethtool-4.15.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
-EBUILD ethtool-4.5.ebuild 456 BLAKE2B 3e865ab0f32296681cb4e28f186e711cdd1e4b20fd07c587c07f60223258f45325a28cec162f2c77ba77bc88b5344d06ce37e322d020aa457f3aa8125c20af1c SHA512 e366a4fcd39d80312df50324883dc72338622dc08aa0f0ed758a9ecddaa0cb6aa9d6bd805996d8b9d51f8fa8b3235c3259064342851eeab4c434315cef59220e
+EBUILD ethtool-4.16.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
 EBUILD ethtool-4.8.ebuild 453 BLAKE2B 46fd2c76b13b3ac09bf91980870c7eb70a2600ea46d3146b006b54d1b21dd72bd50cd01f29504ae9329db8be393fce2cf1bd540a006278e0d2530278b3a84ca7 SHA512 f5ebf39536df9e46be717e5e42334472c7f30d02a3dd9f8b1fbab8e2242cb0c67e573fb829fbf74f115d431b777a83ebc17005150751d83f8e681e5966e8fce2
 MISC metadata.xml 814 BLAKE2B cb6f1a2aa029191f22615d83df4f166c7c53c70ac6486deadab63ea5a463b08ae9aa8392f0a2732b83efc2a476c2416cd94b2e47ed9b09097217da5746d110d2 SHA512 7ba75f7aa20f8cc48b91b7576449e416abfc412fe26670142d4ec1513b6a3939858b298ccdbf72c208c2d70b5c00eea88dc3c4201e2187b188ed4a9d33cf0272
diff --git a/sys-apps/ethtool/ethtool-3.18.ebuild b/sys-apps/ethtool/ethtool-3.18.ebuild
deleted file mode 100644
index b4535497ccc4..000000000000
--- a/sys-apps/ethtool/ethtool-3.18.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
-HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
-SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-
-DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-4.13.ebuild b/sys-apps/ethtool/ethtool-4.13.ebuild
index 04f5d5de3b2e..a78105da4509 100644
--- a/sys-apps/ethtool/ethtool-4.13.ebuild
+++ b/sys-apps/ethtool/ethtool-4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,6 +9,6 @@ SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-4.10.ebuild b/sys-apps/ethtool/ethtool-4.16.ebuild
index 04f5d5de3b2e..373b38775050 100644
--- a/sys-apps/ethtool/ethtool-4.10.ebuild
+++ b/sys-apps/ethtool/ethtool-4.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
 HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
diff --git a/sys-apps/ethtool/ethtool-4.5.ebuild b/sys-apps/ethtool/ethtool-4.5.ebuild
deleted file mode 100644
index fe36d509fbf9..000000000000
--- a/sys-apps/ethtool/ethtool-4.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
-HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
-SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 4d2dd943d8a0..273b932f4563 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,4 +1,6 @@
 DIST file-5.32.tar.gz 797025 BLAKE2B d00196a2331b7325acc1b3f52d011faa3864db526f1962e4fcb769a92a715a1ee9874750cdde8f7c5c48541ecedea36c0fbd788a5ee9eb175cfcfc984acec430 SHA512 315343229fa196335389544ee8010e9e80995ef4721938492dedcfb0465dfc45e1feb96f26dfe53cab484fb5d9bac54d2d72917fbfd28a1d998c6ad8c8f9792f
+DIST file-5.33.tar.gz 817060 BLAKE2B 735f176f09085243dacaddda1b734ef2191ff1684f08022ed1874e84fd0c84679b5a765383c5c5ad27a7216abc23b9c2211fb7110846122563e18285de0f0e51 SHA512 36c9f2e2aa814b5557eef114fdd3de159688c7a3c9632a9f5c6355c4d2a5694cee81279bda80897616fca07289a7fedb1f797439a2903c76dc84870694773c9e
 EBUILD file-5.32.ebuild 2899 BLAKE2B 5ec2b6b9e369d603736a4384006fb4c07a8abf23859a9d89e76bb7a0257e852bf290a96e990ce4869ebdc3f36d5033d56a7801470cd847e09cd84aecd9bc3d67 SHA512 7a01b1f616a52d8079fdd33060263922bf1279fe20c64036b365531a1e27513af28a96acafe1dc7919ff602475ff79abfa0b860645c631ae45239bb610905a63
-EBUILD file-9999.ebuild 2912 BLAKE2B b63c099f3e2036f91a8d9866a453aa688b20fc9b303d1a9fe0f83ed3ee110eeb5120eaa657302e955f7dbfa81d6f3b92a669d6dffa948caa7885ad2d50e431bb SHA512 2609753025bfb22cb4a371d4799df8afa6e4c7393145cff6cc2751cd41039aee6b542ad269be823997ac994da2a5de92a5beba094d8a89b8d3e847ea45ff6e57
+EBUILD file-5.33.ebuild 2956 BLAKE2B ce60b2e91e3fd36c5f7651163b80241436dfe2a2439a32ac87477ecc743e14dea8016811283d339ef157c79bcd93de7193ab44a1dca021bdc55551e7f9db26f1 SHA512 efc413413d33ed5779a83c242401974c9ff0961fc5ee026a3ba55f8749cf198360e9aa366901ea86c20049d8c48a721512038898647735b4de6ed2010e0a5c02
+EBUILD file-9999.ebuild 3022 BLAKE2B 2b873f5f3b38b9638e4bb38d2f24ea48e88d1eafd6c7a62cf5effb74b0ba1811b9122bac135e9b5e32eec216aa660282d0ad8a198ace5828668485599e74ab96 SHA512 9bdfad511f50bae091e50fb2b228a30764a25c9c5c2d148005df9af54f2c0a415546ecfc645a72a852fc10be0ac84781914288b1bcd1a50e8f44d71713cb20bc
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.33.ebuild b/sys-apps/file/file-5.33.ebuild
new file mode 100644
index 000000000000..43f99c6754cb
--- /dev/null
+++ b/sys-apps/file/file-5.33.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit autotools git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="python static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README{,.python} || die
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-libseccomp
+		--enable-fsect-man5
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		tc-export_build_env BUILD_C{C,XX}
+		ECONF_SOURCE=${S} \
+		ac_cv_header_zlib_h=no \
+		ac_cv_lib_z_gzopen=no \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} -static" \
+		CC=${BUILD_CC} \
+		CXX=${BUILD_CXX} \
+		econf --disable-shared --disable-libseccomp
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	prune_libtool_files
+}
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 3c9e2e50e4a6..5f51b583c407 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.darwinsys.com/file/"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="python static-libs zlib"
+IUSE="python seccomp static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
@@ -31,7 +31,8 @@ DEPEND="
 	)
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )"
+	python? ( !dev-python/python-magic )
+	seccomp? ( sys-libs/libseccomp )"
 
 src_prepare() {
 	default
@@ -46,6 +47,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		--enable-fsect-man5
+		$(use_enable seccomp libseccomp)
 		$(use_enable static-libs static)
 		$(use_enable zlib)
 	)
@@ -70,7 +72,7 @@ src_configure() {
 		LDFLAGS="${BUILD_LDFLAGS} -static" \
 		CC=${BUILD_CC} \
 		CXX=${BUILD_CXX} \
-		econf --disable-shared
+		econf --disable-shared $(use_enable seccomp libseccomp)
 	fi
 
 	multilib-minimal_src_configure
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 3bcdddca507e..7f885448e710 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -10,7 +10,7 @@ DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688
 EBUILD gawk-3.1.8.ebuild 1782 BLAKE2B a960ff46bb378cadf1b7125fff29ac6045e403d1052025621fe565145f792a43a79cc4ac540faf217670f69ffc8a0b9b5af4b7a231de624c3c0d6832737c68ac SHA512 747c9f7f32af7469b7359bbaa7e329a84c78aaf0c8c122a0003bb3e32dad47d1470edd30f215504e0305027b40a3e72e8000ee3889e7cbc4c427ebd12bae884c
 EBUILD gawk-4.0.2.ebuild 2076 BLAKE2B 73d9ce392a42ee14556b70be84ed284108212c471d7e31faaaf07305c525ed73d16df7d3bdc12539ca50352c861a4ed7ca291a376e7516c0f4facf1bc1e813c7 SHA512 69f941d2eb134277c70b4e7ea4364a8902d7522903064192c7f306219128fb45f0a2d42ed79c852da918acb0c740e49052d36a5e27d331d239c6e6d811b7cc41
 EBUILD gawk-4.1.3.ebuild 2003 BLAKE2B 55c637567276e73fbb4032c3d297480a769ee0769a354ec491a857da2afb9708ad650d5f70db1224d315dd82675316cff38ef0ac3af83cbcf280dbfbbc24078c SHA512 87b224aa2cd9b231eb088b588242860ef323913ec64cb403f7622504f82e8d4431fc7f0b53d5bfe33df5c2852b5b6390b235870d4a9e3058fd4803dab2eeadd4
-EBUILD gawk-4.1.4.ebuild 2093 BLAKE2B d954092746e98bb2568e119385482eb169c8924052bf7985fe16506a7c2fc73451c2b9069d34ea560a9949f0c7a9b83c2f622c6c276512b773acbc236f8d07a5 SHA512 397799f368c3b5ae4e4cbc484e3ce8d2e7d35db0507523bc3626eed83fb8921efc2d348ba66034377693c038a80afd9f2a2563bbe6ad1cfb94a71be835bd21a8
+EBUILD gawk-4.1.4.ebuild 2092 BLAKE2B cc3b756077a761cb1ae392bf37c1541e1c84ef86197b26e24a74c7dca7606e36e124039fa50ba08bbaca978ab7117be8f1a88acc4ebc14376b466f1505ba9101 SHA512 f62f71fdb3e8ce67c4803d16eb5e94ff885be3c600118a32ea4cbc02b0ce84ca37900605c17789a78851ea5c1b4ff1775b5af86b49184f6e868fcc7e3f52eca5
 EBUILD gawk-4.2.0.ebuild 2217 BLAKE2B 7167b9d789eb38036c4ae2d46ee00c8ab29dcf959920e92a3529380fd132126c27ef5125cfa52165551fb6134217230512f98a31259316f4977ff5013df56038 SHA512 8711fd432cb13b920561bf5ced80694c3cfdca84932301bf5ffa505a3fdc0d1d07f108534ba18cb386cc05061afa00466d301d46b69abc5502f315d094a982aa
 EBUILD gawk-4.2.1-r1.ebuild 2574 BLAKE2B 887cc51f129b56ace31986b3718c3ffadb8f19a197aa59427ccc706032e4373d0bb80ac6484405da2f2fd8417e8d7759a07d7b895ad59d415d6d9889ccdb6920 SHA512 4abd41cb11ba0cbbf8ccb2ef9459678af6ac6507a400a8cbd7d96f41045847101ab22721ffc2637e2717bf88f591f04adb817ae91360e8573ded16ea16c4c31b
 EBUILD gawk-4.2.1.ebuild 2204 BLAKE2B 82c60e85badb8d968c796c6aa83ed366b0b399fb32342bfecabc6aeba7dbfce73361b5a7968d9a61269d0c25cfda7c5add6159f62aee7dd6fc35f4f1bf93445b SHA512 b814c89f185cf3086c7a06f2bfe2a1bae616a9b5bfd062ab9c230c043f9072ead65ab438295b5c7abb430bcbc9a5c601ce41eb8ce1a0b8e429fbbb9a3881bb6d
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
index 5651a48ba487..d724377a8796 100644
--- a/sys-apps/gawk/gawk-4.1.4.ebuild
+++ b/sys-apps/gawk/gawk-4.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/intel-performance-counter-monitor/Manifest b/sys-apps/intel-performance-counter-monitor/Manifest
index d493ee68efee..2539a6653b59 100644
--- a/sys-apps/intel-performance-counter-monitor/Manifest
+++ b/sys-apps/intel-performance-counter-monitor/Manifest
@@ -2,4 +2,4 @@ DIST IntelPerformanceCounterMonitor-PCM-V2.10.zip 950922 BLAKE2B 3b3b0cf3e12e1f5
 DIST IntelPerformanceCounterMonitorV2.8.zip 931374 BLAKE2B f5a2ab3a3e8982adc47031ab3dbe9fd425cfb60de95687833bb019752a2a4bbfc4acd52a025cd61e37b14e3535489a9d4eb3b2cb6e1aa6fdbf58ff1100d42ce2 SHA512 7dbba8c051663a315dcf79224502d76cb4217a483a4b322f0be938e06b988e290a83b345cb8c60645aceb8283555067c2db529179782432ff77fddd538ef8b8f
 EBUILD intel-performance-counter-monitor-2.10.ebuild 1272 BLAKE2B 521cb60f84ed33c45db378a37269f8758673df9291eafc5ce09eb39a44ed938052f6070aaeb480f9f2fea79b582aeaf99377fc0dbfd31dcb67309b41acedeca7 SHA512 32228ee77fa382bdcd77bf5bfeaa68f098f056c4559d3ca76cfddbef86362c3a7a7ffbcaecca1b6077fa95e7f4d08b6363b96136be7aa1f9373873047e337782
 EBUILD intel-performance-counter-monitor-2.8.ebuild 1284 BLAKE2B 10db6775d9c07ca590a3126ca3769eeb0136341fccaed022d2aa39ea1dd538cdc942ed5770e6f46df9091d45e6dc6770bbdfe5196b7015a4f3c589eb196f6849 SHA512 5e08f4e52217543c767cbc7220824d681a546213242b315dc9eea7e7a953ce1721f2f27ef75f39c87bbbc0922a105c8c9a2b3cd0d480864654a78c260f01ddfb
-MISC metadata.xml 372 BLAKE2B e05f2d3f82d7d512f6eb26bee1c7f953b679194a5c68008d470a355d912f12643fe047940a03d315aab549c454d742371823a7fb324ad78694c79387dfb29af2 SHA512 3f58dff3f892cf24bda59fa222876784c7562c3dbd153164259216ae9ea27f32fc23b6bcbfc99611633b7a22aabf81960709505e5a362d048ec7d6a96b1f222a
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/intel-performance-counter-monitor/metadata.xml b/sys-apps/intel-performance-counter-monitor/metadata.xml
index 0aa48ac2964f..6f49eba8f496 100644
--- a/sys-apps/intel-performance-counter-monitor/metadata.xml
+++ b/sys-apps/intel-performance-counter-monitor/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>brendan@horan.hk</email>
-		<name>Brendan 'undersys' Horan</name>
-	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index b46c1882788c..3cbbdeb5e906 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -9,5 +9,5 @@ EBUILD inxi-2.3.43.ebuild 801 BLAKE2B 5d96bf7434461c805136f71af2f8cbe29455aea670
 EBUILD inxi-2.3.47.ebuild 801 BLAKE2B c4ad47cdced83771be89576fbe0f67f0696335db10111390987c8f690d75027e2bec0ad560b0dea0c88ea0cc4ec142c5ea24aff658597337c4c50cfca4d522aa SHA512 610b8fad3e0c45416edf0b0e313461b7beefcfd8321624209995fec0af9c29c68b0816853931dc665cc7db33d18fe7fec01830bd8d79ad1bd04b074564a5342a
 EBUILD inxi-2.3.50.ebuild 801 BLAKE2B 76fb610a56e89e59f823f63459c8b25f1b1de1e94d20f348b005d3c2100157cb1ee3f952c81facc762950fc9af14dac3cf1da09a944bcd0180cdb3a6a2b5c1cf SHA512 00fb80778b5510756ac782f17c81e57efb6f8aeb35cf30c8cd460b69993a7664795a22ea83954a8fc4775455d10e240878c0896c861f67315198f8ad67b2e616
 EBUILD inxi-2.3.55.ebuild 801 BLAKE2B abb1c53cb6a091142fdc7357a88e1808399c144a131cf1a593fe07961893d7a9d5ccb80583c9cd9624c4c6f50d013e0933b13a3a8c445871b0f4e56dd0b9f62c SHA512 408a987ff2be27b1f0e59a7269cd9b05c4ea60703c9ad385ef75760cf9406ce9f8f11acf8b0d626193b725ce2a3521f877f0723d92d4ca59175f517240b537a3
-EBUILD inxi-2.3.56.ebuild 876 BLAKE2B 4c113e271ebf57aec54d9530aef8e8f3d1e76166e725af284c494cba3add1c98fe1b078ea442d3e9e9251b5111741a8d9d3d9c1938d60827da4bd4c8c2f9708c SHA512 4b5204f1a54084b4f8c88887241462b5d931dac2094925e24b43fd335e5dc65fc9eb95480c5c61c5b411f287ed1c7c41aa9dd491f159cd1e2db447e425fc0f3e
+EBUILD inxi-2.3.56.ebuild 875 BLAKE2B 9e5145e256cbf92de2e449678fd433195ae3f7f74a20f1a77b7bf251b54b56afdb38865c6cfa270d84f6a5996a27dca7a2fe9e162b5749b52990d5729ed902ce SHA512 a4ee67b58ee48ce462dee98ff3255409fbd0252e516bcdcb78e0bd9cede4c2ffb9e7906fb44a5b0e0c1f9ab062b7540d3d1608965c8ac2c2f39c8670d0514015
 MISC metadata.xml 444 BLAKE2B 0b67e0f6a42d8b68edcb1fc907729e80cee8ccb0a77fbf768cb40f62e1d665852bf17897466f76b578e2c4225dd5180ccecce899588be420064c5af4b89e99c8 SHA512 f44e29945d98ff44784623624a9c891942c0b69b6272322bd4665a5d49684cc16ee9b01b7a6f60872286a0a96aa437f7b9605aa6820435016e84d92fc96d6fd0
diff --git a/sys-apps/inxi/inxi-2.3.56.ebuild b/sys-apps/inxi/inxi-2.3.56.ebuild
index f07ed4edeaf8..c94b899058f4 100644
--- a/sys-apps/inxi/inxi-2.3.56.ebuild
+++ b/sys-apps/inxi/inxi-2.3.56.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 MY_COMMIT="803a4595658f28decd236c6f8660841abc336cea"
 # ^^ because upstream refuses to tag commits with version numbers
-# 2.3.56 is the last version with no tagged release. 
+# 2.3.56 is the last version with no tagged release.
 # It is also the last bash-based release.
 
 DESCRIPTION="The CLI inxi collects and prints hardware and system information"
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 99e4f294d2e2..51583a5ac7ea 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -5,6 +5,7 @@ AUX iproute2-4.14.1-configure-nomagic.patch 7334 BLAKE2B d1a79a653cdaa5907bc93a4
 AUX iproute2-4.14.1-fix-tc-actions.patch 6665 BLAKE2B e2ff926f2122973bcbe61e16717b8a1c51b6b76a774b6ce03126b7664fc5beb47e4f38672910e822b19aadd5c369d00553b2e6b6c30c012e03ad37b023cac4f7 SHA512 cdde7bb5a0cb49471472a8412758023529976dcafefc6a759ce758fba1b0420c046ca6faf084df81ac11e7153ac820909b1b9ec41c04f643208b9db456cfda28
 AUX iproute2-4.14.1-posix-shell.patch 1841 BLAKE2B ba1ab797c264dc74180b85f842810af120462df3e15523f132b67968f7be0ae68086d9c01f33cc70fb7680ce2229c76960fe7a232ce6bd1069903976c7143349 SHA512 bb4c3c75c25ec551fe006ae15a0e3bc31c1f49861083894d6d51320be52dbac60634951332135b888faf9363857b53695f3cc418029445a4578b5e9233aec4f3
 AUX iproute2-4.16.0-configure-nomagic.patch 5104 BLAKE2B 49c1cb559afe12eccae26f4547bcbcf8a030ee37d1ef287c178f55f01472e3b5f04d14f25834c99d3df25fae06246086197bd11446f1f50970aecc261b595f08 SHA512 b46d7ec009f924cae2d32c16e0f45c49ddb68af70dfa5d1fc0806c2ede85c744261fd1157d8ac4b1b1455604de456e2f68075b838b42265c3bfa88c021752de1
+AUX iproute2-4.16.0-keep-family.patch 833 BLAKE2B d9ee15781df4af10997238306c53cda9cde478f61c85dc1d1ad4238ea27c53fff3737bc474a354e1db22a8524f1209e920c0c9b8589a483733f78f34e38bb6bb SHA512 0bc11d6b0b7ed0a89693c73e948f42a1a8ad471e58c557a70d55c33acad53d4e6cf7dd07f92f840e73da757b094131c9ada29543d15e4f8dd0590d59a3616088
 AUX iproute2-4.2.0-no-ipv6.patch 1336 BLAKE2B bafb155e6bbd902eb0fff7d8875cc4ef7956de0071273dd373ebd09ef46ba23eb22f4226a044585faa2a00c9e4c2854e57e0e06eb1ac735edea9dce2721cadcc SHA512 f4219a094f367c9f8fac089beeffca31abbbc5d4ade1681e23a92f3dd2e1a95f331322938936b0b1771ea5a56224e0f14008f4d38a8708357a5d2b2b70efbbd5
 AUX iproute2-4.5.0-no-iptables.patch 1022 BLAKE2B 5e073c3e78491ae86b137ecbea2362c25c98011121cd7b59b8791227638918ad34c417f1ecd48459ef1901c7ff015463f15e5f8343d46d4b56e5555311e3c8d8 SHA512 3a3e7a66f1528dc8d03fc6a13f363ce890d0c23c2ab8df966144d8764e95cafca168bdb7dd79cf1a8dd1e54be36939f2e6465ca6176e3bfedd222eb29901f98e
 DIST iproute2-4.10.0.tar.xz 626944 BLAKE2B 8d37ae67785cd4a3110f989b0ac635c1cbdc8258afeba5894b58dfcee49fdd9a4c86d8c1693ee5c5a933ce54396dbfed054dbf7fb4888c08563c36c13c282a65 SHA512 e54477e167455e7ef5da4adc168d63eaa96091b63dc987fffe918cbb005eceed18a62283ca99ee2512dc0e960f47ae21b39ffbe399c1612fd9cea147c34c581b
@@ -27,6 +28,7 @@ EBUILD iproute2-4.13.0.ebuild 4213 BLAKE2B 4a238544e35502f785f0916ec5bd255787b01
 EBUILD iproute2-4.14.1-r2.ebuild 4092 BLAKE2B b3e3ae2b24182aa2d99f16120231bd4ac2029b73b9af53f0098046ecce73049e3dac510ee405f4dd12aa8c0e45b0504b7f82425c8063d05b5a958475ac2ce9d6 SHA512 c4f5cb98704d5a78d74a17a057bebb89f059c0a622d5e7ed28c6b36a73ed6be6d2a9205ed6b1ac4401f23ae46372e25d85a1038631d6ed215b2fd68c2e6a4c73
 EBUILD iproute2-4.14.1-r4.ebuild 4275 BLAKE2B d8d6a43be5eb593ab7107bff4126cda9f41fff88ccb72fd4d3aee7464457739732b2e3a161114302f7e1d9ff18a5b3c7d73a92ed523254ff4857584bc2baa109 SHA512 ae5db8ad15d20df0ec18e2703d43be081189366f535ff700d83da449eed8c120df869a6d2873e817e07bd2920eea46387bda0866ccce0b48d0e7a71e8faa8752
 EBUILD iproute2-4.15.0.ebuild 4214 BLAKE2B 391db4082541f9f23fef2386194590da5dec77a8dfcaf43b0335d0e6a7ae6417a8515ec206ad8557660c33ff7a31ff6b14dff303d6499a5c3576516a870cd6c4 SHA512 a04301fe1dba7903c6043612e5321bd6b231b7913d67973a80abfa228156c9919c8b959248d4f092776603877fc3661001b529f8ca032a0a996ac93425139d75
+EBUILD iproute2-4.16.0-r1.ebuild 4265 BLAKE2B cd5455979f5ef67dd6b91af2b78d421a03acaa3bcbd08d3a60c84e05d9ec1499efc54919aafc2e620cfc9b4658e3f609ab7eb501f85f8d977e86571ca4ef4bee SHA512 72adb54a708c5a69e6d29c13b20a0da1c63a4b3d7a2402ae55fc5ca072f752101440862dcf14c16f26fa99a8cd9c5239044284253daf07099633a84ebaa38ae7
 EBUILD iproute2-4.16.0.ebuild 4214 BLAKE2B 4c6a9d68cb27d3b41e8da00e1fc25c083c5277706186414d407c9000b4343dfaad8913ee640e9060b1e9acda5ed43fa642631ab3b2bf8c3a956ed1ae68cebd0f SHA512 30839985403cbda2401bccfb822d394590508836e0e780bf321f64235f372819225afbbd4dcf4ec3d05992435408ebcaba401bb7c7f2872f5e474bb2b3566f5b
 EBUILD iproute2-4.4.0.ebuild 3874 BLAKE2B 38518bb4f4610a04231e03a0068b0cd232477202c2efeeab9c42883a155707d74535e7398347316bff6d4c7833ebe6893fcac246fc756780febd6e4b61f0a486 SHA512 d21f5f77a404fc3ecd70728c64af64a24080044a4634cb68078699e628120c1cba2c2b508cd34ad92e9202ccdac01596a6e988635b5c1a1e0113815d893a217a
 EBUILD iproute2-4.5.0.ebuild 3887 BLAKE2B 6788057f29e49ba641f790c571035d2a489a238a2821b3b5fe12c0973fa4c2aeef703826379944defe3b9997b889c071ce51f7ffe0ab5eeff68b644ced49faeb SHA512 a5d957f6660e3d1444a46511f8040f0bc7eb7a489a087e49e90a4e1d356f5346cb39a5dfdc98411d5e3eb1d6aca9e6d88f815ea133d501e5a640e099ef8e9ecc
diff --git a/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch b/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch
new file mode 100644
index 000000000000..d2940c9e927f
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch
@@ -0,0 +1,25 @@
+Bug: https://bugs.gentoo.org/652986
+
+https://marc.info/?l=linux-netdev&m=152363743818340&w=2
+
+--- a/lib/utils.c
++++ b/lib/utils.c
+@@ -568,7 +568,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family)
+ 	if (strcmp(name, "default") == 0) {
+ 		if ((family == AF_DECnet) || (family == AF_MPLS))
+ 			return -1;
+-		addr->family = (family != AF_UNSPEC) ? family : AF_INET;
++		addr->family = family;
+ 		addr->bytelen = af_byte_len(addr->family);
+ 		addr->bitlen = -2;
+ 		addr->flags |= PREFIXLEN_SPECIFIED;
+@@ -579,7 +579,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family)
+ 	    strcmp(name, "any") == 0) {
+ 		if ((family == AF_DECnet) || (family == AF_MPLS))
+ 			return -1;
+-		addr->family = AF_UNSPEC;
++		addr->family = family;
+ 		addr->bytelen = 0;
+ 		addr->bitlen = -2;
+ 		return 0;
+-- 
diff --git a/sys-apps/iproute2/iproute2-4.16.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.16.0-r1.ebuild
new file mode 100644
index 000000000000..944adb2f1ff0
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.16.0-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	!minimal? ( net-libs/libmnl )
+	elf? ( virtual/libelf )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	iptables? ( virtual/pkgconfig )
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	>=sys-kernel/linux-headers-3.16
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	"${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${P}-keep-family.patch # bug 652986
+)
+
+src_prepare() {
+	if ! use ipv6 ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'int main(){return 0;}' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	# run "configure" script first which will create "config.mk"...
+	econf
+
+	# ...now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
+		SBINDIR="${EPREFIX%/}"/sbin \
+		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
+		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX%/}"/usr/share/man \
+		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED%/}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
+	fi
+}
diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 75d873ee299f..69e0607d477c 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -8,4 +8,4 @@ DIST likwid-4.1.1.tar.gz 1395475 BLAKE2B 121d1b7fe94b6b2c8a8328caa29a6f47788bad7
 DIST likwid-4.1.2.tar.gz 1398643 BLAKE2B cf4ca9f763ab1547e8ba388353b723c2976aa71ceaa628998d35f3ec4793cabb89bab6ebcc84df19e2b240607ab4a5a0ee1cde678741982cd029302fae385db6 SHA512 efb6a85947193204e08ce32e79c5f3ef15c7babca66930145af1c2eca8eccc2aeceea54a12715467161c646acc208bda3d01d07ea365ff8bdb9eafb022f107d9
 EBUILD likwid-4.1.1.ebuild 2581 BLAKE2B 24b20baec0e7cd8b93d7a868c936f197ce64000b7400a197b076deac81b830f202d38dfaa36cc0a4c38eec1efc710269e81f5cacd4f583e9b675618a784d102b SHA512 37fa590dd0f6e2c08e33751272e0090105e1b408a4f4ce2338d39e86fcdb81bcd16edc8becd094c80a7439a91b7259ad25d8b91d5774f6f7b1ab66e95c3b769d
 EBUILD likwid-4.1.2.ebuild 2898 BLAKE2B dc42b396773abe316fb97b5c16d83c8587d3b0407c183f618eaff593112773dd8f2027072a642d88caf039408e4c74ad34ce59bced2d44d614a51423ea500396 SHA512 cf56e4df096b42e3a50281002aaf0ef08acdd27b6c959944aef2306a627430e3bc8dc6a9ded58c4bb9ec1362390806000564faff8bd63baefb576ad8e2a7f4b7
-MISC metadata.xml 445 BLAKE2B b69dca6299ad9e72d31cd7531454ca84aa056bbad8bfceec35cac1dc09e792e5b68bf446776aad141efa33eb7463af54a0dc32e6b12739e8645eae1524283538 SHA512 b7500a5c7644b5561747367eb9a502b39d77993a67221f0c8c292ef60b2c829897f906cc524b8a2eb287b0b7bd4659460041f948c536abeaff427e89b3788410
+MISC metadata.xml 250 BLAKE2B 2921ec2f33ae595e4f418d7b71387058bf1869c0396e8d6ee467ac7c8b6d4443772a93a9f64657ad3617cafa6f18d7a661d65a46894e6f3ef1f718d46f4eaa3c SHA512 1fd9fec2fe82c0a618f51763c8bcb602be56be339ca8ba8371d0c107b2ff15f34eda9f9ef784d963ef7e729db209d21dbd6f2640f6d8d177f4228419b108964f
diff --git a/sys-apps/likwid/metadata.xml b/sys-apps/likwid/metadata.xml
index 9c00570418db..69f8f4152ad9 100644
--- a/sys-apps/likwid/metadata.xml
+++ b/sys-apps/likwid/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>brendan@horan.hk</email>
-		<name>Brendan Horan</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">rrze-likwid/likwid</remote-id>
 	</upstream>
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index e8d0db243939..b2178f5aa61e 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -7,8 +7,8 @@ AUX lm_sensors.initd 334 BLAKE2B 377cea5d1f0c2baf94a2a17dd870ae3ba545bb964534328
 AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378eeef36654933f0ec2042683e1b13bc48349eebc4d2dde26d20ac7e7681c01ceeb0b3b4e27576d2b SHA512 83c71b9aaae273daff62da31ae45ffa682460e4d4a8fbca54dfa83b1db58d4d042bba08eb62c62f4d8f6647d222ef5a11181a3fb7bedffbb4138ef02f6143535
 AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
-DIST lm_sensors-3.4.0_p20160725.tar.gz 206868 BLAKE2B ba79935e1acb62d5f31fc53975904ab7fd19f619fdc5edc342bcfa1f8d2e16e3ac41711ad33bc9766ece89325236887d722b06c9d6698c420e9506d77dca7ef6 SHA512 abae5c4ba2ed0b763fda918e2ededb2148a3edd1d33709a34b91a33398a64e8988d14c5d16a5c756bf55beaa383e661c76e1acccc7b5ef858aa772e96878131b
 DIST lm_sensors-3.4.0_p20170901.tar.gz 208487 BLAKE2B b6d2eb6efee25891fbd655738ba25e91d8ec5d97f07e24ee217ab1a59c51a8ab59e042a90ed6fa1de4459992adc740252588419c0f74ce02f9ad7c1f4f9750da SHA512 5c4a750efdff2ef086a5ed1b6a8a03278872ca077255eae91d0696af229f37b09216e2f53d1d6e4602596fd8b978e0b9c27327357621486c5d7b1d39ecd16fea
-EBUILD lm_sensors-3.4.0_p20160725.ebuild 6228 BLAKE2B ecc79b6e0477eaf39f433818c60fdf5c2a432d91083bc8a0a7129c1faace0ebc37dae69131a54f4b42f8b8edc2a374602cad98bb1b925a6ddae70c20bbfdaf34 SHA512 70cea8ee4f232d5121340e681443af417cf7d6f550fe9611985801a69963537283dc4a597df36abcd9862e23b7ba5d03e9a5de804180a587de89ad391795f963
-EBUILD lm_sensors-3.4.0_p20170901.ebuild 6321 BLAKE2B db550945d3ddd0723e435d3218865266ee9190001808269302f61056d8b362f805912b3dd2835c9c35c63eb819c960bd8660fcdd8b856de984b514eaf943d637 SHA512 b811dc032227f3d224c14522a65d2e671844ba7aca980dd932b7651d597e6c554e57d7c7b741a2cc1b414b67458140de41899eddcee871446dcb00186ec34cb5
+DIST lm_sensors-3.4.0_p20180318.tar.gz 260899 BLAKE2B a859c20ef148f80cc9d5ead61547feb5c26a77447aeedf9273334fc1e5b4075c74d8f786102e33e8fc771968dd605829923f8d3da8293fef168c74b8c55bf32a SHA512 923ee985d8e0b8fdc43b2e4418873ccbeb8433adbf2efe71fcaba1df0c6971d502866abe8ea015d199380e06e3cfd35d945451e5e9f7e64cede35fff37621aee
+EBUILD lm_sensors-3.4.0_p20170901.ebuild 6318 BLAKE2B 29a5176941ea4ab05a7cd6db72d760a5b4a8ab18f6f6e1352ecdaa5dc2843119f0e43887eed62d09507a4bd17586462a20488a8ddc13a065b5dda8cb49c07cb7 SHA512 8c7c8a0ff38f474c0b7123dc093f899f80550b0990b62908e787f80d52697f4024d5185b719608a3e56b4b41fffed0df9b943b5ed55837116605344f829200ba
+EBUILD lm_sensors-3.4.0_p20180318.ebuild 6326 BLAKE2B aba7273721d0f623e048c8d1406b93082fdb64ca3ee1b7388bf42187742fc73c1e6d91185b913328cf858fde0cbf6a086767647f427af512e326c503ff261f76 SHA512 de48193fde018450cc9a33d771f8207a7662f699a1377b09956ee7a34569e80ba2b29182d3f75b5b3834f7a2fa4a28419ce801ae9ddd9dace7a33a91212f7ffd
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
index bd41a3e2dda3..80eebd78ae58 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
@@ -113,10 +113,10 @@ multilib_src_configure() {
 	if multilib_is_native_abi && use sensord; then
 		# sensord requires net-analyzer/rrdtool which doesn't have real multilib
 		# support. To prevent errors like
-		# 
-		#   skipping incompatible /usr/lib/librrd.so when searching for -lrrd 
+		#
+		#   skipping incompatible /usr/lib/librrd.so when searching for -lrrd
 		#   cannot find -lrrd
-		# 
+		#
 		# we only build sensord when we are building for profile's native ABI
 		# (it doesn't affect libsensors.so).
 		sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || \
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180318.ebuild
index f543e8be3a74..c765228b5b41 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20160725.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180318.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ inherit linux-info systemd toolchain-funcs multilib-minimal
 DESCRIPTION="Hardware Monitoring user-space utilities"
 HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/groeck/lm-sensors"
 
-COMMIT="45ffa15cf02e63f70ff3b85c23e22dfbab7e8f9c"
+COMMIT="6d970e5eb196061605c138c9dcbc833b052c4f3a"
 MY_PN="${PN/_/-}"
 
 #SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2"
@@ -19,8 +19,8 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/4.4.0"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="sensord static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
 	sensord? (
@@ -113,10 +113,10 @@ multilib_src_configure() {
 	if multilib_is_native_abi && use sensord; then
 		# sensord requires net-analyzer/rrdtool which doesn't have real multilib
 		# support. To prevent errors like
-		# 
-		#   skipping incompatible /usr/lib/librrd.so when searching for -lrrd 
+		#
+		#   skipping incompatible /usr/lib/librrd.so when searching for -lrrd
 		#   cannot find -lrrd
-		# 
+		#
 		# we only build sensord when we are building for profile's native ABI
 		# (it doesn't affect libsensors.so).
 		sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || \
@@ -161,6 +161,11 @@ multilib_src_install_all() {
 
 	docinto developers
 	dodoc doc/developers/applications
+
+	if use contrib; then
+		insinto /usr/share/${PN}
+		doins -r "${S}"/configs
+	fi
 }
 
 pkg_postinst() {