Merge updates from master

2026-07-18 19:43:24 -04:00 · 2020-10-11 15:05:00 +00:00
parent b416a97c6b 78881fcd76
commit f716792ac6
20 changed files with 733 additions and 170 deletions
--- a/app-misc/doublecmd-bin/Manifest
+++ b/app-misc/doublecmd-bin/Manifest
@@ -1,7 +1,3 @@
-DIST doublecmd-0.9.8.gtk2.i386.tar.xz 7355960 BLAKE2B 21f2e9c615f7a16ae27bdfbe34126e6ea3f8fa0273299a42c33e95ae637bc9472c8249854daa1916549554d4eb9b2d796c01b339592b88402c1624babbac626e SHA512 3b4f068f4a979a791a98f5605450de7205180f0f43f8a33e784245c5e061ae017161de39093b3ef5f4d24db372b75245ec5d9a50ea2d3d977f570a8c04fd8a1e
-DIST doublecmd-0.9.8.gtk2.x86_64.tar.xz 8608936 BLAKE2B 8a00fa619312e11c382c7ea0beea6ab3366672d5848ac1de3f6f29cac038a756ad8670e9369d4f8bb572f1c1fba3785ec73f48dd5226cfaf53e57ebab015c0e6 SHA512 bd82826b2658fb12f2fe1a28f7c3f1d9c429bc1c60d3e6773b159c4dc1ba1bb2fdd2e89b52e686ab90b2accf7aa6c8379cfcf4f9b6f21f6956f402d721211b03
-DIST doublecmd-0.9.8.qt5.i386.tar.xz 7764336 BLAKE2B 298882bb2659625438e2975a92ae6de30f47afd6d9f3b5c7761b0ba1d26067e46c02204186ed111c56a1e8e954682310fe1be8c174ab60244ab7424d3b70ee8c SHA512 fd84028a3f3ef9cda94b70e9f396f42037915d56a9696ca0048beab12edf890576f092fca2601b0e3d3b02475c57edf828457c8278b9c9f821184083fed4f025
-DIST doublecmd-0.9.8.qt5.x86_64.tar.xz 8611472 BLAKE2B 69de983fb90b15826082882840b74d8a25efeb1477090c5e2697f52439c3bf041f247b4b472b22c7ec662ea75c6f275cd060b90dffbfd9ab6088394ea33b91de SHA512 eb3678ac5037052f9602357a52e4b596f6c5e17fcc1783dc83a76dab0dd7fb6cb1928b21f1c343e4c8810e96e3ad3f243f3ae45b39c07dc708beb3f05c9aa245
 DIST doublecmd-0.9.9.gtk2.i386.tar.xz 7494572 BLAKE2B 858723454efaa760f10f3675d383ebe41e77dfd4cdfb0d2d60342f8106051ef71a127f499c4b21127426818c3585156fcfea7a9f6c5974bf241d5bf8396bf396 SHA512 3ca14d2a0a515758f0b629a54f8d50a11ff27572ef6a004fb2a123b05236893e45fc4c60b7be837891455f4a6bf3a52eb4fa3e93a9d5254fa67d528df2d7b48b
 DIST doublecmd-0.9.9.gtk2.x86_64.tar.xz 8760316 BLAKE2B 3fcd9bf5aa9918d0c7c96b431821b038c93d5736580621e282884f3121e01a3ca28cd9e085da3564914fb3e25270601dd765ba97f18d2c010421dc6de7c92058 SHA512 9733641ac3412eff3d90c8d063448fc8033f5ac262e051630fd1e6ea38a84b1202f2d6d16ebf05a896ad12ce1beb2cb5797989bbe9868c94e66f73f951d9eb16
 DIST doublecmd-0.9.9.qt5.i386.tar.xz 7896720 BLAKE2B 42432a89d70cf19d4acd7ba9a466c25fa8042a77ddfcc7555165efc3aff32960ec88202893393e8448bc05fbf653647a109c2f797b67dab22e075ec09672df46 SHA512 e6e7627d11373b4cd4cad76dc66ee9746ae355c301d8721f9c0e5f368f98f7cae47db7bc7f91baa358493a9991d62e80686323d67f1f98bfd87b614e1069e1fe
--- a/app-misc/doublecmd-bin/doublecmd-bin-0.9.8.ebuild
+++ b/app-misc/doublecmd-bin/doublecmd-bin-0.9.8.ebuild
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils xdg
-
-MY_PN="doublecmd"
-DESCRIPTION="Free cross platform open source file manager with two panels side by side."
-HOMEPAGE="https://doublecmd.sourceforge.io/"
-
-SRC_URI="amd64? (
-		gtk? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.gtk2.x86_64.tar.xz )
-		qt5?  ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.qt5.x86_64.tar.xz )
-	)
-	x86? (
-		gtk? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.gtk2.i386.tar.xz )
-		qt5?  ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.qt5.i386.tar.xz )
-	)"
-
-# Licenses for package and plugins
-LICENSE="GPL-2+ LGPL-2-with-linking-exception LGPL-2.1+ LGPL-3 GPL-1 freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gtk qt5"
-REQUIRED_USE=" ^^ ( gtk qt5 ) "
-
-S="${WORKDIR}/${MY_PN}"
-
-QA_PREBUILT="
-	*/doublecmd
-	*/libQt5Pas.so.1
-"
-
-## "ldd doublecmd" output show linking to some libraries provided by sys-libs/glibc:2.2
-## (maybe virtual/libc-1) and no libraries of sys-libs/ncurses (that removed here).
-## x11-libs/X11 is optional dependency of dev-qt/qtgui:5 by [xcb] or [X]
-## therefore it is mentioned here explicitly.
-RDEPEND="
-	dev-libs/glib:2
-	sys-apps/dbus
-	x11-libs/libX11
-	virtual/libc
-	gtk? ( x11-libs/gtk+:2 )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtx11extras:5
-	)
-"
-
-src_prepare(){
-	default
-	## Create partial init config that allows to store config within user home directory
-	cp "${FILESDIR}/doublecmd.xml" "${S}/"
-}
-
-src_install(){
-	insinto "/opt/${PN}"
-	doins -r "${S}/."
-
-	exeinto "/opt/${PN}"
-	doexe "${S}/${MY_PN}"
-	make_wrapper ${MY_PN} "/opt/${PN}/${MY_PN}" "" "/opt/${PN}" "/opt/bin/"
-
-	doicon -s 48 ${MY_PN}.png
-	make_desktop_entry "${MY_PN}" "Double Commander" "${MY_PN}" "Utility;" || die "Failed making desktop entry!"
-}
--- a/app-misc/watchexec/Manifest
+++ b/app-misc/watchexec/Manifest
@@ -3,13 +3,13 @@ DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022
 DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
 DIST cc-1.0.47.crate 49645 BLAKE2B 39771b601b37a9695a6d49e6d7bba2fa97ff5c1fab11a1a94115d5427a3bfb57cb1501e6b29fe64aa331942a99a9ded88fc8fe21693be697fc7200d919a4e448 SHA512 92bfe74600a43c9d59581641fe0d2aabecb6060b3cbcaac8c8e0fb4f0a21f1099d2887c7b00f205e6c5e972b7aba50e68c360dbcc1090aba942a30199e3cd86c
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
 DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
 DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
 DIST derive_builder-0.9.0.crate 38161 BLAKE2B 08bcbf8851ba813627a56e3f93a95f08a938e0cdd4f2a7971961eb5ecbdd3c96f6143214b49d8ae6cf6be166a934208ff7d0f768a3408868cab093872860e7dc SHA512 e56a01ed13420ac024be394883e5cf148f83ea74d2488931216d84cd2e8f00953e2d61f9b81d34f18be40bda055c02614baeaa89d5fbb9d3defe9ed314f2ef95
 DIST derive_builder_core-0.9.0.crate 18328 BLAKE2B b7a70372bf9300a2957927dc6bf45d64ff923552d2aff463e9811cf295d8bf300f8e3a03c73d08e1f727e91bb0eca2d34e332bd65a1b43506b9d486e559c879a SHA512 432e17868ffbbf6e776ae885eac33617ce06e5f1cb9610e2ced4f17a0d2aa46d3576ec3249f92275379d875cd90dd86ba4de882089ad620fe6497fcd301e4fdf
+DIST embed-resource-1.3.3.crate 10472 BLAKE2B fcb0e869b2e49a53644d4f2b6bf82be0b50b54c69905b650c3f4aa51d697dc70e47a095420045b7134c6116d1559556de13d959612225799ef0ae3ea894a772c SHA512 a979520d08c823e77d9d3ffdd3ded74c235c2eebe16aef07180f4c0b39ca2a603cb538c45f1ce76d28b682c33856f7f9a1dfcd4c0a1e31c054ca79facb5b2741
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST filetime-0.2.8.crate 13527 BLAKE2B 49b9f7a786e3920fd0d457e8ef09fb729dcf557483e17940091ea7079d3bf331e28b7d9029b3840608c8abd6ef1ecd559644826bf5f9bec66881022da9ff72e4 SHA512 c94d3c3926972f3105be52a48654afe3ebc7822d2ef77a2000113c3a85e7f0084b3598c6845a09e8e530d68f50637c3c0b9a058fdfb68052117af3ddcee89d2a
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
@@ -18,10 +18,8 @@ DIST fsevent-sys-2.0.1.crate 3984 BLAKE2B abcecda1e75e47b735f8cf638c958bcf0862d1
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST globset-0.4.4.crate 22369 BLAKE2B 7265cf19e3f7a8e710be40760098242fe156ddfa974a59aa29018c2c317876049dec21e70f8b416ea9a0d16c33754118c7f070dd0e50de70cf8cc10e484a6030 SHA512 b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985
 DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
-DIST inotify-0.6.1.crate 19667 BLAKE2B e4944e28b1f5bae40934fce383abbb85681326137e6cae89d54ac652f82e20497ae1fe2e038e94a072a87289fb98ecdf3f9b70ddbc505b62d1e16bebe1ee3639 SHA512 f818c3a74f2525ae9e57e5a0f1625ac0b86a567f8e8ac92f93836371ae818a05b3ad92893f3e080d2f0e0f7d22d3f25ecb3de5cc744daebd8977301c9280b64c
 DIST inotify-0.7.0.crate 19974 BLAKE2B f61b2f7f2bf1f7580e908600ec1fd7a07f35c69ccc3cad6d6c6af7d0fafb644662aca0eff95642520015a044ed247ad054e017ff2f924d7945c3fc30031ca3a9 SHA512 7af97a18ce129111a8366e63a35ae13d7c33f5debbe88c45ca4a3deffcc287b6a3636355c4ac6b784bf5b1097b32da34e9a7a2a77b4a473e0c9ea968b2c31f04
 DIST inotify-sys-0.1.3.crate 8327 BLAKE2B 964a7c49f16ac6b31bdb22085569e368063141962ef347c4924aba17ce4d4f99d79e7054f1530bee60bd0c99004816cd2ada19808e65b52ec367438d824e5050 SHA512 82ce82277ef2ef05888aae3a997461515d340c7286daefa4f54f7942fcdcbd1e29fbc60907ecdbcb00139db36462fb3c21ce64b9add2b785826adfaa54216a66
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
@@ -35,9 +33,7 @@ DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24
 DIST mio-extras-2.0.5.crate 16151 BLAKE2B cb9fe42394c9662d41c5c1082d5d6d2f2666f0601ece09b54cdbb07cf7e01b7379490571bbab136b522494ca5e35fc2168df2201fd3f105bdff3bec604bb346d SHA512 743fc56546d8bcb09efecda0d60007a175a2db2a75dc882b21fedeb8fc4fcfe98ac0a6d55b0e843b088aac4e24e57145d96b372cdfa39933efee2514ba2ebba9
 DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
 DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
-DIST nix-0.15.0.crate 188640 BLAKE2B e217fc7329cbf49e53f1770da4e4eb15fa84718c265e323cd43b5744aaec2686d3ab93fc8cd52a585341588ee1c76f3d3bf7e25b0a8cb0e876111d12fee3a3c8 SHA512 1b65fcf1701939b85a95dec1483c3ee3e86bcd3ee65b175cd9ba0fc951220594ed9368dca082ef0da566463143d7234a275c15d6b66a724beab128b287c26b3b
 DIST nix-0.17.0.crate 195654 BLAKE2B 6857f84b3deb5800fe3167efd226f042bbcbbc61a4153ce59f69fb544616842c3f6d4566444201c669c6235d1d7577302e5404399f4937f1c0bbbd17fd47ef71 SHA512 3f2bc4f0e9dcb9753535aec9d626ad8126f0a9ea18f73760ba72be0f35d82542c659b4c443783010de133a318f423a16f71cd1f1dd5b5a1f4f71ff7bda247b63
-DIST notify-4.0.14.crate 55241 BLAKE2B 75f7ae49c739a62bfac8729f70f88d916d877a97fc9fb1d0222f7a569269c83c5cd66d8db1e4ff86c9c21d92aa7291f8863a839099697fbf005f3d60aeed8d65 SHA512 56b7864eb08fe16cb43e468c6b907d06941493b0dcf6dcc501cffe3237f25fe6e54eac20c5172e7601012551d2c3f339f0df343278f24503007cc38cb2fa453d
 DIST notify-4.0.15.crate 54853 BLAKE2B 28eea05ff77e8790ce6e3acff74deafa95f119b5ee2af0a7e48d10ff04fb6bc1be9495925cea0fbaca3391a22b51e1800a730a0208f8a4a2b82ce5ed2a49fec3 SHA512 f1712718d00168fccea41aa5e79dd2c3551dd530781f4c589fa787237e6206b738e331dc9100e00d39dbe139230fdbe97b9bc73b076effbdf91f2815a1615398
 DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
@@ -54,15 +50,15 @@ DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78
 DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
-DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
+DIST vswhom-0.1.0.crate 9420 BLAKE2B ad748822fa9650d011c5f240f5e52ae1e27380fc1b22db2ceaaece4fbc814ac2f2792cf6772079199202efe88fb968618a13d91609e5245639f25b32640fad44 SHA512 0ac192e6a1d296904246d89a08021b55384b48959f26f1f0dca893f8fa1e71a012a0d731d1e48e41ca8e4427da84e50fa43ced621e435b010cbcda4f19c45a58
+DIST vswhom-sys-0.1.0.crate 15589 BLAKE2B ee13d0c15323c32d1fba2a952860042f4500c5809a62d27b33d4cfdd7be8099cd04041267bbb61c61bb84fea0892dd6e81b5ee7ec69b19334f31048d8b8c4989 SHA512 f4c4c080c25638c7ea5e96ac42d71bd92752e1fed92234f194d6b597b0f451dc19c44ae28f436aa93e5cff94bf2102e49dbec600d64d3c00c9bf03f98d3ad30e
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
-DIST watchexec-1.12.0.tar.gz 36287 BLAKE2B fd69e0fd28588f3d0f4351c55e697ed90377294f690553a10bbc35cfed2f2caebb355948a0d40045b60f18104f1f99831c7a438127bd379a1623bef5b4a0455a SHA512 71c93f926863c5fbda26fa69316c1ad8ee4d2afac1e89b1231f0b7b3879efe736304beb49865b9bbb5840e730f922b8a6ecc962c5893fbf5b734ce462f96e25b
-DIST watchexec-1.14.0.tar.gz 39319 BLAKE2B 0b31ec78672168c0426fee7f7041a0e74f3356007d4e075428dd36185c895b44a6a17609d37cd52a52a8a64d23fb2169710abeeb5a356ebfec1b6d323c35bbc1 SHA512 e502264aba5b9247f66edce8108bb688b9bce4420ec6b0fd61f32d1d3c3fa781b4582fbd737cfb344a0d59a8eec001091783ff8119643435a277a5490044b8f7
+DIST watchexec-1.14.1.tar.gz 40128 BLAKE2B 52764abd1dc669b32a5903e4c4463a72670de511dd95d6d041174b5eed2616c453cfdcf5fc7ba997b73e981c378d9674cfee34690122e4cb693ca6ba816a94c5 SHA512 93cb5d2d34499f8214e5af2cad0491184d60e084b4729381a3fa73065612889519467f7977a96ffa8f8b4bebc82a0f453e3c62be2936903f5152e8ac1a061d73
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779cb365ad2fc97686a6c13de6a91d6204856ea35a18b86a7f32e8d4ac1ea2d2c096d7dd3e42f78400752cd3e2 SHA512 a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
--- a/app-misc/watchexec/watchexec-1.12.0.ebuild
+++ b/app-misc/watchexec/watchexec-1.12.0.ebuild
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.1.5
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.6
-bitflags-1.2.1
-bstr-0.2.8
-cc-1.0.47
-cfg-if-0.1.10
-clap-2.33.0
-darling-0.10.2
-darling_core-0.10.2
-darling_macro-0.10.2
-derive_builder-0.9.0
-derive_builder_core-0.9.0
-env_logger-0.7.1
-filetime-0.2.8
-fnv-1.0.6
-fsevent-0.4.0
-fsevent-sys-2.0.1
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-glob-0.3.0
-globset-0.4.4
-ident_case-1.0.1
-inotify-0.6.1
-inotify-sys-0.1.3
-iovec-0.1.4
-kernel32-sys-0.2.2
-lazy_static-1.4.0
-lazycell-1.2.1
-libc-0.2.65
-log-0.4.8
-memchr-2.2.1
-mio-0.6.19
-mio-extras-2.0.5
-miow-0.2.1
-net2-0.2.33
-nix-0.15.0
-notify-4.0.14
-proc-macro2-1.0.6
-quote-1.0.2
-redox_syscall-0.1.56
-regex-1.3.1
-regex-syntax-0.6.12
-same-file-1.0.5
-slab-0.4.2
-strsim-0.9.2
-syn-1.0.8
-term_size-0.3.1
-textwrap-0.11.0
-thread_local-0.3.6
-unicode-width-0.1.6
-unicode-xid-0.2.0
-void-1.0.2
-walkdir-2.2.9
-winapi-0.2.8
-winapi-0.3.8
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-ws2_32-sys-0.2.1
-"
-
-inherit cargo
-
-DESCRIPTION="Executes commands in response to file modifications"
-HOMEPAGE="https://github.com/watchexec/watchexec"
-SRC_URI="https://github.com/watchexec/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-RESTRICT="mirror"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	cargo_src_install
-
-	dodoc README.md
-}
--- a/app-misc/watchexec/watchexec-1.14.1.ebuild
+++ b/app-misc/watchexec/watchexec-1.14.1.ebuild
@@ -17,6 +17,7 @@ darling_core-0.10.2
 darling_macro-0.10.2
 derive_builder-0.9.0
 derive_builder_core-0.9.0
+embed-resource-1.3.3
 env_logger-0.7.1
 filetime-0.2.8
 fnv-1.0.6
@@ -57,6 +58,8 @@ thread_local-0.3.6
 unicode-width-0.1.6
 unicode-xid-0.2.0
 void-1.0.2
+vswhom-0.1.0
+vswhom-sys-0.1.0
 walkdir-2.3.1
 winapi-0.2.8
 winapi-0.3.9
@@ -64,6 +67,7 @@ winapi-build-0.1.1
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-util-0.1.2
 winapi-x86_64-pc-windows-gnu-0.4.0
+winreg-0.6.2
 ws2_32-sys-0.2.1
 "

--- a/app-text/git-delta/Manifest
+++ b/app-text/git-delta/Manifest
@@ -37,7 +37,9 @@ DIST flate2-1.0.12.crate 73844 BLAKE2B 46d0e592e68dae030c4e05aa073ac8940c8778e70
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST git-delta-0.4.3.tar.gz 1023988 BLAKE2B 47290ffb905e9ea9c5901873036bff557cee0e46efc507784b93a51012fcb02b6610d0e98672d8a58b411eb624480b7e56a0051d376a77f6c990a0454ef03a03 SHA512 ef5489c1f54b7fed2e3c17636fddf3f09ad5512927183a9943eb9e0efc2b3fa5316ca531b9f6ff41c422e6198637760b60a719cf2f7e990111bc99886ad70bb1
+DIST git-delta-0.4.4.tar.gz 1024790 BLAKE2B c0a74299196c4dde617db74832d4db906b8b3eab2a1b302ee81ce5a9fe2df4daf8306768d00d9914153159aa8fc0d5aaaebd9ddbeec3c79ce41bed8c92702308 SHA512 1d42f87efef0ba065860fd2c3d2db3cfc1e97580b4bd031e91393a21479ab61d5c7afc99eb232eb16bf8db6853072b714027c720fd2d452be74e0ef0a5d1dc34
 DIST git2-0.13.10.crate 173112 BLAKE2B 748eb3bc345272f3d0b6cba99f0e463f8e7c0b280f19ccb08074e9ee1afb91aaba4eb90187a80db66390d74fd496be432f3d37c7b4c34c605f870c11e4bd802e SHA512 c2d99cd9f564ecd3cfe68dd311517d513d0a4267f36d34284295dab10dc58008a42c91cdfb9b2c9ff89220e527010189e051c0f09de612744d58ed1759b38228
+DIST git2-0.13.11.crate 173742 BLAKE2B c14fa5ff6c6d7dcb78a2c7abc3ac8254e50fdfc21926484596f6e259a8fee825b4b11b4a592e923a079cda019059c2feb787c82e4bc23e0de1c18a2b68f8d71e SHA512 2cacde47dfbf9df7a46d8d25fcd182f3ef239c4dd987e7f21b3e49e29671bcbae84f387014610559b2bacdad0708a9ec2804b67befb1ec139848a625508e93a9
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST hermit-abi-0.1.12.crate 9217 BLAKE2B aecc8c743241596ef4dceaa61b4ac36ee0a2501e97eac976c733638cbc8a3c4926b9e231404a67a3687aae03049ad8ebb10fdba2d8c72002c0c08a2f8f76e3ec SHA512 7c2c7950f2b70dc64ef7c111b7790d7128b49c91aba9c063e11a3e09070b28171de6b77d1f31b4ca0c1642e61bf4b9d50e41d72b9c9228bdd1749347eb753df2
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
@@ -49,6 +51,7 @@ DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8
 DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
 DIST libc-0.2.60.crate 409744 BLAKE2B 1d2dfb912a0a01d93ef10d57ee7d2259c0b82ec29b34a0f1c4065c6be080685f556407cee896bd74b01136a59d9c583258818118c81e9ecec5a6387569affe77 SHA512 649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c
 DIST libgit2-sys-0.12.12+1.0.1.crate 1555561 BLAKE2B cc3333822b7959f1e86d5bdad33d2797b00a030373c33777d01d4a6f42723210071cd3de508f34046108b4a66e1f06bce4b9fd2c22c34d5eebf7f57e92ee84c1 SHA512 32fa2a9318583dd46b5f31559c22b96721a0546d9ea8025f5e447bf5ee447b3997c1fd8678a897067a92c19e4143e5bbfa80968a3ef929faf3c1dfd436df6a86
+DIST libgit2-sys-0.12.13+1.0.1.crate 1555713 BLAKE2B 2b8455575182d4e56be1dfe392b4a55cb04b2d61c18982623dfec182ff348ac7ebe42cfce97bcf8e4f17cf55efb6a85b7e31553d4ccd1911c91748cbe8d0df6c SHA512 fc8a1e85ab4d23a408ff5f0af9cea16db6a9a30a68885340431ce7e26bc4e13ae50c96cd09485c9f3bc3f74ab57cc16e3b50f0a73ed8c67571afed289bbbd913
 DIST libz-sys-1.1.0.crate 1324239 BLAKE2B cab82119fdeed84c3c4d37080b2065002dfe9de7b9bfa63256a61ff98cf06fc08e9f1edf02288589085d0f7a400335338b50f9c5f7bca5d2c71fdad433e802a8 SHA512 2d7ca1dc376d77c8b4b764d02bb6371c72ab6f07def5f50b22d77d19631e5a1f67d2e1a51c4cf7766fb365cda2286692181c6a05f55126404033347f307b9283
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
 DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
@@ -89,7 +92,9 @@ DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d42
 DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.17.crate 50166 BLAKE2B 86be10f82d7f56ec178c87248c1618664ed2f8491649e4d90d6dd3358bd4b9ddd76685635e060fd37562cde2abf87ab0f933b9a212e32bdbd4e72d69e103fe9a SHA512 dc193e216dca278b081057072e7888f5b0e0c773fac8e136efd9d0af8cfe89f60d07459bbf23172dd7f8c4ee461458a7d5be957d6cddcc5bbff18515716b66c0
+DIST structopt-0.3.19.crate 50644 BLAKE2B caeb54d559de0830b10b8d20603f09c03da46a856041b470522a59a574e5f73177d4d180a1dda7525251a7b4f73f8b3fe0a96b90d7da3a97391f542d7bfa2fad SHA512 e97e81b936c7077bc2f58c3d65eda8fe3f235929a1f30e9ddcd4666e2ff0a4b24a9175e5beb0ff1414a55d2b6aadba54f762c4ad83ee5a6dbb4b272bd7d59c29
 DIST structopt-derive-0.4.10.crate 19724 BLAKE2B d7e3ebaff53b82e093ef750c10593856270dc59f3ac1f6590256806ea7f7dd2254be6ce1b4e5d8322f9bd1b68931816ddf0f5ff8bcabee3c9112f837610daf81 SHA512 b390a703cf8103fe89663bbeaed30871b8c0f9738f6543fa35e36125c0d1eb3032e363812c1c197c4a42da204b992e7c69fe11bedd4474d3ddea19a96c81bbad
+DIST structopt-derive-0.4.12.crate 19742 BLAKE2B e1da17d19b5244ebc32522827e7acfe4133bb919374639f775864f7bd4b52fa16374640d4022f839ac682954cfd07c692d70329a347281d9dec4035bf89c7afa SHA512 ef65a34b9a9f23be853340413cd5847434b2c3279a401f938a0a82d5499f9c17968b85f13c60a058a69fbe78c7c24380fca31f0e7ef86d986fe15a082353d98b
 DIST syn-0.15.43.crate 184065 BLAKE2B f0f1f97fecc71c91da6ef9d8c5be43f0a320fbf5d7ea6d1d6ec6743735790adea03b0058b8c544b1b06ad7618b7c7b56c64ceff5ccbfd2cc2240772cbd46e720 SHA512 b2b022706c802a601b92e21601113205b147c8129b9c0e6fa86d0c4f823fc3ac3c1bcb48f678fb2396c76759580254b16f10267d8d22a98a733dded34ebbadae
 DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
 DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
--- a/app-text/git-delta/git-delta-0.4.4.ebuild
+++ b/app-text/git-delta/git-delta-0.4.4.ebuild
@@ -0,0 +1,163 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.1
+
+EAPI=7
+
+CRATES="
+adler32-1.0.4
+aho-corasick-0.7.6
+ansi_colours-1.0.1
+ansi_term-0.11.0
+ansi_term-0.12.1
+arrayref-0.3.5
+arrayvec-0.5.1
+atty-0.2.14
+autocfg-1.0.0
+backtrace-0.3.40
+backtrace-sys-0.1.32
+base64-0.10.1
+base64-0.12.1
+bincode-1.2.1
+bitflags-1.2.1
+blake2b_simd-0.5.9
+box_drawing-0.1.2
+bytelines-2.2.2
+byteorder-1.3.2
+cc-1.0.54
+cfg-if-0.1.9
+chrono-0.4.11
+clap-2.33.0
+cloudabi-0.0.3
+console-0.12.0
+constant_time_eq-0.1.4
+crc32fast-1.2.0
+crossbeam-utils-0.6.6
+dirs-3.0.1
+dirs-sys-0.3.5
+either-1.5.3
+encode_unicode-0.3.5
+error-chain-0.12.4
+failure-0.1.6
+failure_derive-0.1.6
+flate2-1.0.12
+fnv-1.0.6
+fuchsia-cprng-0.1.1
+git2-0.13.11
+heck-0.3.1
+hermit-abi-0.1.12
+idna-0.2.0
+indexmap-1.3.2
+itertools-0.9.0
+itoa-0.4.4
+jobserver-0.1.21
+lazy_static-1.4.0
+lazycell-1.2.1
+libc-0.2.60
+libgit2-sys-0.12.13+1.0.1
+libz-sys-1.1.0
+line-wrap-0.1.1
+linked-hash-map-0.5.2
+log-0.4.8
+matches-0.1.8
+memchr-2.2.1
+miniz_oxide-0.3.6
+num-integer-0.1.42
+num-traits-0.2.11
+onig-6.0.0
+onig_sys-69.5.0
+percent-encoding-2.1.0
+pkg-config-0.3.17
+plist-1.0.0
+proc-macro-error-1.0.2
+proc-macro-error-attr-1.0.2
+proc-macro2-0.4.30
+proc-macro2-1.0.6
+quote-0.6.13
+quote-1.0.2
+rand_core-0.3.1
+rand_core-0.4.2
+rand_os-0.1.3
+rdrand-0.4.0
+redox_syscall-0.1.56
+redox_users-0.3.1
+regex-1.3.9
+regex-syntax-0.6.18
+rust-argon2-0.5.1
+rustc-demangle-0.1.16
+ryu-1.0.0
+safemem-0.3.1
+same-file-1.0.5
+serde-1.0.98
+serde_derive-1.0.98
+serde_json-1.0.40
+shell-words-1.0.0
+smallvec-1.4.0
+strsim-0.8.0
+structopt-0.3.19
+structopt-derive-0.4.12
+syn-0.15.43
+syn-1.0.11
+syn-mid-0.5.0
+synstructure-0.12.3
+syntect-4.4.0
+terminal_size-0.1.13
+termios-0.3.1
+textwrap-0.11.0
+thread_local-1.0.1
+unicode-bidi-0.3.4
+unicode-normalization-0.1.12
+unicode-segmentation-1.6.0
+unicode-width-0.1.8
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+url-2.1.1
+utf8parse-0.2.0
+vcpkg-0.2.9
+vec_map-0.8.1
+version_check-0.9.1
+vte-0.8.0
+vte_generate_state_changes-0.1.1
+walkdir-2.2.9
+winapi-0.3.7
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.4
+winapi-x86_64-pc-windows-gnu-0.4.0
+xml-rs-0.8.0
+yaml-rust-0.4.3
+"
+
+inherit cargo bash-completion-r1
+
+MY_PN=delta
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DESCRIPTION="A syntax-highlighting pager for git"
+HOMEPAGE="https://github.com/dandavison/delta"
+SRC_URI="https://github.com/dandavison/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+# Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored.
+RESTRICT="mirror"
+LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC LGPL-3+ MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion zsh-completion"
+
+DEPEND=""
+RDEPEND="!app-text/delta"
+
+src_install() {
+	cargo_src_install
+
+	dodoc README.md
+
+	if use bash-completion ; then
+		newbashcomp etc/completion/completion.bash delta
+	fi
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins etc/completion/completion.zsh _delta
+	fi
+}
--- a/dev-python/bitbox02/Manifest
+++ b/dev-python/bitbox02/Manifest
@@ -0,0 +1 @@
+DIST bitbox02-4.1.0.tar.gz 49519 BLAKE2B 07878b1f65361f512e0067cdfb38208194c79b75a19b871de928af3ed77f8d7762eee92b476ef605a38a3755eca256d17a65d770a2f63f0cade8ff93028616a7 SHA512 affaf2c0f40805c37062eebab2a12174fb9f0094f0054ecba4273a906f24341efdc405dad81a20adb411d9656101afa323fc44ada40112f29107f268a6d42717
--- a/dev-python/bitbox02/bitbox02-4.1.0.ebuild
+++ b/dev-python/bitbox02/bitbox02-4.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python API for communicating with the BitBox02 device"
+HOMEPAGE="https://github.com/digitalbitbox/bitbox02-firmware"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/base58-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/ecdsa-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/hidapi-0.7.99[${PYTHON_USEDEP}]
+	>=dev-python/noiseprotocol-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/semver-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]"
+BDEPEND=""
--- a/dev-python/bitbox02/metadata.xml
+++ b/dev-python/bitbox02/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>a.zuber@gmx.ch</email>
+    <name>Andreas Zuber</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">digitalbitbox/bitbox02-firmware</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/noiseprotocol/Manifest
+++ b/dev-python/noiseprotocol/Manifest
@@ -0,0 +1 @@
+DIST noiseprotocol-0.3.1.tar.gz 308729 BLAKE2B ac8e885da15cab760bc41a6953e70af6496df5865a441df1816aca02d06820aa0ceec10d27cd9bf089d0dff83f7e8e10eee6165d3f66705792bbc071a6a4b823 SHA512 2b25b80c4d187e5529b9de0bb50698646d74aa40e9c09e6b3acf5463603eb3415027c92cfe1f25bc3a6143958aa60cb014561ab390bb63db373ec04067146216
--- a/dev-python/noiseprotocol/metadata.xml
+++ b/dev-python/noiseprotocol/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>a.zuber@gmx.ch</email>
+    <name>Andreas Zuber</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">plizonczyk/noiseprotocol</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/noiseprotocol/noiseprotocol-0.3.1.ebuild
+++ b/dev-python/noiseprotocol/noiseprotocol-0.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of Noise Protocol Framework"
+HOMEPAGE="https://github.com/plizonczyk/noiseprotocol"
+NOISEPROTOCOL_GIT_REVISION="73375448c55af85df0230841af868b7f31942f0a"
+SRC_URI="https://github.com/plizonczyk/${PN}/archive/${NOISEPROTOCOL_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/cryptography-2.8[${PYTHON_USEDEP}]"
+BDEPEND=""
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "/find_packages/s:'examples':'examples', 'examples.\*':" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+S="${WORKDIR}/${PN}-${NOISEPROTOCOL_GIT_REVISION}"
--- a/dev-vcs/lazygit/files/lazygit-0.23.1_ssh_passphrase.patch
+++ b/dev-vcs/lazygit/files/lazygit-0.23.1_ssh_passphrase.patch
@@ -0,0 +1,122 @@
+diff -Naur a/src/github.com/jesseduffield/lazygit/pkg/commands/oscommands/os.go b/src/github.com/jesseduffield/lazygit/pkg/commands/oscommands/os.go
+--- a/src/github.com/jesseduffield/lazygit/pkg/commands/oscommands/os.go	2020-10-10 02:34:14.000000000 +0300
+++ b/src/github.com/jesseduffield/lazygit/pkg/commands/oscommands/os.go	2020-10-10 14:00:26.000000000 +0300
+@@ -143,18 +143,19 @@
+ 	return RunCommandWithOutputLiveWrapper(c, command, output)
+ }
+ 
+-// DetectUnamePass detect a username / password question in a command
+-// promptUserForCredential is a function that gets executed when this function detect you need to fillin a password
+-// The promptUserForCredential argument will be "username" or "password" and expects the user's password or username back
+// DetectUnamePass detect a username / password / passphrase question in a command
+// promptUserForCredential is a function that gets executed when this function detect you need to fillin a password or passphrase
+// The promptUserForCredential argument will be "username", "password" or "passphrase" and expects the user's password/passphrase or username back
+ func (c *OSCommand) DetectUnamePass(command string, promptUserForCredential func(string) string) error {
+ 	ttyText := ""
+ 	errMessage := c.RunCommandWithOutputLive(command, func(word string) string {
+ 		ttyText = ttyText + " " + word
+ 
+ 		prompts := map[string]string{
+-			`.+'s password:`:         "password",
+-			`Password\s*for\s*'.+':`: "password",
+-			`Username\s*for\s*'.+':`: "username",
+			`.+'s password:`:                         "password",
+			`Password\s*for\s*'.+':`:                 "password",
+			`Username\s*for\s*'.+':`:                 "username",
+			`Enter\s*passphrase\s*for\s*key\s*'.+':`: "passphrase",
+ 		}
+ 
+ 		for pattern, askFor := range prompts {
+diff -Naur a/src/github.com/jesseduffield/lazygit/pkg/gui/credentials_panel.go b/src/github.com/jesseduffield/lazygit/pkg/gui/credentials_panel.go
+--- a/src/github.com/jesseduffield/lazygit/pkg/gui/credentials_panel.go	2020-10-10 02:34:14.000000000 +0300
+++ b/src/github.com/jesseduffield/lazygit/pkg/gui/credentials_panel.go	2020-10-10 03:17:57.000000000 +0300
+@@ -9,7 +9,7 @@
+ 
+ type credentials chan string
+ 
+-// promptUserForCredential wait for a username or password input from the credentials popup
+// promptUserForCredential wait for a username, password or passphrase input from the credentials popup
+ func (gui *Gui) promptUserForCredential(passOrUname string) string {
+ 	gui.credentials = make(chan string)
+ 	gui.g.Update(func(g *gocui.Gui) error {
+@@ -17,9 +17,12 @@
+ 		if passOrUname == "username" {
+ 			credentialsView.Title = gui.Tr.CredentialsUsername
+ 			credentialsView.Mask = 0
+-		} else {
+		} else if passOrUname == "password" {
+ 			credentialsView.Title = gui.Tr.CredentialsPassword
+ 			credentialsView.Mask = '*'
+		} else {
+			credentialsView.Title = gui.Tr.CredentialsPassphrase
+			credentialsView.Mask = '*'
+ 		}
+ 
+ 		if err := gui.switchContext(gui.Contexts.Credentials.Context); err != nil {
+@@ -30,7 +33,7 @@
+ 		return nil
+ 	})
+ 
+-	// wait for username/passwords input
+	// wait for username/passwords/passphrase input
+ 	userInput := <-gui.credentials
+ 	return userInput + "\n"
+ }
+@@ -70,10 +73,10 @@
+ func (gui *Gui) handleCredentialsPopup(cmdErr error) {
+ 	if cmdErr != nil {
+ 		errMessage := cmdErr.Error()
+-		if strings.Contains(errMessage, "Invalid username or password") {
+		if strings.Contains(errMessage, "Invalid username, password or passphrase") {
+ 			errMessage = gui.Tr.PassUnameWrong
+ 		}
+-		// we are not logging this error because it may contain a password
+		// we are not logging this error because it may contain a password or a passphrase
+ 		gui.createErrorPanel(errMessage)
+ 	} else {
+ 		_ = gui.closeConfirmationPrompt(false)
+diff -Naur a/src/github.com/jesseduffield/lazygit/pkg/i18n/dutch.go b/src/github.com/jesseduffield/lazygit/pkg/i18n/dutch.go
+--- a/src/github.com/jesseduffield/lazygit/pkg/i18n/dutch.go	2020-10-10 02:34:14.000000000 +0300
+++ b/src/github.com/jesseduffield/lazygit/pkg/i18n/dutch.go	2020-10-10 02:57:03.000000000 +0300
+@@ -19,6 +19,7 @@
+ 		CommitMessage:                       "Commit bericht",
+ 		CredentialsUsername:                 "Gebruikersnaam",
+ 		CredentialsPassword:                 "Wachtwoord",
+		CredentialsPassphrase:               "Voer een wachtwoordzin in voor de SSH-sleutel",
+ 		PassUnameWrong:                      "Wachtwoord en/of gebruikersnaam verkeert",
+ 		CommitChanges:                       "Commit veranderingen",
+ 		AmendLastCommit:                     "wijzig laatste commit",
+diff -Naur a/src/github.com/jesseduffield/lazygit/pkg/i18n/english.go b/src/github.com/jesseduffield/lazygit/pkg/i18n/english.go
+--- a/src/github.com/jesseduffield/lazygit/pkg/i18n/english.go	2020-10-10 02:34:14.000000000 +0300
+++ b/src/github.com/jesseduffield/lazygit/pkg/i18n/english.go	2020-10-10 02:56:08.000000000 +0300
+@@ -30,6 +30,7 @@
+ 	CommitMessage                       string
+ 	CredentialsUsername                 string
+ 	CredentialsPassword                 string
+	CredentialsPassphrase               string
+ 	PassUnameWrong                      string
+ 	CommitChanges                       string
+ 	AmendLastCommit                     string
+@@ -519,7 +520,8 @@
+ 		CommitMessage:                       "Commit message",
+ 		CredentialsUsername:                 "Username",
+ 		CredentialsPassword:                 "Password",
+-		PassUnameWrong:                      "Password and/or username wrong",
+		CredentialsPassphrase:               "Enter passphrase for SSH key",
+		PassUnameWrong:                      "Password, passphrase and/or username wrong",
+ 		CommitChanges:                       "commit changes",
+ 		AmendLastCommit:                     "amend last commit",
+ 		SureToAmend:                         "Are you sure you want to amend last commit? Afterwards, you can change commit message from the commits panel.",
+diff -Naur a/src/github.com/jesseduffield/lazygit/pkg/i18n/polish.go b/src/github.com/jesseduffield/lazygit/pkg/i18n/polish.go
+--- a/src/github.com/jesseduffield/lazygit/pkg/i18n/polish.go	2020-10-10 02:34:14.000000000 +0300
+++ b/src/github.com/jesseduffield/lazygit/pkg/i18n/polish.go	2020-10-10 02:49:23.000000000 +0300
+@@ -15,7 +15,8 @@
+ 		CommitMessage:                       "Wiadomość commita",
+ 		CredentialsUsername:                 "Username",
+ 		CredentialsPassword:                 "Password",
+-		PassUnameWrong:                      "Password and/or username wrong",
+		CredentialsPassphrase:               "Passphrase",
+		PassUnameWrong:                      "Password, passphrase and/or username wrong",
+ 		CommitChanges:                       "commituj zmiany",
+ 		AmendLastCommit:                     "zmień ostatnie zatwierdzenie",
+ 		SureToAmend:                         "Czy na pewno chcesz zmienić ostatnie zatwierdzenie? Możesz zmienić komunikat zatwierdzenia z panelu zatwierdzeń.",
--- a/dev-vcs/lazygit/lazygit-0.23.1-r1.ebuild
+++ b/dev-vcs/lazygit/lazygit-0.23.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/jesseduffield/lazygit"
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Lazygit, a simple terminal UI for git commands"
+HOMEPAGE="https://github.com/jesseduffield/lazygit"
+SRC_URI="https://github.com/jesseduffield/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND=( sys-libs/glibc )
+RDEPEND=(
+	${DEPEND}
+	dev-vcs/git
+)
+
+DOCS=( src/${EGO_PN}/{CONTRIBUTING,README}.md )
+
+PATCHES=( "${FILESDIR}/${P}_ssh_passphrase.patch" )
+
+src_compile() {
+	GOPATH="${S}" go build -v -o bin/lazygit src/${EGO_PN}/main.go || die
+}
+
+src_install() {
+	dobin bin/lazygit
+
+	use doc && dodoc -r "src/${EGO_PN}/docs/."
+	einstalldocs
+}
--- a/dev-vcs/lazygit/lazygit-9999.ebuild
+++ b/dev-vcs/lazygit/lazygit-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/jesseduffield/lazygit"
+
+inherit git-r3 golang-build golang-vcs
+
+DESCRIPTION="Lazygit, a simple terminal UI for git commands"
+HOMEPAGE="https://github.com/jesseduffield/lazygit"
+EGIT_REPO_URI="https://github.com/jesseduffield/lazygit.git"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DEPEND=( sys-libs/glibc )
+RDEPEND=(
+	${DEPEND}
+	dev-vcs/git
+)
+
+DOCS=( src/${EGO_PN}/{CONTRIBUTING,README}.md )
+
+src_compile() {
+	GOPATH="${S}" go build -v -o bin/lazygit src/${EGO_PN}/main.go || die
+}
+
+src_install() {
+	dobin bin/lazygit
+
+	use doc && dodoc -r "src/${EGO_PN}/docs/."
+	einstalldocs
+}
--- a/mail-client/heirloom-mailx/Manifest
+++ b/mail-client/heirloom-mailx/Manifest
@@ -0,0 +1 @@
+DIST heirloom-mailx_12.5.orig.tar.gz 324085 BLAKE2B 8f3b7177d9db8bb399f9e3e8d51258d93ea6ea9556f514c9107b0733f2f999ec9c685107c8a11717526051c242d5f20d4b6fc1a572175539874904cb31fcc452 SHA512 eb4aea0c668354f6fe28137f72bf49d291ce58671a7b70c7775777532e17e59ac52156e68f02937256f0a2f90c132b7c0948553b55daad92a664bd8bbb64774f
--- a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-fixes-1.patch
+++ b/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-fixes-1.patch
@@ -0,0 +1,232 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2014-12-27
+Initial Package Version: 12.5
+Upstream Status: Unknown
+Origin: Changes to remove SSL2 found at debian, remainder from redhat.
+Description: Removes support for SSL2 (openssl no longer supports it)
+and fixes CVE-2004-2771 [sic] and CVE-2014-7844.
+
+diff -Naur heirloom-mailx-12.5/extern.h heirloom-mailx-12.5-patched/extern.h
+--- heirloom-mailx-12.5/extern.h	2011-04-26 22:23:22.000000000 +0100
+++ heirloom-mailx-12.5-patched/extern.h	2014-12-27 01:26:59.654169487 +0000
+@@ -396,7 +396,7 @@
+ int is_fileaddr(char *name);
+ struct name *usermap(struct name *names);
+ struct name *cat(struct name *n1, struct name *n2);
+-char **unpack(struct name *np);
+char **unpack(struct name *smopts, struct name *np);
+ struct name *elide(struct name *names);
+ int count(struct name *np);
+ struct name *delete_alternates(struct name *np);
+diff -Naur heirloom-mailx-12.5/fio.c heirloom-mailx-12.5-patched/fio.c
+--- heirloom-mailx-12.5/fio.c	2011-04-26 22:23:22.000000000 +0100
+++ heirloom-mailx-12.5-patched/fio.c	2014-12-27 01:27:15.634561413 +0000
+@@ -43,12 +43,15 @@
+ #endif /* not lint */
+ 
+ #include "rcv.h"
+
+#ifndef HAVE_WORDEXP
+#error wordexp support is required
+#endif
+
+ #include <sys/stat.h>
+ #include <sys/file.h>
+ #include <sys/wait.h>
+-#ifdef	HAVE_WORDEXP
+ #include <wordexp.h>
+-#endif	/* HAVE_WORDEXP */
+ #include <unistd.h>
+ 
+ #if defined (USE_NSS)
+@@ -481,7 +484,6 @@
+ static char *
+ globname(char *name)
+ {
+-#ifdef	HAVE_WORDEXP
+ 	wordexp_t we;
+ 	char *cp;
+ 	sigset_t nset;
+@@ -495,7 +497,7 @@
+ 	sigemptyset(&nset);
+ 	sigaddset(&nset, SIGCHLD);
+ 	sigprocmask(SIG_BLOCK, &nset, NULL);
+-	i = wordexp(name, &we, 0);
+	i = wordexp(name, &we, WRDE_NOCMD);
+ 	sigprocmask(SIG_UNBLOCK, &nset, NULL);
+ 	switch (i) {
+ 	case 0:
+@@ -527,65 +529,6 @@
+ 	}
+ 	wordfree(&we);
+ 	return cp;
+-#else	/* !HAVE_WORDEXP */
+-	char xname[PATHSIZE];
+-	char cmdbuf[PATHSIZE];		/* also used for file names */
+-	int pid, l;
+-	char *cp, *shell;
+-	int pivec[2];
+-	extern int wait_status;
+-	struct stat sbuf;
+-
+-	if (pipe(pivec) < 0) {
+-		perror("pipe");
+-		return name;
+-	}
+-	snprintf(cmdbuf, sizeof cmdbuf, "echo %s", name);
+-	if ((shell = value("SHELL")) == NULL)
+-		shell = SHELL;
+-	pid = start_command(shell, 0, -1, pivec[1], "-c", cmdbuf, NULL);
+-	if (pid < 0) {
+-		close(pivec[0]);
+-		close(pivec[1]);
+-		return NULL;
+-	}
+-	close(pivec[1]);
+-again:
+-	l = read(pivec[0], xname, sizeof xname);
+-	if (l < 0) {
+-		if (errno == EINTR)
+-			goto again;
+-		perror("read");
+-		close(pivec[0]);
+-		return NULL;
+-	}
+-	close(pivec[0]);
+-	if (wait_child(pid) < 0 && WTERMSIG(wait_status) != SIGPIPE) {
+-		fprintf(stderr, catgets(catd, CATSET, 81,
+-				"\"%s\": Expansion failed.\n"), name);
+-		return NULL;
+-	}
+-	if (l == 0) {
+-		fprintf(stderr, catgets(catd, CATSET, 82,
+-					"\"%s\": No match.\n"), name);
+-		return NULL;
+-	}
+-	if (l == sizeof xname) {
+-		fprintf(stderr, catgets(catd, CATSET, 83,
+-				"\"%s\": Expansion buffer overflow.\n"), name);
+-		return NULL;
+-	}
+-	xname[l] = 0;
+-	for (cp = &xname[l-1]; *cp == '\n' && cp > xname; cp--)
+-		;
+-	cp[1] = '\0';
+-	if (strchr(xname, ' ') && stat(xname, &sbuf) < 0) {
+-		fprintf(stderr, catgets(catd, CATSET, 84,
+-				"\"%s\": Ambiguous.\n"), name);
+-		return NULL;
+-	}
+-	return savestr(xname);
+-#endif	/* !HAVE_WORDEXP */
+ }
+ 
+ /*
+diff -Naur heirloom-mailx-12.5/mailx.1 heirloom-mailx-12.5-patched/mailx.1
+--- heirloom-mailx-12.5/mailx.1	2011-04-26 22:23:22.000000000 +0100
+++ heirloom-mailx-12.5-patched/mailx.1	2014-12-27 01:26:53.838026857 +0000
+@@ -656,6 +656,14 @@
+ will have the system wide alias expanded
+ as all mail goes through sendmail.
+ .SS "Recipient address specifications"
+If the
+.I expandaddr
+option is not set (the default), recipient addresses must be names of
+local mailboxes or Internet mail addresses.
+.PP
+If the
+.I expandaddr
+option is set, the following rules apply:
+ When an address is used to name a recipient
+ (in any of To, Cc, or Bcc),
+ names of local mail folders
+@@ -2391,6 +2399,12 @@
+ If this option is set,
+ \fImailx\fR starts even with an empty mailbox.
+ .TP
+.B expandaddr
+Causes
+.I mailx
+to expand message recipient addresses, as explained in the section,
+Recipient address specifications.
+.TP
+ .B flipr
+ Exchanges the
+ .I Respond
+@@ -3575,7 +3589,7 @@
+ .TP
+ .B ssl-method
+ Selects a SSL/TLS protocol version;
+-valid values are `ssl2', `ssl3', and `tls1'.
+valid values are `ssl3', and `tls1'.
+ If unset, the method is selected automatically,
+ if possible.
+ .TP
+diff -Naur heirloom-mailx-12.5/names.c heirloom-mailx-12.5-patched/names.c
+--- heirloom-mailx-12.5/names.c	2011-04-26 22:23:22.000000000 +0100
+++ heirloom-mailx-12.5-patched/names.c	2014-12-27 01:26:59.654169487 +0000
+@@ -268,6 +268,9 @@
+ 	FILE *fout, *fin;
+ 	int ispipe;
+ 
+	if (value("expandaddr") == NULL)
+		return names;
+
+ 	top = names;
+ 	np = names;
+ 	time(&now);
+@@ -546,7 +549,7 @@
+  * Return an error if the name list won't fit.
+  */
+ char **
+-unpack(struct name *np)
+unpack(struct name *smopts, struct name *np)
+ {
+ 	char **ap, **top;
+ 	struct name *n;
+@@ -561,7 +564,7 @@
+ 	 * the terminating 0 pointer.  Additional spots may be needed
+ 	 * to pass along -f to the host mailer.
+ 	 */
+-	extra = 2;
+	extra = 3 + count(smopts);
+ 	extra++;
+ 	metoo = value("metoo") != NULL;
+ 	if (metoo)
+@@ -578,6 +581,10 @@
+ 		*ap++ = "-m";
+ 	if (verbose)
+ 		*ap++ = "-v";
+	for (; smopts != NULL; smopts = smopts->n_flink)
+		if ((smopts->n_type & GDEL) == 0)
+			*ap++ = smopts->n_name;
+	*ap++ = "--";
+ 	for (; n != NULL; n = n->n_flink)
+ 		if ((n->n_type & GDEL) == 0)
+ 			*ap++ = n->n_name;
+diff -Naur heirloom-mailx-12.5/openssl.c heirloom-mailx-12.5-patched/openssl.c
+--- heirloom-mailx-12.5/openssl.c	2011-04-26 22:23:22.000000000 +0100
+++ heirloom-mailx-12.5-patched/openssl.c	2014-12-27 01:26:34.385549867 +0000
+@@ -216,9 +216,7 @@
+ 
+ 	cp = ssl_method_string(uhp);
+ 	if (cp != NULL) {
+-		if (equal(cp, "ssl2"))
+-			method = SSLv2_client_method();
+-		else if (equal(cp, "ssl3"))
+		if (equal(cp, "ssl3"))
+ 			method = SSLv3_client_method();
+ 		else if (equal(cp, "tls1"))
+ 			method = TLSv1_client_method();
+diff -Naur heirloom-mailx-12.5/sendout.c heirloom-mailx-12.5-patched/sendout.c
+--- heirloom-mailx-12.5/sendout.c	2011-04-26 22:23:22.000000000 +0100
+++ heirloom-mailx-12.5-patched/sendout.c	2014-12-27 01:26:59.654169487 +0000
+@@ -835,7 +835,7 @@
+ #endif	/* HAVE_SOCKETS */
+ 
+ 	if ((smtp = value("smtp")) == NULL) {
+-		args = unpack(cat(mailargs, to));
+		args = unpack(mailargs, to);
+ 		if (debug || value("debug")) {
+ 			printf(catgets(catd, CATSET, 181,
+ 					"Sendmail arguments:"));
--- a/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild
+++ b/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LICENSE="BSD"
+DESCRIPTION="The mailx utility from CentOS"
+HOMEPAGE="https://www.debian.org/"
+SRC_URI="https://yorune.pl/gentoo/${CATEGORY}/${PN}/${PN}_${PVR}.orig.tar.gz http://ftp.debian.org/debian/pool/main/h/${PN}/${PN}_${PVR}.orig.tar.gz"
+KEYWORDS="~amd64"
+
+DEPEND="net-libs/liblockfile
+		dev-libs/libbsd
+		virtual/mta
+		mail-client/mailx-support"
+
+RDEPEND="${DEPEND}
+		!virtual/mailx
+		!mail-client/nail
+		!net-mail/mailutils
+		!mail-client/mailx"
+
+SLOT="0"
+
+src_prepare() {
+	eapply -p1 "${FILESDIR}/${PN}-${PVR}-fixes-1.patch"
+	eapply_user
+}
+
+src_compile(){
+	sed 's@<openssl@<openssl-1.0/openssl@' -i openssl.c fio.c makeconfig
+	emake LDFLAGS+="-L /usr/lib/openssl-1.0/" SENDMAIL=/usr/sbin/sendmail
+}
+
+src_install(){
+	emake PREFIX="${D}/usr" SYSCONFDIR="${D}/etc" UCBINSTALL="/usr/bin/install" install
+	install -v -m755 -d     "${D}/usr/share/doc/heirloom-mailx-12.5"
+	install -v -m644 README "${D}/usr/share/doc/heirloom-mailx-12.5"
+}
--- a/mail-client/heirloom-mailx/metadata.xml
+++ b/mail-client/heirloom-mailx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>y0rune@aol.com</email>
+		<name>Marcin Woźniak</name>
+	</maintainer>
+</pkgmetadata>
				`@@ -0,0 +1 @@`
				`DIST bitbox02-4.1.0.tar.gz 49519 BLAKE2B 07878b1f65361f512e0067cdfb38208194c79b75a19b871de928af3ed77f8d7762eee92b476ef605a38a3755eca256d17a65d770a2f63f0cade8ff93028616a7 SHA512 affaf2c0f40805c37062eebab2a12174fb9f0094f0054ecba4273a906f24341efdc405dad81a20adb411d9656101afa323fc44ada40112f29107f268a6d42717`
				`@@ -0,0 +1 @@`
				`DIST noiseprotocol-0.3.1.tar.gz 308729 BLAKE2B ac8e885da15cab760bc41a6953e70af6496df5865a441df1816aca02d06820aa0ceec10d27cd9bf089d0dff83f7e8e10eee6165d3f66705792bbc071a6a4b823 SHA512 2b25b80c4d187e5529b9de0bb50698646d74aa40e9c09e6b3acf5463603eb3415027c92cfe1f25bc3a6143958aa60cb014561ab390bb63db373ec04067146216`
				`@@ -0,0 +1 @@`
				`DIST heirloom-mailx_12.5.orig.tar.gz 324085 BLAKE2B 8f3b7177d9db8bb399f9e3e8d51258d93ea6ea9556f514c9107b0733f2f999ec9c685107c8a11717526051c242d5f20d4b6fc1a572175539874904cb31fcc452 SHA512 eb4aea0c668354f6fe28137f72bf49d291ce58671a7b70c7775777532e17e59ac52156e68f02937256f0a2f90c132b7c0948553b55daad92a664bd8bbb64774f`