diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest
index 1a4c385115..59708a0ee9 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest
@@ -1,19 +1 @@
-DIST re2c-0.13.5.tar.gz 782725 SHA256 f3a995139af475e80a30207d02728b1e0065b0caade7375e974cb1b14861668c SHA512 56101bf01aea6f0c082b85382be34acada51d70036252581cd76ac4b2bdbc144633b97c63a94bfdba434ffb80884e11299a38853e2d805dc7ce6cf9d452c81c8 WHIRLPOOL 31e462704e3ab72fce92b62ce0bca73b256c98e48f302f6f90392c26a7235e86786f2bc5f43faedbaa60f9614098ac5d734a61abed394cd71135dd3639704210
-DIST re2c-0.13.6.tar.gz 844623 SHA256 8e463039aa8799a2957bfc00c9936232bb63b4fcb24d6ea6316170a67e5076c0 SHA512 dca2654de5f596fbaf519396b2f2c58690996c62dec32436599332b79107b5bf07c87b46630a224032ff44dc02d2c1861e16a920fbdc9251f4a538008709ceba WHIRLPOOL af810c4d8e41eb01cb4b06c86932fda6da86d1690a17cd626f3a864087a378cf685a9ae6ab170cb7581c696e08ca4474f128b51bff1d1284f2a9d2252d60f226
-DIST re2c-0.13.7.5.tar.gz 2347921 SHA256 d58afd50579e4564c9fc4218aec860d41b88583ace2ae0a23497b49108f1b461 SHA512 71abaec58ac02de6f13cfffec6965d3443c44a72425c4ce8873915daddf077f7f484c2dc702e6533bab2d2f0ca72b34e354771120a4788d9a456b3b3393b6e22 WHIRLPOOL 1d5f8b4822c04d7e84d79601194568810f4b4053ca55386fc7d216bdaf402ab0282994c823ba5001e558d40f78aa9f7b4ee704b43015046d4ccdb8d6118fde0e
-DIST re2c-0.14.2.tar.gz 2554944 SHA256 a702eb63977af4715555edb41eba3b47bbfdcdb44b566d146869a7db022f1c30 SHA512 25e682aafe434f838c41f01588f69b4979c73bab8562f56d1b1db656753c43a606b13eeb0e6542f793cdb73d001c304c61811630f7001131edd3eb76248a0a60 WHIRLPOOL 5f6864b800b7838177badf37b7ff5e7bcca73474da4f180319a9cf860694ab1191b14f913af919fa2fcce60f7bfdd85c3e6b87c91a5060260026520a8d059bd6
-DIST re2c-0.14.3.tar.gz 2576859 SHA256 1c6806df599f3aef0804b576cfdf64bdba5ad590626dfca2d44e473460917e84 SHA512 c1fa20c9c1e69d085415dde3177cb03688f8a9314dd4854241812f479a2b1e4306c3abbb8f9f31763918afbd1f7a821e7337551a898f6ae57f814c66e59e2382 WHIRLPOOL dd08d837c93737d9a4dd8fd9f01de721e26b569b2686a2d066636e130f6eb82a8b8b71e8b5d84fcf44993998250effc17c2c3dbc1fd6e1651c5b5ba18a36e8fe
-DIST re2c-0.15.2.tar.gz 4074407 SHA256 fe708c3477d908f02f2ab1646ac194d88b5dbfd92912b020a2b7a5bdfb778889 SHA512 6e46e45b55665a0898354b2684326ca91ff3fb50d2f52e7a7cba59658876c743cb141c827f3d3c77c1d44089c16a4207cb48e97f5af383ac1c95bc063388ba73 WHIRLPOOL 9f5f5636e19d7e9cb136b9f18a0059569ca6f1562f2c1302bc0212386e61f5be8eb866c4513e91231cfc4bf6ac3eeb24a672cd81675155dce244a48152b7ea3a
-DIST re2c-0.15.3.tar.gz 4881197 SHA256 f9d2a96c60a8c60d9c6c70e10590cbceaf0776d3115e7b3b35c7d7240cc1613b SHA512 eebe372543b8c8fafa5d1a206c5fc5e92ea36e78da3ac5cd2e52d2710435cc83c8604bfb5397b48abef1d6ba241b9ed8a15119b436236b116bc81579a8dd9247 WHIRLPOOL 3bb18924d008762f49c78c98f7678b6f81295f86e4a69a884c86763a3b7855870adfcafe5912f8cbd81672ca7c38c00ffd51e5d5e8f4935fd0ac842f394128f9
-DIST re2c-0.16.tar.gz 4892417 SHA256 48c12564297641cceb5ff05aead57f28118db6277f31e2262437feba89069e84 SHA512 d4fb8078d9566a1fa177331b649cac79e2e45cc9558a22a2212503f6c77c9e6b4238aa01c85c66b86fa4831cdc669cedf8b430d395be6a0c6cfabfb7c61cf8a3 WHIRLPOOL de28f65acac11ea36aad72eb8ba8f63949dcc10e9712ac84be91a66cd4216c01dee9eb360bf95db1c32de79cf9aa7ad2a1656eb877c52d44dd95a45e2b24253a
-EBUILD re2c-0.13.5-r1.ebuild 712 SHA256 58b5eefb88530dbc262d2d90a30dece27114fbe1d219167be3633c10f380bd4a SHA512 446a7fe4ff39783c7172ae3110200e896955cf36bb2fa26133a671adc6394ca4efb92f012b074e3cf2dd392d27b4ee6bfbf43a86755b4b6edebb8fe77e395f86 WHIRLPOOL 6e9b9a47ebfaf9e32c8d0c630e3d1de01be98f7c76b166470e3b3ed7a92eb36bd4c139062ee56d0e376d5114d2366517eb30c1e7f0160b0d777dc3204b7ab5b0
-EBUILD re2c-0.13.6.ebuild 603 SHA256 797a9b3de47d02e6476be9dc1523eb91ebd1ef92e9b42b44604ecab4cf398cec SHA512 dc860d1bd649834c9d6ad8d357226d4c55c4260be9a020d516b2c92dd0a84863018fd208ee0c23e219d36926c06f9a63571e0a479f86a57b67156ed48ae1f438 WHIRLPOOL f59769c00b8db2f4d34dbb1695f0afa3f31f70731e11fd8dbe1f56bb7f82e9142d826ddaddba4ee38c79ca38a90ec5cc8b8456cecbd0f4e631d92e110453fe7b
-EBUILD re2c-0.13.7.5.ebuild 711 SHA256 3fdbcb83cc81ce74a26faee94e6fe1b6798b7665aa55b32fd577776b2f26a32b SHA512 63f13e7d95b0d7dea342504d0bd562107cb5432c28fcc722c66ab7fff2008c79545a268a36abfe33d858b036b238bc6c8ffce7ff60f8b5edc04e960787db4f6e WHIRLPOOL 1ad796b7e0bd8b438dc3bfe2d561fc35305906041239559475a8d44c8253abfec6c5d9212b3ff7a86800e6568deda905ba620d33c6980965f8c9ebb891a31f80
-EBUILD re2c-0.14.2.ebuild 646 SHA256 db6b1214dfaea399b05667186940cd3419f59e4b6710bdf89789bdc51a13ca78 SHA512 2dfabb462b6742241e299ef84dacc25c91554712bfa21e9a5a6fd43ec4dcd5931a46ae9a99c22814c5c775131b507d352ff741fd14ef2c1f5ee5e0f0a96d00d6 WHIRLPOOL 4fcd8701dd43a9ba627dd72a3518eb31aeab2ca3a5e0b9c2c967102b399d402fad6d838e5b6d5882c204056fbea409f2d980791571ca2730ddeacee1a9449bf2
-EBUILD re2c-0.14.3.ebuild 658 SHA256 df08e1f060c2eed01753003988e596309746188a73d952f1f3fc40052d73edbf SHA512 d0d071fb1627c110e85d5d737ef8bb50f62e7ab588db27755e199f0d5656548350ae2258607ce25189d62d78c073846c02a9efa0272dbd9e499ebb216c8d1549 WHIRLPOOL 47f84a54257000952e4a48674113458aeb2c0d40153d4f3a72a349d05715931e6914f07737e3f7e5970a9bd7697e8a70f42d4b638afaf4bf2e4774def1d989b9
-EBUILD re2c-0.15.2.ebuild 764 SHA256 f2dd17b119ba7ae22fd63e19047baf29b9abaf04cfa9f539dcdb218ce520fdb3 SHA512 98c2132537d0bfcfdfab9d720b89b08ad1951c95e61e6c3d3eda065508f47eeb51e686c806c6d5585d467c1fe0a84943b41736ab4f62bf4a5b5c55876a4a001a WHIRLPOOL 968389e0e2950b700e4be6b2750638161dc41ca5d027d36ad825d561389c16a20d3e1598b0609dda046f3429c75f9a8a0a9054a70fd0d3c62f8988bd2b489010
-EBUILD re2c-0.15.3.ebuild 764 SHA256 f2dd17b119ba7ae22fd63e19047baf29b9abaf04cfa9f539dcdb218ce520fdb3 SHA512 98c2132537d0bfcfdfab9d720b89b08ad1951c95e61e6c3d3eda065508f47eeb51e686c806c6d5585d467c1fe0a84943b41736ab4f62bf4a5b5c55876a4a001a WHIRLPOOL 968389e0e2950b700e4be6b2750638161dc41ca5d027d36ad825d561389c16a20d3e1598b0609dda046f3429c75f9a8a0a9054a70fd0d3c62f8988bd2b489010
-EBUILD re2c-0.16.ebuild 755 SHA256 647b7d33c4a11670844122e5df9ab5db53f2634320381fef1468f648158b16e9 SHA512 8bd63d72cb9bd092ce626def2946ee5167d98c91ced9497f8fa895115c868fb199b2afe4173fd0f5fa14f0aacd763170f72817e4cf2444a2bebbccf307a45653 WHIRLPOOL 4a12c146f133f78320149cd526760e6fb0e3ffdfc4a6f169c3ec4dc937eb4e6af4ed6ae509f63e83a159006b1c46ba7adfbed2c979859b1e3b2ef2b3c3ef5675
-MISC ChangeLog 4634 SHA256 9720b96cb59c7a752579116a5722cb5c078ff090ce339847b533ae35f43facf6 SHA512 db2448c60fe672933c2f848d2146af8fe6db82fa318da52f940fc6eb6fc6e57dd5327b95a95d6138d536f490862471050829d5d39baa07450b9b8e69be0b69a9 WHIRLPOOL 58ee96416a2079052ddf3a8fa962c9f68afa4a0e9a94a74b2c2360b553ebb0520ffb0a404761d52f91050a2f73c08505ee2fbf09d03fc43dfd81fa17bf57872b
-MISC ChangeLog-2015 11944 SHA256 83231e58dc4d3c7ca92d55dceb7a7b62e997299156a828be942176ad30cb904d SHA512 a8c6ab17ba21b7c6b8e3a6e99c88f8e74edbe223efe323d4af025a4f54ae6dd9108308328939e268168685e80a4d76fe6fe86d13908f2b0dc935d031bf7c76f7 WHIRLPOOL 8f1fed9dfc047924eab55b3bae15e8a74eb46dab0ac03e433cf4bbb93a93376b4f6f946c20c3a20f44ef601c6819e1f0b83b70761daf04df2290f64c2c0ee5ff
-MISC metadata.xml 423 SHA256 405af3772ed2ee867686c5c204eb602475dee4f0b8ef16dd31888c813b28cde1 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9 WHIRLPOOL 8105f64cb55da72e78651ed400e537ae31e5b1980a1fbfa9de4760a78de11295da1d56027c33d90a695e8f7a07f4d4211ec60d3d1ac6cacf24a36169557295d3
+DIST re2c-2.0.3.tar.xz 1288996 BLAKE2B 76913a79ad9c237843ccbe86dd05db755da19fc89351b64d6ece6a9a8d53860f1cc12493748fca5b7391cddff4f4668295fb2613c257c128870ea2e7163811ed SHA512 893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/re2c/metadata.xml
index 1fc58ccd41..0093ef8412 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/metadata.xml
@@ -10,5 +10,6 @@
re2c
skvadrik/re2c
+ cpe:/a:re2c:re2c
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.13.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.13.5-r1.ebuild
deleted file mode 100644
index d04be68e9e..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.13.5-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.sourceforge.net/"
-MY_PV="${PV/_/.}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- dobin re2c
- doman re2c.1
- dodoc README CHANGELOG doc/*
- docinto examples
- dodoc examples/*.c examples/*.re
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.13.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.13.6.ebuild
deleted file mode 100644
index f7f5d82288..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.13.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-src_install() {
- dobin re2c
- doman re2c.1
- dodoc README CHANGELOG doc/*
- docinto examples
- dodoc examples/*.c examples/*.re
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.13.7.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.13.7.5.ebuild
deleted file mode 100644
index 464d202d14..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.13.7.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-src_prepare() {
- epatch_user
-}
-
-src_compile() {
- touch re2c.1 # don't require asciidoc for mans
- emake
-}
-
-src_install() {
- default
-
- dodoc README CHANGELOG doc/*
- docinto examples
- dodoc examples/*.c examples/*.re
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.14.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.14.2.ebuild
deleted file mode 100644
index 07586b7630..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.14.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-src_prepare() {
- epatch_user
-}
-
-src_install() {
- default
-
- dodoc README CHANGELOG doc/*
- docinto examples
- dodoc examples/*.c examples/*.re
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.14.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.14.3.ebuild
deleted file mode 100644
index 29d4a3d15a..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.14.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-src_prepare() {
- epatch_user
-}
-
-src_install() {
- default
-
- dodoc README CHANGELOG doc/*
- docinto examples
- dodoc examples/*.c examples/*.re
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.15.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.15.2.ebuild
deleted file mode 100644
index 77ec6097fe..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.15.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-src_prepare() {
- epatch_user
- export ac_cv_path_BISON="no"
-}
-
-src_install() {
- default
-
- docompress -x /usr/share/doc/${PF}/{examples,paper}
- dodoc -r README CHANGELOG examples
- docinto paper
- dodoc doc/loplas.ps doc/sample.bib
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.15.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.15.3.ebuild
deleted file mode 100644
index 77ec6097fe..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.15.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-src_prepare() {
- epatch_user
- export ac_cv_path_BISON="no"
-}
-
-src_install() {
- default
-
- docompress -x /usr/share/doc/${PF}/{examples,paper}
- dodoc -r README CHANGELOG examples
- docinto paper
- dodoc doc/loplas.ps doc/sample.bib
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.16.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.16.ebuild
deleted file mode 100644
index 958239c762..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-0.16.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-src_prepare() {
- epatch_user
- export ac_cv_path_BISON="no"
-}
-
-src_install() {
- default
-
- docompress -x /usr/share/doc/${PF}/{examples,paper}
- dodoc -r README CHANGELOG examples
- docinto paper
- dodoc doc/loplas.ps doc/sample.bib
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.0.3.ebuild
new file mode 100644
index 0000000000..aba4c616a4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.org/"
+SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+src_configure() {
+ econf \
+ --enable-golang \
+ ac_cv_path_BISON="no" \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r README.md CHANGELOG examples
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/file/Manifest
index 25da8f481e..42c17cea29 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/file/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/Manifest
@@ -1 +1,3 @@
-DIST file-5.33.tar.gz 817060 BLAKE2B 735f176f09085243dacaddda1b734ef2191ff1684f08022ed1874e84fd0c84679b5a765383c5c5ad27a7216abc23b9c2211fb7110846122563e18285de0f0e51 SHA512 36c9f2e2aa814b5557eef114fdd3de159688c7a3c9632a9f5c6355c4d2a5694cee81279bda80897616fca07289a7fedb1f797439a2903c76dc84870694773c9e
+DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
+DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
+DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682 SHA512 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.33-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.37-r1.ebuild
similarity index 80%
rename from sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.33-r2.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.37-r1.ebuild
index c01383f720..9d459e0e01 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.33-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.37-r1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python3_{6,7} )
DISTUTILS_OPTIONAL=1
-inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
+inherit distutils-r1 libtool 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"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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"
@@ -33,7 +33,7 @@ DEPEND="
RDEPEND="${DEPEND}
python? ( !dev-python/python-magic )"
-PATCHES=( "${FILESDIR}"/${P}-CVE-2018-10360.patch )
+PATCHES=( "${FILESDIR}"/${P}-CVE-2019-18218.patch )
src_prepare() {
default
@@ -42,7 +42,8 @@ src_prepare() {
elibtoolize
# don't let python README kill main README #60043
- mv python/README{,.python} || die
+ mv python/README.md python/README.python.md || die
+ sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
}
multilib_src_configure() {
@@ -63,7 +64,7 @@ src_configure() {
mkdir -p "${WORKDIR}"/build || die
cd "${WORKDIR}"/build || die
tc-export_build_env BUILD_C{C,XX}
- ECONF_SOURCE=${S} \
+ ECONF_SOURCE="${S}" \
ac_cv_header_zlib_h=no \
ac_cv_lib_z_gzopen=no \
CHOST=${CBUILD} \
@@ -123,5 +124,5 @@ multilib_src_install_all() {
cd python || die
distutils-r1_src_install
fi
- prune_libtool_files
+ find "${ED}" -type f -name "*.la" -delete || die
}
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.38-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.38-r1.ebuild
new file mode 100644
index 0000000000..cbd64a5247
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.38-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..7} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool 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 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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="bzip2 lzma python static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+ 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 )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
+ "${FILESDIR}"/${P}-td-is-for-ptrdiff_t-not-for-off_t.patch
+ "${FILESDIR}"/${P}-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
+)
+
+src_prepare() {
+ default
+
+ [[ ${PV} == "9999" ]] && eautoreconf
+ elibtoolize
+
+ # don't let python README kill main README #60043
+ mv python/README.md python/README.python.md || die
+ sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-libseccomp
+ --enable-fsect-man5
+ $(use_enable bzip2 bzlib)
+ $(use_enable lzma xzlib)
+ $(use_enable static-libs static)
+ $(use_enable zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+ local myeconfargs=(
+ --disable-shared
+ --disable-libseccomp
+ --disable-bzlib
+ --disable-xzlib
+ --disable-zlib
+ )
+ tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+ # when cross-compiling, we need to build up our own file
+ # because people often don't keep matching host/target
+ # file versions #362941
+ tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+ local ECONF_SOURCE=${S}
+
+ if need_build_file; then
+ mkdir -p "${WORKDIR}"/build || die
+ cd "${WORKDIR}"/build || die
+ build_src_configure
+ 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 need_build_file; then
+ emake -C "${WORKDIR}"/build/src magic.h #586444
+ emake -C "${WORKDIR}"/build/src file
+ local -x 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
+
+ # Required for `file -C`
+ dodir /usr/share/misc/magic
+ insinto /usr/share/misc/magic
+ doins -r magic/Magdir/*
+
+ if use python ; then
+ cd python || die
+ distutils-r1_src_install
+ fi
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.39-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.39-r3.ebuild
new file mode 100644
index 0000000000..7631cc1d7d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.39-r3.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..7} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool 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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+ 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 )
+ seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}/file-5.39-add-missing-termios.patch" #728416
+ "${FILESDIR}/file-5.39-seccomp-musl.patch"
+ "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == 9999 ]]; then
+ eautoreconf
+ fi
+
+ elibtoolize
+
+ # don't let python README kill main README #60043
+ mv python/README.md python/README.python.md || die
+ sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-fsect-man5
+ $(use_enable bzip2 bzlib)
+ $(use_enable lzma xzlib)
+ $(use_enable seccomp libseccomp)
+ $(use_enable static-libs static)
+ $(use_enable zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+ local myeconfargs=(
+ --disable-shared
+ --disable-libseccomp
+ --disable-bzlib
+ --disable-xzlib
+ --disable-zlib
+ )
+ tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+ # when cross-compiling, we need to build up our own file
+ # because people often don't keep matching host/target
+ # file versions #362941
+ tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+ local ECONF_SOURCE=${S}
+
+ if need_build_file; then
+ mkdir -p "${WORKDIR}"/build || die
+ cd "${WORKDIR}"/build || die
+ build_src_configure
+ 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 need_build_file; then
+ emake -C "${WORKDIR}"/build/src magic.h #586444
+ emake -C "${WORKDIR}"/build/src file
+ local -x 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
+
+ # Required for `file -C`
+ dodir /usr/share/misc/magic
+ insinto /usr/share/misc/magic
+ doins -r magic/Magdir/*
+
+ if use python ; then
+ cd python || die
+ distutils-r1_src_install
+ fi
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild
index 72de11bc59..e78b8a2155 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python3_{6..7} )
DISTUTILS_OPTIONAL=1
-inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
+inherit distutils-r1 libtool 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"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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"
@@ -21,10 +21,12 @@ HOMEPAGE="https://www.darwinsys.com/file/"
LICENSE="BSD-2"
SLOT="0"
-IUSE="python seccomp static-libs zlib"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DEPEND="
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
python? (
${PYTHON_DEPS}
dev-python/setuptools[${PYTHON_USEDEP}]
@@ -32,47 +34,63 @@ DEPEND="
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
RDEPEND="${DEPEND}
python? ( !dev-python/python-magic )
- seccomp? ( sys-libs/libseccomp )"
+ seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+)
src_prepare() {
default
- [[ ${PV} == "9999" ]] && eautoreconf
+ if [[ ${PV} == 9999 ]]; then
+ eautoreconf
+ fi
+
elibtoolize
# don't let python README kill main README #60043
- mv python/README.md README.python || die
+ mv python/README.md python/README.python.md || die
+ sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
}
multilib_src_configure() {
local myeconfargs=(
--enable-fsect-man5
+ $(use_enable bzip2 bzlib)
+ $(use_enable lzma xzlib)
$(use_enable seccomp libseccomp)
$(use_enable static-libs static)
$(use_enable zlib)
)
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+ econf "${myeconfargs[@]}"
}
-src_configure() {
+build_src_configure() {
+ local myeconfargs=(
+ --disable-shared
+ --disable-libseccomp
+ --disable-bzlib
+ --disable-xzlib
+ --disable-zlib
+ )
+ tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
# 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
+ tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+ local ECONF_SOURCE=${S}
+
+ if need_build_file; 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 $(use_enable seccomp libseccomp)
+ build_src_configure
fi
multilib-minimal_src_configure
@@ -89,10 +107,10 @@ multilib_src_compile() {
}
src_compile() {
- if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
+ if need_build_file; then
emake -C "${WORKDIR}"/build/src magic.h #586444
emake -C "${WORKDIR}"/build/src file
- PATH="${WORKDIR}/build/src:${PATH}"
+ local -x PATH="${WORKDIR}/build/src:${PATH}"
fi
multilib-minimal_src_compile
@@ -122,5 +140,5 @@ multilib_src_install_all() {
cd python || die
distutils-r1_src_install
fi
- prune_libtool_files
+ find "${ED}" -type f -name "*.la" -delete || die
}
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.33-CVE-2018-10360.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.33-CVE-2018-10360.patch
deleted file mode 100644
index a489846b10..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.33-CVE-2018-10360.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Avoid reading past the end of buffer
-
-CVE-2018-10360
-
-https://github.com/file/file/commit/a642587a9c9e2dd7feacdf513c3643ce26ad3c22
-
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -842,7 +842,8 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
-
- cname = (unsigned char *)
- &nbuf[doff + prpsoffsets(i)];
-- for (cp = cname; *cp && isprint(*cp); cp++)
-+ for (cp = cname; cp < nbuf + size && *cp
-+ && isprint(*cp); cp++)
- continue;
- /*
- * Linux apparently appends a space at the end
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.37-CVE-2019-18218.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.37-CVE-2019-18218.patch
new file mode 100644
index 0000000000..1cd02b778a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.37-CVE-2019-18218.patch
@@ -0,0 +1,36 @@
+CVE-2019-18218
+https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84
+
+--- a/src/cdf.c
++++ b/src/cdf.c
+@@ -1027,8 +1027,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
+ goto out;
+ }
+ nelements = CDF_GETUINT32(q, 1);
+- if (nelements == 0) {
+- DPRINTF(("CDF_VECTOR with nelements == 0\n"));
++ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) {
++ DPRINTF(("CDF_VECTOR with nelements == %"
++ SIZE_T_FORMAT "u\n", nelements));
+ goto out;
+ }
+ slen = 2;
+@@ -1070,8 +1071,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
+ goto out;
+ inp += nelem;
+ }
+- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n",
+- nelements));
+ for (j = 0; j < nelements && i < sh.sh_properties;
+ j++, i++)
+ {
+--- a/src/cdf.h
++++ b/src/cdf.h
+@@ -48,6 +48,7 @@
+ typedef int32_t cdf_secid_t;
+
+ #define CDF_LOOP_LIMIT 10000
++#define CDF_ELEMENT_LIMIT 100000
+
+ #define CDF_SECID_NULL 0
+ #define CDF_SECID_FREE -1
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
new file mode 100644
index 0000000000..240edc11f6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
@@ -0,0 +1,40 @@
+From c9d21a58bea2ecb2dc8876e09e471094d54a25e4 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann
+Date: Mon, 13 Apr 2020 01:08:12 +0200
+Subject: [PATCH 1/3] Revert "PR/93: iaeiaeiaeiae: Do as the comment says, and
+ count as dynamically linked"
+
+This reverts commit 24c9c086cd7c55b7b0a003a145b32466468e2608.
+
+Fixes misdetection of shared libraries as statically linked as
+reported in bug 717264.
+
+Bug: https://bugs.gentoo.org/717264
+Signed-off-by: Thomas Deutschmann
+---
+ src/readelf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/readelf.c b/src/readelf.c
+index 40bcfab1..afec31d1 100644
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -1638,6 +1638,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
+ /* Things we can determine before we seek */
+ switch (xph_type) {
+ case PT_DYNAMIC:
++ linking_style = "dynamically";
+ doread = 1;
+ break;
+ case PT_NOTE:
+@@ -1653,7 +1654,6 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
+ }
+ /*FALLTHROUGH*/
+ case PT_INTERP:
+- linking_style = "dynamically";
+ doread = 1;
+ break;
+ default:
+--
+2.26.0
+
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
new file mode 100644
index 0000000000..bb211f355f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
@@ -0,0 +1,29 @@
+From ed971e5e3ae79bd28697d16c8b78b693052484e4 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas
+Date: Wed, 12 Feb 2020 22:17:33 +0000
+Subject: [PATCH 3/3] The executable bit is only set when DF_1_PIE bit is set
+ so it is fine.
+
+---
+ magic/Magdir/elf | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/magic/Magdir/elf b/magic/Magdir/elf
+index b5a2e00b..f5e1af9a 100644
+--- a/magic/Magdir/elf
++++ b/magic/Magdir/elf
+@@ -50,8 +50,9 @@
+ !:mime application/x-object
+ >16 leshort 2 executable,
+ !:mime application/x-executable
+->16 leshort 3 shared object,
+-!:mime application/x-sharedlib
++>16 leshort 3 ${x?pie executable:shared object},
++
++!:mime application/x-${x?pie-executable:sharedlib}
+ >16 leshort 4 core file,
+ !:mime application/x-coredump
+ # OS-specific
+--
+2.26.0
+
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch
new file mode 100644
index 0000000000..09fcaef151
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch
@@ -0,0 +1,27 @@
+From c49dc91df427f89ebcf9cdec556b8fc88cdfc3c1 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas
+Date: Tue, 17 Dec 2019 15:27:27 +0000
+Subject: [PATCH 2/3] %td is for ptrdiff_t not for off_t.
+
+---
+ src/readelf.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/readelf.c b/src/readelf.c
+index afec31d1..8ac3b7d6 100644
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -1349,8 +1349,8 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
+ name_off = xsh_offset;
+
+ if (fsize != SIZE_UNKNOWN && fsize < name_off) {
+- if (file_printf(ms, ", too large section header offset %td",
+- name_off) == -1)
++ if (file_printf(ms, ", too large section header offset %jd",
++ (intmax_t)name_off) == -1)
+ return -1;
+ return 0;
+ }
+--
+2.26.0
+
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-add-missing-termios.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-add-missing-termios.patch
new file mode 100644
index 0000000000..0614f52dd2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-add-missing-termios.patch
@@ -0,0 +1,30 @@
+From 471e2c6c61ecd30ba6e304ae0444d364cfd44254 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas
+Date: Thu, 18 Jun 2020 16:25:12 +0000
+Subject: [PATCH] PR/168: gyakovlev: Include
+
+---
+ src/seccomp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index e667adfe4..68c56485d 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -27,7 +27,7 @@
+ #include "file.h"
+
+ #ifndef lint
+-FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $")
++FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $")
+ #endif /* lint */
+
+ #if HAVE_LIBSECCOMP
+@@ -35,6 +35,7 @@ FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $")
+ #include /* prctl */
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-portage-sandbox.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-portage-sandbox.patch
new file mode 100644
index 0000000000..3ea2664167
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-portage-sandbox.patch
@@ -0,0 +1,26 @@
+From 81765a2d4fcce23f42495d5ec03bbfecb2a3c381 Mon Sep 17 00:00:00 2001
+From: tka
+Date: Wed, 24 Jun 2020 11:18:45 +0200
+Subject: [PATCH] Allow getcwd for Gentoo's portage sandbox
+
+Bug: https://bugs.gentoo.org/728978
+---
+ src/seccomp.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index db9364ae..7f5d6f26 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -229,6 +229,8 @@ enable_sandbox_full(void)
+ ALLOW_RULE(write);
+ ALLOW_RULE(writev);
+
++ // needed by Gentoo's portage sandbox
++ ALLOW_RULE(getcwd);
+
+ #if 0
+ // needed by valgrind
+--
+2.28.0
+
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-seccomp-musl.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-seccomp-musl.patch
new file mode 100644
index 0000000000..72836de67e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.39-seccomp-musl.patch
@@ -0,0 +1,37 @@
+From 93c91e2ba8042d499fee168e27cbd526438454c6 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas
+Date: Sat, 5 Sep 2020 17:20:32 +0000
+Subject: [PATCH] PR/194: puchuu: Handle muslc syscalls
+
+---
+ src/seccomp.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 68c56485d..db9364ae4 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -27,7 +27,7 @@
+ #include "file.h"
+
+ #ifndef lint
+-FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $")
++FILE_RCSID("@(#)$File: seccomp.c,v 1.17 2020/09/05 17:20:32 christos Exp $")
+ #endif /* lint */
+
+ #if HAVE_LIBSECCOMP
+@@ -220,12 +220,14 @@ enable_sandbox_full(void)
+ ALLOW_RULE(rt_sigreturn);
+ ALLOW_RULE(select);
+ ALLOW_RULE(stat);
++ ALLOW_RULE(statx);
+ ALLOW_RULE(stat64);
+ ALLOW_RULE(sysinfo);
+ ALLOW_RULE(umask); // Used in file_pipe2file()
+ ALLOW_RULE(getpid); // Used by glibc in file_pipe2file()
+ ALLOW_RULE(unlink);
+ ALLOW_RULE(write);
++ ALLOW_RULE(writev);
+
+
+ #if 0
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/file/metadata.xml
index 2c14dbfaaa..6e4080f7c3 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/file/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/metadata.xml
@@ -6,6 +6,7 @@
Gentoo Base System
- http://bugs.gw.com/
+ https://bugs.astron.com/
+ cpe:/a:file_project:file