gentoo resync : 01.10.2020

11 files changed, 160 insertions, 123 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index bc91d249f3a5..26dae6013de7 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index ebcc9cd8e6fd..366e82c5d83d 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -3,6 +3,7 @@ DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
 DIST cbindgen-0.14.4.crate 172123 BLAKE2B e86fe619d824b25884570c7a34bdb6ceb3d4906b2309a3c16b29b46284f7bd855991910000a54605eaf2786ce4f570b647a469a2d02831919d9c0a17feda694f SHA512 1d1dfbb159aad25ecbe77368ced803a0cf219a00238364d95b1866f371912e10932e9a6ccda7acd8541b270b1880bda4a29af095a8d83b79a792e31d1ce2bd78
+DIST cbindgen-0.14.6.crate 174606 BLAKE2B 9b1145513b8ff468b4afc51d44e038af48bf925901e1d8b12942e6ec19aed84e984de8024f2684965c6e68d68ae3c772b2a022d1cded9495011c2210156aeac7 SHA512 160165c1e273b571cedde7e7911c56d81408e1fb416d6415329a7a8b4f366a0dc66ceb8974da9ccf3d5dd20af86785cc57c8b788484b17da51372810c25b01bb
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
@@ -37,4 +38,5 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cbindgen-0.14.4.ebuild 1006 BLAKE2B 1075624da79b47614713bfdd1e77c19c7f5ad948b76a0f276a137bd810713c42ab0ec6e0f29f21a9a28617f26eae17f40b2eb4e1bef6b2e201ab6de627d6ae78 SHA512 a69c65e6e254e2dca984bfe25d751e08ecd35aeace7ebb3be00e23441540a2a12fffac4116cba0ef16133b10970b9fbb81888d3300f4624b4b08fde3d2cbed18
+EBUILD cbindgen-0.14.6.ebuild 1009 BLAKE2B ac7582a71fc0e99c00cf6127de470165441efec75e8178efa2eec56816f8b9e0e7f1eec3ad00f98cf2f859df59c0087bd014b612b3d4f991af90428ab08febb3 SHA512 e6fea2fc881be76338599aa6c143283cf0f42b560ade3e1a69b6589992ed2ca22672366e7312600e99d82605917c69c2ae33428cbab94af81f55d2ebde2d6b8f
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.14.6.ebuild b/dev-util/cbindgen/cbindgen-0.14.6.ebuild
new file mode 100644
index 000000000000..bcf078abdef2
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.14.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.13
+bitflags-1.2.1
+c2-chacha-0.2.3
+cbindgen-0.14.6
+cfg-if-0.1.10
+clap-2.33.0
+getrandom-0.1.13
+heck-0.3.1
+itoa-0.4.4
+libc-0.2.66
+log-0.4.8
+ppv-lite86-0.2.6
+proc-macro2-1.0.6
+quote-1.0.2
+rand-0.7.2
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+remove_dir_all-0.5.2
+ryu-1.0.2
+serde-1.0.104
+serde_derive-1.0.104
+serde_json-1.0.44
+strsim-0.8.0
+syn-1.0.11
+tempfile-3.1.0
+textwrap-0.11.0
+toml-0.5.5
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+vec_map-0.8.1
+wasi-0.7.0
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A tool for generating C bindings to Rust code"
+HOMEPAGE="https://github.com/eqrion/cbindgen/"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+QA_FLAGS_IGNORED="usr/bin/cbindgen"
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 3afcfbdf49ad..fd29c8827c5a 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,3 +1,5 @@
 DIST rpm-4.15.1.tar.bz2 4243893 BLAKE2B 352695e1fdac231127c9a2a775ff1aa05c1f3acbb10b0678e06011f9e4a5124e48cc19dce83417866e0f3c92bfd94e9c52b8c1884151ee77559bea1020d3623e SHA512 6c66835da5a54349bcfba5cc69831c8c57568aabd53c5c2820ec78c361be5116fecd41777b097e9c49458f984a7beb054fa8ed453ff7263cad4a29a11f780767
+DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
 EBUILD debugedit-4.15.1.ebuild 1765 BLAKE2B 463b1295cb2cf4d8fd4914546610844495065a62d164b099b3352761b2329cb016d9fa15a1cfab3d8f348a1d9c9392eb4debac627b58af9402cc01d99244eba1 SHA512 29e6a33ff92e86ba3c7eb52eb593c97af3ca52fdf9df999984cdbe7ea2c2a3039619738b0877af42ff1b77515fac2249d603827abbe7c9bba86368f959242a29
+EBUILD debugedit-4.16.0.ebuild 1770 BLAKE2B 9657d25e12679c563a0dd2f6220a58844c043f28ead997e6add996cff70e78964f6f3b88afbb65e7c1a683b4d7250919ebbc822001744adcc46b4e1324300823 SHA512 86a515866fa7f33aeb896b9ee67451bdb8d2850a34fcfca719307bacc002e99039fb24e3d6c6f088da1a6e59ca6c71ae764baca4c875e076315852be9100f1b8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.16.0.ebuild b/dev-util/debugedit/debugedit-4.16.0.ebuild
new file mode 100644
index 000000000000..d2c338794406
--- /dev/null
+++ b/dev-util/debugedit/debugedit-4.16.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_P=rpm-${PV}
+DESCRIPTION="Stand-alone debugedit from RPM"
+HOMEPAGE="https://rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	sys-libs/zlib:=
+	>=dev-libs/popt-1.7
+	>=dev-libs/elfutils-0.176-r1
+	dev-libs/nss
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	eapply_user
+
+	# cheat it into believing we're bundling db
+	mkdir -p db/dist || die
+	touch db/dist/configure || die
+	chmod +x db/dist/configure || die
+	echo 'install:' > db3/Makefile || die
+
+	# TODO: why do we need to do this?
+	mkdir rpm || die
+	find -name '*.h' -exec cp {} rpm/ ';' || die
+}
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	local myconf=(
+		# force linking to static librpmio
+		--disable-shared
+
+		# disable linking compression libraries
+		ac_cv_header_bzlib_h=no
+		ac_cv_header_lzma_h=no
+		--disable-zstd
+
+		# fake some libraries we don't use
+		ac_cv_header_magic_h=yes
+		ac_cv_lib_magic_magic_open=yes
+
+		# use nss as crypto provider
+		--with-crypto=nss
+
+		# disable other stuff irrelevant to debugedit
+		--disable-bdb
+		--disable-nls
+		--disable-plugins
+		--disable-python
+		--without-acl
+		--without-archive
+		--without-cap
+		--without-external-db
+		--without-hackingdocs
+		--without-lua
+		--without-selinux
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -C misc
+	emake -C rpmio
+	emake debugedit
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	dobin debugedit
+}
diff --git a/dev-util/docker-distribution-pruner/Manifest b/dev-util/docker-distribution-pruner/Manifest
index c16471d8bcd2..f5f0ba858a2b 100644
--- a/dev-util/docker-distribution-pruner/Manifest
+++ b/dev-util/docker-distribution-pruner/Manifest
@@ -1,4 +1,4 @@
 DIST docker-distribution-pruner-0_p20170401.tar.gz 6245783 BLAKE2B 7fd29631ff4072a4ef7a9486d8dd9f4b17a2238f94c93e670e7b7af4ba93c8a6577e9ce9f2d248d5d16fb7279f4517317e2c63413424250f14f01d4c47628f5b SHA512 8e2bf3c9be37f7b16299e1e7219d646e2b037ff40ba244bb2262905ab9864b212d7f96d844a096b057c6111440d66236f8ed5eb4a61e95f7a81bac3516f65cdd
 DIST github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz 60814 BLAKE2B a77b7d72e2937af71a0734c21bee7a1d7770157c27f1ddfa164c66fd5461f86a2ef46e002087092ef011caae572838bcc9537a8290cd54dfafb7f54423e47c48 SHA512 184a0e658a4eac3b867533cd0e494bd84db94fbe10e8df0d0b755c7ffc95bc99e2f84c0157183ca74cdc79289a85dcf7f1dea8a4c89a253565baf473b3627eae
-EBUILD docker-distribution-pruner-0_p20170401.ebuild 870 BLAKE2B 665caae201de3e9badd85854df24e0b64f195bc8be2f00e7f7ea096c9274a8c1ed265729b9120844c2456da1c2370ba6f03d3b91fa246c4a4176696e6392f14b SHA512 238ed42112227b6b6429bacc4b4c09978c4dba8f495b137551d5a6244f7c4cda8e0ac8c64b002c02ab012b3c1889caffef4da5286144876b519d7d9290997a01
+EBUILD docker-distribution-pruner-0_p20170401.ebuild 874 BLAKE2B 80edeedcfba5656cd343bc91a32daca30557e143b27585dcfb42f85c30d2b4ab0231a812ed5e97f9ff1e1ae987f6a871fd595114f1c7e3295bc2d4a38a099250 SHA512 8300b5002ce41c619fde53b0ca820b48583091b5bc62c3e4b495b5c0d5187061958312534a23b0b91fc0e64d69536849eba31f6eb3b9410f6d00cbe62b8c4313
 MISC metadata.xml 167 BLAKE2B 6c0e30dd2c7ad7044fee9c1e7065d02ba4ea022e00dc6ffb0f2963999c1dd2cf520462de2bd5c7bd3538feb2995fe22faecd5025505b0e23b85a566abad5cb96 SHA512 82819c7f6af01f9e7f859b7a25f61e44792421b66db7d6568022709d7ecb0d9b3fae57c8d1141ce05860b46561d187a3a4c252774d6f842c55097a9dc1b18cf0
diff --git a/dev-util/docker-distribution-pruner/docker-distribution-pruner-0_p20170401.ebuild b/dev-util/docker-distribution-pruner/docker-distribution-pruner-0_p20170401.ebuild
index 3eafca49e433..506f657c859c 100644
--- a/dev-util/docker-distribution-pruner/docker-distribution-pruner-0_p20170401.ebuild
+++ b/dev-util/docker-distribution-pruner/docker-distribution-pruner-0_p20170401.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ EGO_VENDOR=( "gopkg.in/yaml.v2 a3f3340b5840cee44f372bddb5880fcbc419b46a github.c
 inherit golang-build golang-vcs-snapshot
 
 ARCHIVE_URI="https://${EGO_PN%/*}/repository/archive.tar.gz?ref=${EGIT_COMMIT} -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 DESCRIPTION="Clean all old container revisions from registry"
 HOMEPAGE="https://gitlab.com/gitlab-org/docker-distribution-pruner"
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index ae50f24502c4..c18238730498 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,7 +1,6 @@
 AUX mingw64-runtime-7.0.0-fortify-only-ssp.patch 637 BLAKE2B 3a8eff14b3150446da51354324a3b29e327982fd586339e5f8df4309de2bbdb2722773e0d145d87363183ff70fd02fcdcbc46c560bef9a5111dc33ee8105bede SHA512 991d4294d81a05bfa86d2bed102b3f5bf58435ef02b0a38abe905cc4a0416896b01ffc3a2fe64e78d44e78c9c65051428426b7d19561bd337a229bf7281c7040
-DIST mingw-w64-v6.0.0.tar.bz2 9045653 BLAKE2B 8a54dca2d06c92ab968a93240996d07ab3b1ed4652555a48b7581c477856d5784ed192c578d78186e171e400bd18b4de3c6cafbdd96109367ad13c37792015c1 SHA512 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e
 DIST mingw-w64-v7.0.0.tar.bz2 9071231 BLAKE2B da00794ec456ede5913a565248c79255407c058469cb7338cf81b8d03c1e39f4189016b01734b786c0ad8f18166a24fdb95ca72edc954f31151e5d3aa2b2a899 SHA512 30e5b2824a24eeb99ab519e3fc134cc9a7f04ee8b853bc8d66a13d1ab74144bf78b93e162bfe6de2a5e61f63c0e620a933b260b02d019cd68cc4b78bd36c67fd
-EBUILD mingw64-runtime-6.0.0-r3.ebuild 2974 BLAKE2B c1ed6dbbf19367b8d9d602bf74ee2a32b8b73d619d868cef97855e2b74e2d1d4beee6b05ba9db231099afda3045a8d20d37211dcbfe86c16a147272d69bc03fb SHA512 65b61a53dd01783fc0454ef5016d58a5a1f1c2f36e92f0df9171299afa37ad90b9ebaffa7976503b90d9809d78334c7cdecc5c7fbe49c72d36097c66c43627ea
+DIST mingw-w64-v8.0.0.tar.bz2 9370799 BLAKE2B ec65191722f6f2ddbb93488ea4c4c21e22fb5ef777ef293d65d13de1057d96c9105a4a4936999d4babbd8fdfc52ed14675f1c5fbc630524df28805e0f66b1a2b SHA512 cefcc86ac3e6337c88ed224ab4692abbd5eb543ce78fb6c5462198a85f36c9274a0a1df0a0bebd182137fd527c15831f9237c782711a85f32e77d9104b28359e
 EBUILD mingw64-runtime-7.0.0-r1.ebuild 2989 BLAKE2B e09d29dfec91f89240e4620b01986edbc4e78f0a36159a96abfdc2fc48e7f656f216ee8f311c4bfec79167e43652c7abab56c13b693eaaf4972f2d88842af8f1 SHA512 85865d4e0e793b41c3d6a671aebb2fc97fd79e2a378c1e7093f6821b0194039b7e005c8398369202e8a2ea9a846e9f39a0b5f3c032c76d9d600a6f3e077b508d
-EBUILD mingw64-runtime-7.0.0.ebuild 2933 BLAKE2B 5ee6f08fff1550aa6757fde09ddea6acb394d2a05bff23bfaf27b530939faf78ca2f285413eec2fa7d415c3f3f5b0d0b7186dc6c7dbf78e4a33415a9e5549e1b SHA512 e50caa25f9118306f451fd0b1cab048cff8f5f22d80fea78d021ad0e5cabb970b520c5c26d7e9c1ab162d3fae6b5b934b81241411e18031998d8abcd547d2d86
-MISC metadata.xml 643 BLAKE2B a66741716a2729da314650e4435c616a0a3912cedcc142f23ce74b23c59e21b8a456697a7d38880c1b7d876909ba4b3617a0c72c9f054fcbcbe68841d76c5903 SHA512 fd9528a194bcda889d719ba7f4759414b86cc0d75d9790a9478c46e2abf62b01355e4e01b8e05b7accda0ff0dab94607182671f367cf600e47443b0d4a0bcd53
+EBUILD mingw64-runtime-8.0.0.ebuild 2996 BLAKE2B 52e2daacf0b89a5cfcad0318711d4fd2c293507871b06ed549e0eabdc9e39c581adde3e93f7e4bbe1c6e44a599d297beca827f9ea49763d2bef146237960f16e SHA512 537c976a391696b73af1c3035a9ba2afbd546d5c143eba3cba9d301ac225c2fd0d6f63c42e7c0d932a6870e639dfab1a87abdab71abf9acc4807eef9d78d7c88
+MISC metadata.xml 563 BLAKE2B 84e56e99482d2f7bb1e1095d84915b42190ba74fe7242ffdce548c4249a40be17018a29911d32b9b09df8fc5e04d912dcfe6f473e5eb2478f55d317808b24f4b SHA512 27dca35a3b2d5444b712802c3099c595d9b9fda21f29b6b709222e5bb0aad78f353d0170500eb3b632b254935d35cf43fc43d4ecb61722b711799ca4d28211bd
diff --git a/dev-util/mingw64-runtime/metadata.xml b/dev-util/mingw64-runtime/metadata.xml
index df0beeaf2e90..1b348ca856b1 100644
--- a/dev-util/mingw64-runtime/metadata.xml
+++ b/dev-util/mingw64-runtime/metadata.xml
@@ -8,7 +8,6 @@
   <use>
     <flag name="idl">Install idl files.</flag>
     <flag name="libraries">Build extra libraries: mangle, pseh, winpthreads.</flag>
-    <flag name="secure-api">Expose secure API (*_s function) by default.</flag>
     <flag name="tools">Build extra tools: gendef, genidl.</flag>
   </use>
   <upstream>
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r3.ebuild
deleted file mode 100644
index a3d1f047767b..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit autotools flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE=libraries needs working stage2 compiler: bug #665512
-IUSE="headers-only idl libraries +secure-api tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only
-}
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-	# Normally mingw-64 does not use dynamic linker.
-	# But at configure time it uses $LDFLAGS.
-	# When default -Wl,--hash-style=gnu is passed
-	# __CTORS_LIST__ / __DTORS_LIST__ is mis-detected
-	# for target ld and binaries crash at shutdown.
-	filter-ldflags '-Wl,--hash-style=*'
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	# By default configure tries to set --sysroot=${prefix}. We disable
-	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
-	# That way we can cross-build mingw64-runtime with cross-emerge.
-	local prefix="${EPREFIX}"$(alt_prefix)/usr
-	CHOST=${CTARGET} econf \
-		--with-sysroot=no \
-		--prefix="${prefix}" \
-		--libdir="${prefix}"/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl idl) \
-		$(crt_use_with libraries libraries) \
-		$(crt_use_with tools tools) \
-		$(use_enable secure-api) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-7.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0.ebuild
index 0be51c7d3e6e..9cececad22c3 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-7.0.0.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0.ebuild
@@ -26,6 +26,10 @@ RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch
+)
+
 is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }