Merge updates from master

2026-07-17 11:04:10 -04:00 · 2021-06-09 15:20:04 +00:00
parent c04eeb5603 7befa3ec88
commit 8685591226
7 changed files with 250 additions and 32 deletions
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -87,6 +87,7 @@ DIST h2-0.2.4.crate 157213 BLAKE2B fa04dc4085a0176cd890f259ae51aafa40e55969f0cda
 DIST h2-0.2.7.crate 156989 BLAKE2B 2f75a2f82391c994299e01fae5958dc7e21b78e38b8ade83a0c90698f54d232e6f0068bed88b98314e702bff773e8753c600ecf6b638b5bc1c7e692ef636d289 SHA512 6157bcd335d303246478f45b8740dca687f693dbbb462a0ea9560af12d1fe12a9c680c57c1e7ea0b0842137ee66cde827f273e0faa619db3b6180c5587bd0fc9
 DIST handlebars-3.0.1.crate 65081 BLAKE2B da70e945a50dc97989a0a87fce7c0b0edd7d2648f02b81cbb6a8dcf49ed393d2e91a08c3759a5d88b7a3a6afa628feaa1de83519c4488315bc2d7e7b6e4c7c71 SHA512 99789574026497d22da40cbeb2b6eab2a75b36bcce950032b98c99154c3cd8b0456b1d8c2349551cdba854632477c5449d181e6d558c8ecb2996dc4053210ac0
 DIST handlebars-3.5.5.crate 77308 BLAKE2B ad3fe42425ea8b668402bd20be4647659df7d23cd14f1d1a2973b4286b9fe9add88b0c2de5fff31e091f555f52f5402126a4b3d727a1dbbc2bd3b65eb84f5a10 SHA512 51d4802ae707cb53bfe34f2aa8fba614eb44c127bd9a3fd85d997e248f5b2c7f1e7e1a394ec0ac2458c76501bd56e15ddfd6e31abdf0122d247e2c56bbc21f2a
+DIST handlebars-4.0.0.crate 86593 BLAKE2B 723173f316575bf16d7a708b0fa564b812f426038ded83aa9d95cfd39fb702a002cf01036c7b09ba1353e3ae277b43d56e0092c1f4fc78b839fcc46f357170cc SHA512 761db58248ecb7ee797e4f8c216e35584406bc9fc7036e034f9a0050d20d2e6781eea0535c35ee77ba2c94703aac6ce5f618a0f8e3928bc58c816555c6d3cca1
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST headers-0.3.2.crate 67402 BLAKE2B f9f6679f3d088ce0aaefc2b123f4af02c0725fc9941dd00b7767ce5203c681072383f5dc6163e59fb452f58e5665dc0c7004ab56692123ad4674e03defd2acf3 SHA512 1c63cec8c24e2ba6306e8c04c5a73b7d522aff41a2b8dac5ee323dbcfa7b5d1c547238e51695f24f86a9fcc0605879da179f2f8375783f23577236c695827e65
 DIST headers-0.3.4.crate 67384 BLAKE2B 4e5b2767fe120911b15f72605f4be957cb0ad7d2d87bb521f9c960fd0fbf56f7d761a69516c708dc1c5c7c0f4d44f2086e43537d689a15f484bc17b04eac17e2 SHA512 b19f4058f2a69dc9bd3b20294962beb9e02d7fa82630740a7eff19720ebab2e8332f11b129d9932eec34a03070d6b807f72979060a4ef582860996a13b88dcc0
@@ -131,6 +132,7 @@ DIST markup5ever-0.10.0.crate 42925 BLAKE2B 67d3126ea6cabf18da407bdcc33b68918e63
 DIST markup5ever-0.10.1.crate 34668 BLAKE2B a13f39ba93a26a558a8f03ebbbaa98bf2c7caa4fd393be3e307acd5b59a6d91fa8fbf4deff234266cd55772d5047145cc80c5a215ff8eb5b2fddb88468ae4fb2 SHA512 447b0f44ea8b786688127aba1b6eed826dc0127658d293c22db74864381b5e7bc0584243dcc0ee19929d3e757521167c13a108155ed5c8e78375cb0fd3c6f7b7
 DIST markup5ever_rcdom-0.1.0.crate 25165 BLAKE2B 4123ee804991e9be31e6a4dbcb7dcce12bb776d22e4409ad388678a92965834acb9b1b2fa51e6472ee2c0db156e4a75e5b6db5f6b6d4220159ab93b056d0418c SHA512 7c21836fcdd45bfdef7305327255291c92d75d3329798d31abab26297de8c381e41b4419fb7ac631310835d590b63751a63bdd87e2697ea3dfdd6599033433c7
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST mdbook-0.4.10.tar.gz 1483113 BLAKE2B 0295b4dd5e0ebc1f7347d9345e1cb001c7a12925855fa0a708e2fb40e285bacd7118014ebfd72905f450aa950d2b3e98573b94b53a03057d349d9b171e81ba47 SHA512 309b51b4765e8c5ff354d3da1e77f552662f97ca312e60ceba4aa10da3b2d51d0ee750811e65a5044dacb2fd3720c9f65ff6968fd242e16c16644247f40e2ee5
 DIST mdbook-0.4.7.tar.gz 1477434 BLAKE2B c77d0a1a4606fad0e570c074a99bdf8c9ae11ab28401fecea0383c83ad691932bb7b1d39ca36c73d3741f045074361d3fc3f16472f5b10fe7f99249bc6437114 SHA512 d0ffca34e1b95ae058c92d97eac4a9a5e05bf26768b0a85a83d2bddebfff77fdf2ce7b2a6a3547a7e61dacb2dfc3ad49231c747a92a3a74b536f0c41ab4a4d8c
 DIST mdbook-0.4.8.tar.gz 1478812 BLAKE2B dfdefc428f08493d02fded1c2cfcd01a5614dd143ce828b0803445328748ff2104c697c877019cf1263d1652f1c028dc2e96417f4b74976c52a902659f067d20 SHA512 fa10f629de405e20311f2759a78047b54f480b41ea6cc885ae41045391e2e876beac78154c5cd4552c6284c1f13cc9db461bce7741ff7f046480fcf0f4f44504
 DIST mdbook-0.4.9.tar.gz 1482002 BLAKE2B 0597c8771fe3e27aab68ac60aec561ec1782347c409d11ced27b315b33c4a87526af36934f9be8dfb32667c745f95e3323a080b0770089171241c1f38b488bcf SHA512 b8df26893054f05b28e81353fe71bc3e0355db70a2b7f894a9c8a4c5b2f608e8eae5e0b3de285e1ddf2c34d53a8902fd4513a72f0f2b1c35d1f0a054ed231782
--- a/app-text/mdbook/mdbook-0.4.10.ebuild
+++ b/app-text/mdbook/mdbook-0.4.10.ebuild
@@ -0,0 +1,246 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.1
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.18
+ammonia-3.1.1
+ansi_term-0.11.0
+anyhow-1.0.40
+atty-0.2.14
+autocfg-1.0.1
+base64-0.12.3
+base64-0.13.0
+bit-set-0.5.2
+bit-vec-0.6.3
+bitflags-1.2.1
+block-buffer-0.7.3
+block-buffer-0.9.0
+block-padding-0.1.5
+byte-tools-0.3.1
+byteorder-1.4.3
+bytes-0.5.6
+bytes-1.0.1
+cfg-if-0.1.10
+cfg-if-1.0.0
+chrono-0.4.19
+clap-2.33.3
+cpufeatures-0.1.1
+ctor-0.1.20
+difference-2.0.0
+digest-0.8.1
+digest-0.9.0
+dtoa-0.4.8
+either-1.6.1
+elasticlunr-rs-2.3.11
+env_logger-0.7.1
+fake-simd-0.1.2
+filetime-0.2.14
+fnv-1.0.7
+form_urlencoded-1.0.1
+fsevent-0.4.0
+fsevent-sys-2.0.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futf-0.1.4
+futures-0.3.14
+futures-channel-0.3.14
+futures-core-0.3.14
+futures-io-0.3.14
+futures-macro-0.3.14
+futures-sink-0.3.14
+futures-task-0.3.14
+futures-util-0.3.14
+generic-array-0.12.4
+generic-array-0.14.4
+getopts-0.2.21
+getrandom-0.1.16
+getrandom-0.2.2
+gitignore-1.0.7
+glob-0.3.0
+h2-0.2.7
+handlebars-4.0.0
+hashbrown-0.9.1
+headers-0.3.4
+headers-core-0.2.0
+heck-0.3.2
+hermit-abi-0.1.18
+html5ever-0.25.1
+http-0.2.4
+http-body-0.3.1
+httparse-1.4.0
+httpdate-0.3.2
+humantime-1.3.0
+hyper-0.13.10
+idna-0.2.3
+indexmap-1.6.2
+inotify-0.7.1
+inotify-sys-0.1.5
+input_buffer-0.3.1
+iovec-0.1.4
+itoa-0.4.7
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+lazycell-1.3.0
+libc-0.2.94
+log-0.4.14
+mac-0.1.1
+maplit-1.0.2
+markup5ever-0.10.1
+markup5ever_rcdom-0.1.0
+matches-0.1.8
+memchr-2.4.0
+mime-0.3.16
+mime_guess-2.0.3
+mio-0.6.23
+mio-extras-2.0.6
+miow-0.2.2
+net2-0.2.37
+new_debug_unreachable-1.0.4
+notify-4.0.16
+num-integer-0.1.44
+num-traits-0.2.14
+opaque-debug-0.2.3
+opaque-debug-0.3.0
+open-1.7.0
+output_vt100-0.1.2
+percent-encoding-2.1.0
+pest-2.1.3
+pest_derive-2.1.0
+pest_generator-2.1.3
+pest_meta-2.1.3
+phf-0.8.0
+phf_codegen-0.8.0
+phf_generator-0.8.0
+phf_shared-0.8.0
+pin-project-0.4.28
+pin-project-1.0.7
+pin-project-internal-0.4.28
+pin-project-internal-1.0.7
+pin-project-lite-0.1.12
+pin-project-lite-0.2.6
+pin-utils-0.1.0
+ppv-lite86-0.2.10
+precomputed-hash-0.1.1
+pretty_assertions-0.6.1
+proc-macro-hack-0.5.19
+proc-macro-nested-0.1.7
+proc-macro2-1.0.26
+pulldown-cmark-0.7.2
+quick-error-1.2.3
+quick-error-2.0.1
+quote-1.0.9
+rand-0.7.3
+rand-0.8.3
+rand_chacha-0.2.2
+rand_chacha-0.3.0
+rand_core-0.5.1
+rand_core-0.6.2
+rand_hc-0.2.0
+rand_hc-0.3.0
+rand_pcg-0.2.1
+redox_syscall-0.2.8
+regex-1.5.4
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+ryu-1.0.5
+same-file-1.0.6
+scoped-tls-1.0.0
+select-0.5.0
+semver-0.11.0
+semver-parser-0.10.2
+serde-1.0.125
+serde_derive-1.0.125
+serde_json-1.0.64
+serde_urlencoded-0.6.1
+sha-1-0.8.2
+sha-1-0.9.5
+shlex-1.0.0
+siphasher-0.3.5
+slab-0.4.3
+socket2-0.3.19
+string_cache-0.8.1
+string_cache_codegen-0.5.1
+strsim-0.8.0
+strum-0.18.0
+strum_macros-0.18.0
+syn-1.0.72
+tempfile-3.2.0
+tendril-0.4.2
+termcolor-1.1.2
+textwrap-0.11.0
+time-0.1.43
+tinyvec-1.2.0
+tinyvec_macros-0.1.0
+tokio-0.2.25
+tokio-macros-0.2.6
+tokio-tungstenite-0.11.0
+tokio-util-0.3.1
+toml-0.5.8
+tower-service-0.3.1
+tracing-0.1.26
+tracing-core-0.1.18
+tracing-futures-0.2.5
+try-lock-0.2.3
+tungstenite-0.11.1
+typenum-1.13.0
+ucd-trie-0.1.3
+unicase-2.6.0
+unicode-bidi-0.3.5
+unicode-normalization-0.1.17
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.2.2
+url-2.2.2
+urlencoding-1.1.1
+utf-8-0.7.6
+vec_map-0.8.2
+version_check-0.9.3
+walkdir-2.3.2
+want-0.3.0
+warp-0.2.5
+wasi-0.10.2+wasi-snapshot-preview1
+wasi-0.9.0+wasi-snapshot-preview1
+which-4.1.0
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+xml5ever-0.16.1
+"
+
+inherit cargo
+
+DESCRIPTION="Creates a book from markdown files"
+HOMEPAGE="https://github.com/rust-lang/mdBook"
+SRC_URI="https://github.com/rust-lang/mdBook/archive/v${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="BSD CC0-1.0 ISC MIT MPL-2.0 || ( Apache-2.0 Boost-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+QA_FLAGS_IGNORED="usr/bin/mdbook"
+
+src_prepare() {
+	eapply_user
+
+	mv ../mdBook-${PV}/{.,}* .
+}
+
+src_install() {
+	cargo_src_install
+
+	dodoc CHANGELOG.md README.md
+}
--- a/dev-python/geographiclib/Manifest
+++ b/dev-python/geographiclib/Manifest
@@ -1 +0,0 @@
-DIST geographiclib-1.50.tar.gz 33532 BLAKE2B c8b808c2123f4aa98e0b356c0b9c4ee4dcc401af9ca8e64639f23bb4a640ad6f79e176ad118d9ebade73e4155a3ed06e56a85fdca2f2f6d479e3216f2118fe07 SHA512 134553b0b2fec49004b0ae1cc54a0f8cb923f5c396e4d2b6b1e35c40aa9627e633abed7e994270dd6a0f22f89f0387fd7badd8c121bb1ad7ce4455f65a6ec864
--- a/dev-python/geographiclib/geographiclib-1.50.ebuild
+++ b/dev-python/geographiclib/geographiclib-1.50.ebuild
@@ -1,17 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the geodesic routines in GeographicLib"
-HOMEPAGE="https://geographiclib.sourceforge.io https://pypi.org/project/geographiclib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests unittest
--- a/dev-python/geographiclib/metadata.xml
+++ b/dev-python/geographiclib/metadata.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="pypi">geographiclib</remote-id>
-		<remote-id type="sourceforge">geographiclib</remote-id>
-		<doc>https://geographiclib.sourceforge.io/html/python</doc>
-	</upstream>
-	<maintainer type="person">
-		<email>cyber+gentoo@sysrq.in</email>
-		<name>Anna</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-python/geopy/geopy-2.1.0.ebuild
+++ b/dev-python/geopy/geopy-2.1.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"

-RDEPEND="dev-python/geographiclib[${PYTHON_USEDEP}]"
+RDEPEND="sci-geosciences/GeographicLib[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		dev-python/async_generator[${PYTHON_USEDEP}]
--- a/profiles/updates/2Q-2021
+++ b/profiles/updates/2Q-2021
@@ -8,3 +8,4 @@ move app-misc/spotify-tray media-sound/spotify-tray
 move net-im/catgirl net-irc/catgirl
 move net-im/srain net-irc/srain
 move kde-apps/kaidan net-im/kaidan
+move dev-python/geographiclib sci-geosciences/GeographicLib
				`@@ -1 +0,0 @@`
				`DIST geographiclib-1.50.tar.gz 33532 BLAKE2B c8b808c2123f4aa98e0b356c0b9c4ee4dcc401af9ca8e64639f23bb4a640ad6f79e176ad118d9ebade73e4155a3ed06e56a85fdca2f2f6d479e3216f2118fe07 SHA512 134553b0b2fec49004b0ae1cc54a0f8cb923f5c396e4d2b6b1e35c40aa9627e633abed7e994270dd6a0f22f89f0387fd7badd8c121bb1ad7ce4455f65a6ec864`