gentoo resync : 25.09.2021

2 files changed, 24 insertions, 26 deletions

diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
index fc1c5f35d19a..8a131bef597b 100644
--- a/app-shells/mcfly/Manifest
+++ b/app-shells/mcfly/Manifest
@@ -30,8 +30,8 @@ DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52
 DIST libsqlite3-sys-0.10.0.crate 2175426 BLAKE2B dc7cbbcb632e2de1e8fcd6372cb0a82ed044db1d8634fa88b4294efb01470528fc86cece8c1ba6c4800a97c39d78bebb4b858efaf7c3c74510f5cf675ca2a1f0 SHA512 df030105952e8e0ca9def15d914a2eb7fb81754c85465788f7a3df5626b647d4af7f93b11f2f6d6e3dba286fd101c779dd51de7f2732084ba9542120cbc0e299
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
 DIST lru-cache-0.1.2.crate 9307 BLAKE2B 606072bc5390a13cf24b4c64c77ba7f84c4c2b1a73c4abe8ead4e1d19067b063888d5cbe478dc9108d193f0a66aa5fb2ddc073f3edfac466de34f85a52a15ef2 SHA512 ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1
-DIST mcfly-0.5.7.tar.gz 205712 BLAKE2B 88fad8b6c51478bc9b21d58a547daddcf5eebc0f88f71e1bced9b07bf06083f4ea4f48c42db45eb92d668be49c2dd11b7878875fabc8c3f9d94e591bd3b99ad7 SHA512 d8245f9feafe7539d0401f87ca99a7a10e537b9f1cbe163d9eb5b5400758cff46c919829e56eb4f8ce3542b4f131e3f9072eb75d55df753fabc1f9a28483dcc4
 DIST mcfly-0.5.8.tar.gz 207343 BLAKE2B 7d00868fd76866a4ef1b8f41d1563513bf37b9873bb265e33ff9d67e65b36fa8a916f4c6c503bf60a694e670a4bab152bd2935ea36ce75564ef66b91c3c7a20c SHA512 82a834059cdf5b9b2f8136dbede2cd31ed071961d759d35ee8cb6e2283f1a6b0b7633daf834f7387c4bd627e894d530d9f99309d827538137179cc0994103f9a
+DIST mcfly-0.5.9.tar.gz 207655 BLAKE2B d230768c5606df795ab79c89d35e183016c684e68478bddba2483a744a139ddd3cfce82cde5df431ffa0da19c9f1b7049338800331261668b711d9863b091b52 SHA512 d0b42ed4f870f81550aaf4884d338bc5e65866a8640438de6c233af6cf580819ad4f1712e44e4567b8363ada7cbf86224a0d4fc571b06c0e6f6e993f104c865b
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
@@ -67,6 +67,6 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 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 mcfly-0.5.7.ebuild 2331 BLAKE2B a284499c5c1d7e64daac0a36d95544d90d714b12459011f9c7de104ed2b7e5e9ab74f2d671a857a90d43955a9343306d0f87c67d7190f35aa6d0f2cf9ab7aef2 SHA512 7bed0f39e05e5a7b85b423b2dd58a50076575a59543dd86b6899ac78f5ad57b616cb78219e146ad52a4a1526c47bbfb818b6f6a687022a3935023bfbac41b7fc
 EBUILD mcfly-0.5.8.ebuild 2327 BLAKE2B 293ef373fd6a9f5b843dd2cfd2da243330e15f5cd893f55a52ef096eb80e9ce3244270b6d86c07064d5694f86a1ffd29c13af93d87d3d23985efc7f1099406cd SHA512 b1ccb70040f79e95409ccef4698c96c6693f19683199feb2ae4904fc7c82d58144c073c5a7f4556dc19b4d86b5e6b1f5519e15d497822834c281eef697a4347b
+EBUILD mcfly-0.5.9.ebuild 2160 BLAKE2B 262faa347b066d4917e44c2354f8663c1042b4bd606af686275ebe91c30b669ccef9ec0ec2ffc5528cc47504409ff9204a503c8b69550b1610385e6772ee3a5b SHA512 c5b7ce558a67326b2e57462c90ea1ef908f2c85edc47efcd7b6edb7bd71ea131e2a8768d501bab247c36fb279f9d51b7776e6f62233a38bcaa0bb4fb79d3acc6
 MISC metadata.xml 906 BLAKE2B 8c78385c07d99ab147278384ce20ae21a513f8ab460ee8860b658f0f1586affdc6ecdef54cbc0e4f4e27bd9e7554885fbe7682167e6ba0c9aa9071bbb8666d53 SHA512 5b5a67a50896d117869b0b0fa6068e5364fc1b6e89edd73558ccf31dfe56b2a94b61ffeaacbd87b920de36e853357664cf884aad8f3424d86330a056d459f051
diff --git a/app-shells/mcfly/mcfly-0.5.7.ebuild b/app-shells/mcfly/mcfly-0.5.9.ebuild
index 4f0477924f90..8a2128bcd50a 100644
--- a/app-shells/mcfly/mcfly-0.5.7.ebuild
+++ b/app-shells/mcfly/mcfly-0.5.9.ebuild
@@ -73,45 +73,43 @@ CRATES="
 	winapi-x86_64-pc-windows-gnu-0.4.0
 "
 
-inherit cargo
+inherit cargo readme.gentoo-r1
 
 DESCRIPTION="Context-aware bash history search replacement (ctrl-r)"
 HOMEPAGE="https://github.com/cantino/mcfly"
-SRC_URI="https://github.com/cantino/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
+SRC_URI="https://github.com/cantino/mcfly/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 CC0-1.0 MIT Unlicense"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND="dev-db/sqlite:3"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="/usr/bin/mcfly"
+QA_FLAGS_IGNORED="usr/bin/mcfly"
 
 src_install() {
 	cargo_src_install
 
-	insinto "/usr/share/${PN}"
-	doins "${PN}".{bash,fish,zsh}
+	insinto /usr/share/${PN}
+	doins ${PN}.{bash,fish,zsh}
+
+	# create README.gentoo
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"To start using ${PN}, add the following to your shell:
+
+~/.bashrc
+eval \"\$(mcfly init bash)\"
+
+~/.config/fish/config.fish
+mcfly init fish | source
+
+~/.zsh
+eval \"\$(mcfly init zsh)\""
+	readme.gentoo_create_doc
 
 	einstalldocs
 }
 
 pkg_postinst() {
-	elog "To start using ${PN}, add the following to your shell:"
-	elog
-	elog "~/.bashrc"
-	local p="${EPREFIX}/usr/share/${PN}/${PN}.bash"
-	elog "[[ -f ${p} ]] && source ${p}"
-	elog
-	elog "~/.config/fish/config.fish"
-	local p="${EPREFIX}/usr/share/${PN}/${PN}.fish"
-	elog "if test -r ${p}"
-	elog "    source ${p}"
-	elog "    mcfly_key_bindings"
-	elog
-	elog "~/.zsh"
-	local p="${EPREFIX}/usr/share/${PN}/${PN}.zsh"
-	elog "[[ -f ${p} ]] && source ${p}"
+	readme.gentoo_print_elog
 }