Merge updates from master

2026-07-16 02:23:16 -04:00 · 2021-05-11 23:50:17 +00:00
parent 9c3aaaaeb0 351a7a9324
commit 6289db2676
10 changed files with 348 additions and 15 deletions
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -77,6 +77,7 @@ DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04
 DIST mdbook-0.4.5.tar.gz 1475074 BLAKE2B 9197363c68ffe84ae5e59ceb2905d29504d4cd8069e1db164abf0d0e058feb4ba7634b6663b3a3a16b6466332b027ea2ddf718f617e841f7eb0f1f7db47facee SHA512 6aa3f8f474bbc66229f90b8ba3fac0f940142aad1556745c9448b00040f5cbe0e66cd92f662e1542957b03893fde03e3902d28ee6b777059a794cb902cd7989f
 DIST mdbook-0.4.6.tar.gz 1477137 BLAKE2B 092559539c05026da63d0c6bb65490fdea43fe1bf25164ff8bc565e08e6aa5bba13aaaec25968eba833153313acf5a17cdd56cc5bcf97f10e7bef19b9a4d5be6 SHA512 3ce752c45614e0af72efee27dbc0c978302b0e273306e34d6e1c57e0cbf81f4ab5725bc6af96a419cde3d069336d9291bd5e4cab46fb8699fa2e31db83222ebc
 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 memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
--- a/app-text/mdbook/mdbook-0.4.8.ebuild
+++ b/app-text/mdbook/mdbook-0.4.8.ebuild
@@ -0,0 +1,218 @@
+# 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.10
+ammonia-3.1.0
+ansi_term-0.11.0
+anyhow-1.0.28
+atty-0.2.14
+autocfg-1.0.0
+base64-0.11.0
+base64-0.12.0
+bit-set-0.5.1
+bit-vec-0.5.1
+bitflags-1.2.1
+block-buffer-0.7.3
+block-padding-0.1.5
+byte-tools-0.3.1
+byteorder-1.3.4
+bytes-0.5.4
+cfg-if-0.1.10
+chrono-0.4.11
+clap-2.33.0
+ctor-0.1.13
+difference-2.0.0
+digest-0.8.1
+dtoa-0.4.5
+elasticlunr-rs-2.3.8
+env_logger-0.7.1
+fake-simd-0.1.2
+filetime-0.2.9
+fnv-1.0.6
+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.4
+futures-channel-0.3.4
+futures-core-0.3.4
+futures-executor-0.3.4
+futures-io-0.3.4
+futures-macro-0.3.4
+futures-sink-0.3.4
+futures-task-0.3.4
+futures-util-0.3.4
+generic-array-0.12.3
+getopts-0.2.21
+getrandom-0.1.14
+gitignore-1.0.6
+glob-0.2.11
+h2-0.2.4
+handlebars-3.0.1
+headers-0.3.2
+headers-core-0.2.0
+heck-0.3.1
+hermit-abi-0.1.11
+html5ever-0.25.1
+http-0.2.1
+http-body-0.3.1
+httparse-1.3.4
+humantime-1.3.0
+hyper-0.13.5
+idna-0.2.0
+indexmap-1.3.2
+inotify-0.7.0
+inotify-sys-0.1.3
+input_buffer-0.3.1
+iovec-0.1.4
+itoa-0.4.5
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+lazycell-1.2.1
+libc-0.2.69
+log-0.4.8
+mac-0.1.1
+maplit-1.0.2
+markup5ever-0.10.0
+markup5ever_rcdom-0.1.0
+matches-0.1.8
+memchr-2.3.3
+mime-0.3.16
+mime_guess-2.0.3
+mio-0.6.21
+mio-extras-2.0.6
+miow-0.2.1
+net2-0.2.33
+new_debug_unreachable-1.0.4
+notify-4.0.15
+num-integer-0.1.42
+num-traits-0.2.11
+opaque-debug-0.2.3
+open-1.4.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.9
+pin-project-internal-0.4.9
+pin-project-lite-0.1.4
+pin-utils-0.1.0-alpha.4
+ppv-lite86-0.2.6
+precomputed-hash-0.1.1
+pretty_assertions-0.6.1
+proc-macro-hack-0.5.15
+proc-macro-nested-0.1.4
+proc-macro2-1.0.10
+pulldown-cmark-0.7.0
+quick-error-1.2.3
+quote-1.0.3
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+rand_pcg-0.2.1
+redox_syscall-0.1.56
+regex-1.3.7
+regex-syntax-0.6.17
+remove_dir_all-0.5.2
+ryu-1.0.3
+same-file-1.0.6
+scoped-tls-1.0.0
+select-0.5.0
+serde-1.0.106
+serde_derive-1.0.106
+serde_json-1.0.52
+serde_urlencoded-0.6.1
+sha-1-0.8.2
+shlex-1.0.0
+siphasher-0.3.2
+slab-0.4.2
+smallvec-1.3.0
+string_cache-0.8.0
+string_cache_codegen-0.5.1
+strsim-0.8.0
+strum-0.16.0
+strum_macros-0.16.0
+syn-1.0.17
+tempfile-3.1.0
+tendril-0.4.1
+termcolor-1.1.0
+textwrap-0.11.0
+thread_local-1.0.1
+time-0.1.43
+tokio-0.2.18
+tokio-macros-0.2.5
+tokio-tungstenite-0.10.1
+tokio-util-0.3.1
+toml-0.5.6
+tower-service-0.3.0
+try-lock-0.2.2
+tungstenite-0.10.1
+typenum-1.12.0
+ucd-trie-0.1.3
+unicase-2.6.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.12
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+url-2.1.1
+urlencoding-1.0.0
+utf-8-0.7.5
+vec_map-0.8.1
+version_check-0.9.1
+walkdir-2.3.1
+want-0.3.0
+warp-0.2.2
+wasi-0.9.0+wasi-snapshot-preview1
+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.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-lang/fennel/Manifest
+++ b/dev-lang/fennel/Manifest
@@ -1 +1,2 @@
 DIST fennel-0.9.1.tar.gz 203441 BLAKE2B 74f461b3e7a24cdae0c8dde590814cb9753a12ab62e797746cc8753d178007a09084037e443d8309fa11ff309a5c6bf6c2e369942ef357aa0402883cef278542 SHA512 87e7ffbef0b49499a93255f50e77f53b9be4faa6d4609d8d65e3a64470bbf07b49a55e7dd547fda4b0e5fe0f4f1e6ece18282cc89955a57ed0a50be8dc01261c
+DIST fennel-0.9.2.tar.gz 209550 BLAKE2B b80ba0a8ebd3d089191f302ed00c3cb41d07a7b310b7b62609e2c40738b22eb16ce7dcc35449f5954316e74cdb982e4e51117ac70ca5bd6cf7b2d97783168f24 SHA512 2bf92865a4d79329b6c511c6871158a86347f98569a594358f9a3a8d2ac8013c35d00741ae68da50c5042df2b061e2eba4e61aa98877f94415f334f9994ad4e0
--- a/dev-lang/fennel/fennel-0.9.2.ebuild
+++ b/dev-lang/fennel/fennel-0.9.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single
+
+DESCRIPTION="Fennel is a lisp that compiles to Lua"
+HOMEPAGE="https://fennel-lang.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~technomancy/fennel"
+else
+	SRC_URI="https://git.sr.ht/~technomancy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+src_install() {
+	emake \
+		LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \
+		PREFIX="${ED}/usr" \
+		install
+	doman "${PN}.1"
+	dodoc *.md
+}
--- a/dev-libs/octetos-core/octetos-core-9999.ebuild
+++ b/dev-libs/octetos-core/octetos-core-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYPV="${PV/_beta/-beta/}"
+DESCRIPTION="C/C++ library to mainly provide Semantic Versioned implementation"
+HOMEPAGE="https://github.com/azaeldevel/octetos-core"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/azaeldevel/octetos-core.git"
+else
+	inherit autotools
+	SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	dev-libs/libconfig
+	dev-perl/XML-Parser
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/cunit
+	dev-util/intltool
+	sys-devel/bison
+	>=sys-devel/gcc-8.1
+"
+
+S="${WORKDIR}/${PN}-${MYPV}"
+
+src_prepare() {
+	default
+	eautoreconf -fi
+}
--- a/dev-libs/octetos-db-maria/octetos-db-maria-9999.ebuild
+++ b/dev-libs/octetos-db-maria/octetos-db-maria-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MYPV="${PV/_alpha/-alpha}"
+MYP="${PN}-${MYPV}"
+DESCRIPTION="C++ library for Database Acces."
+HOMEPAGE="https://github.com/azaeldevel/octetos-db-maria"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/azaeldevel/octetos-core.git"
+else
+	SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	dev-libs/octetos-db-abstract
+	dev-db/mariadb-connector-c
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	default
+	eautoreconf -fi
+}
+
+src_configure() {
+	econf --with-gentoo
+}
--- a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
+++ b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
@@ -86,7 +86,7 @@ index 9b54cac..a610bcc 100644
 +	$(AR) rvs libusockets.a *.o
 +	$(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
 +	sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
-+	-e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" usockets.pc.in > usockets.pc
+	-e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > libusockets.pc
 +
 +install:
 +	install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(includedir)"
@@ -94,7 +94,7 @@ index 9b54cac..a610bcc 100644
 +	install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)"
 +	ln -sf $(LIBTARGET) "$(DESTDIR)$(libdir)/libusockets.so"
 +	install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
-+	install -m 644 usockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
+	install -m 644 libusockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
 
 clean:
 	rm -f *.o
@@ -104,11 +104,11 @@ index 9b54cac..a610bcc 100644
 +	rm -f libusockets.pc
 +
 +.PHONY: default install clean
-diff --git a/usockets.pc.in b/usockets.pc.in
+diff --git a/libusockets.pc.in b/libusockets.pc.in
 new file mode 100644
 index 0000000..b818020
 --- /dev/null
-+++ b/usockets.pc.in
+++ b/libusockets.pc.in
@@ -0,0 +1,12 @@
 +prefix=@PREFIX@
 +libdir=${prefix}/@LIB@
--- a/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
+++ b/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
--- a/www-apps/code-server-bin/Manifest
+++ b/www-apps/code-server-bin/Manifest
@@ -1,5 +1,5 @@
-DIST code-server-3.9.1-linux-amd64.tar.gz 69783057 BLAKE2B 0008d5967cb9b58129e4ab21e1fa0c10f72611652f50991ff6657870a5e6c315872c05f6612d108454b5ca4dd5c9848470ff34846f06181ff1b6ac98a05496e3 SHA512 66a38c12b4a0c2494195f8e233942c49be23b3586140e901ff50cd6b507a092ca39a09b77fed3723710ea4099b6489f8d23b3a680b028e4bf920095bf314aa1d
-DIST code-server-3.9.1-linux-arm64.tar.gz 69101049 BLAKE2B 57f1b32f8b4385bb7c749d701ded90a7cb82ab1f6ceb052e589720221bd41a2620a63c9f88517de9962771c858d6aca12273c3e70fad56e3b247e2c5f6178375 SHA512 1e5629ec3f7ffe9279d89099ae5c111358e41e481eb2df659e45a7ad4b6c340ed5b59b9f818df8857cdfe2b4c2d509d193c6c5f1f15217e6b8aaa5b21a7af1f9
+DIST code-server-3.10.0-linux-amd64.tar.gz 79827037 BLAKE2B 238980bd822322dab956ce1dca8b8d7fa91eca6db8eb9808a68db28b9e9a8caa5432582cfa765ff0ac1ce948866a7f91a45df42045a83b75c13ac793ed1a78ee SHA512 bd0410e0310a027ff1ed3f7c8b0d07a4a28baf8df924192d8a240f8011765b6a1daaae94bc7f37d1904dc9c2813d951eeb0c289aadd0192a15daa9cb6461c25d
+DIST code-server-3.10.0-linux-arm64.tar.gz 77802222 BLAKE2B f13ff2e1d83d7c7d3be0033196911aef81324aa0f450c8973919a128fafbbf9d255aba59b2bfc6432c2fa0dadb4cf179d57772f86ad2c87213d43eb60244d024 SHA512 bc149c0716dc4df560a87d149bfceb712b864bdfbfc99e43ee476a574d76d52acd02c3c87a9b09a47c73c0789c85f3794c350be4b222a930d8dc3d7eec49017e
 DIST code-server-3.9.2-linux-amd64.tar.gz 72578049 BLAKE2B 3cfbba389c17c7e1a7978c5ae359532dd09a5b415cc302b3ff95739a31d3749e7a9c9627ceee11427db807cb3918c3016970d42084721d2867c3e5eb418ebdf8 SHA512 b6f493af264a772dd56393447b158e50578316ceb62593cb4e9838783bb0472a7933fc7c036b03c0daac1ebf1d160cf6262c41b83751fb39cf4748159c2b7c03
 DIST code-server-3.9.2-linux-arm64.tar.gz 71753560 BLAKE2B df5cc9bb91ea6529a64fb8ee572ae451a83f9b0b2b2ef1a27755c67b56fbb73f5cfc43ed3e3a15ad62d1d81f7c780912661b9cad4aa631eed4bb0bce46174ee5 SHA512 bf9863d3877ce692f2a9f1e129f25edb05e7323a49db6dfc0fbd3b5df153f6a0edecc7395c75acda81eb4fdae0ed2cfdffccc8c155785e2bd994ebb58b39462f
 DIST code-server-3.9.3-linux-amd64.tar.gz 73054713 BLAKE2B fc9424ab592e7f7aed6f4dfcb9d881585f3eaf8477100935a940c409044400f137a8bea5489dac6a35c232ea9c35c8210a2695fbec2c33eec0ec60dcaef5ab6f SHA512 f4c489bac2c73a075183f378a3fa65787f10bb9829502956fb8ded6869cf770fdcbf4f5df151d1f5aaf20e79db2188cb95b12b1ea875cc0863a12a295fd8b5a0
--- a/www-apps/code-server-bin/code-server-bin-3.10.0.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-3.10.0.ebuild
@@ -37,11 +37,17 @@ RDEPEND="

 S="${WORKDIR}/${MY_P}-linux-${ARCH}"

-PATCHES=(
-	"${FILESDIR}/${PN}-node.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-node.patch" )

-DOCS=( README.md ThirdPartyNotices.txt )
+DOCS=( "README.md" "ThirdPartyNotices.txt" )
+
+QA_PREBUILT="
+	/usr/lib/code-server/lib/coder-cloud-agent
+	/usr/lib/code-server/lib/vscode/node_modules/*
+"
+QA_PRESTRIPPED="
+	/usr/lib/code-server/lib/coder-cloud-agent
+"

 src_prepare() {
 	default
@@ -64,11 +70,6 @@ src_prepare() {

 	# already in /usr/portage/licenses/MIT
 	rm ./LICENSE.txt || die
-
-	if ! use gnome-keyring; then
-		rm -r ./lib/vscode/node_modules/keytar \
-			|| die "failed to remove bundled keytar"
-	fi
 }

 src_install() {