Merge updates from master

app-containers/aardvark-dns/aardvark-dns-1.0.2-r1.ebuild

@@ -0,0 +1,148 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+aho-corasick-0.7.18
+anyhow-1.0.56
+async-broadcast-0.4.0
+async-trait-0.1.52
+atty-0.2.14
+autocfg-1.1.0
+bitflags-1.3.2
+bytes-1.1.0
+cfg-if-1.0.0
+chrono-0.4.19
+clap-3.1.6
+clap_derive-3.1.4
+data-encoding-2.3.2
+easy-parallel-3.2.0
+endian-type-0.1.2
+enum-as-inner-0.3.3
+enum-as-inner-0.4.0
+env_logger-0.9.0
+error-chain-0.12.4
+event-listener-2.5.2
+form_urlencoded-1.0.1
+futures-channel-0.3.21
+futures-core-0.3.21
+futures-executor-0.3.21
+futures-io-0.3.21
+futures-macro-0.3.21
+futures-task-0.3.21
+futures-util-0.3.21
+getrandom-0.2.5
+hashbrown-0.11.2
+heck-0.3.3
+heck-0.4.0
+hermit-abi-0.1.19
+hostname-0.3.1
+humantime-2.1.0
+idna-0.2.3
+indexmap-1.8.0
+instant-0.1.12
+ipnet-2.3.1
+itoa-1.0.1
+lazy_static-1.4.0
+libc-0.2.119
+lock_api-0.4.6
+log-0.4.16
+match_cfg-0.1.0
+matches-0.1.9
+memchr-2.4.1
+mio-0.8.0
+miow-0.3.7
+nibble_vec-0.1.0
+ntapi-0.3.7
+num-integer-0.1.44
+num-traits-0.2.14
+num_cpus-1.13.1
+num_threads-0.1.3
+once_cell-1.9.0
+os_str_bytes-6.0.0
+parking_lot-0.11.2
+parking_lot-0.12.0
+parking_lot_core-0.8.5
+parking_lot_core-0.9.1
+percent-encoding-2.1.0
+pin-project-lite-0.2.8
+pin-utils-0.1.0
+ppv-lite86-0.2.16
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro2-1.0.36
+quick-error-1.2.3
+quote-1.0.15
+radix_trie-0.2.1
+rand-0.8.5
+rand_chacha-0.3.1
+rand_core-0.6.3
+redox_syscall-0.2.10
+regex-1.5.4
+regex-syntax-0.6.25
+resolv-conf-0.7.0
+scopeguard-1.1.0
+serde-1.0.136
+serde_derive-1.0.136
+signal-hook-0.3.13
+signal-hook-registry-1.4.0
+slab-0.4.5
+smallvec-1.8.0
+socket2-0.4.4
+strsim-0.10.0
+syn-1.0.86
+syslog-6.0.1
+termcolor-1.1.2
+textwrap-0.15.0
+thiserror-1.0.30
+thiserror-impl-1.0.30
+time-0.1.43
+time-0.3.7
+tinyvec-1.5.1
+tinyvec_macros-0.1.0
+tokio-1.17.0
+tokio-macros-1.7.0
+toml-0.5.8
+trust-dns-client-0.20.4
+trust-dns-client-0.21.1
+trust-dns-proto-0.20.4
+trust-dns-proto-0.21.1
+trust-dns-server-0.21.1
+unicode-bidi-0.3.7
+unicode-normalization-0.1.19
+unicode-segmentation-1.9.0
+unicode-xid-0.2.2
+url-2.2.2
+version_check-0.9.4
+wasi-0.10.2+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows-sys-0.32.0
+windows_aarch64_msvc-0.32.0
+windows_i686_gnu-0.32.0
+windows_i686_msvc-0.32.0
+windows_x86_64_gnu-0.32.0
+windows_x86_64_msvc-0.32.0
+"
+
+inherit cargo
+
+DESCRIPTION="A container-focused DNS server"
+HOMEPAGE="https://github.com/containers/aardvark-dns"
+SRC_URI="$(cargo_crate_uris) https://github.com/containers/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT BSL-1.1 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	exeinto /usr/libexec/podman
+	doexe target/release/${PN}
+}

app-containers/aardvark-dns/aardvark-dns-1.0.2.ebuild

@@ -134,7 +134,7 @@ DESCRIPTION="A container-focused DNS server"
 HOMEPAGE="https://github.com/containers/aardvark-dns"
 SRC_URI="$(cargo_crate_uris) https://github.com/containers/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 RESTRICT="mirror"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD MIT BSL-1.1 Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""

app-containers/netavark/netavark-1.0.2-r1.ebuild

@@ -0,0 +1,191 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+aho-corasick-0.7.18
+anyhow-1.0.56
+async-broadcast-0.3.4
+async-channel-1.6.1
+async-executor-1.4.1
+async-io-1.6.0
+async-lock-2.5.0
+async-recursion-0.3.2
+async-task-4.1.0
+async-trait-0.1.52
+atty-0.2.14
+autocfg-1.1.0
+bitflags-1.3.2
+block-buffer-0.10.2
+byteorder-1.4.3
+bytes-1.1.0
+cache-padded-1.2.0
+cc-1.0.73
+cfg-if-1.0.0
+chrono-0.4.19
+clap-3.1.1
+clap_derive-3.1.0
+concurrent-queue-1.2.2
+cpufeatures-0.2.1
+crypto-common-0.1.3
+derivative-2.2.0
+digest-0.10.3
+easy-parallel-3.2.0
+enumflags2-0.7.3
+enumflags2_derive-0.7.3
+env_logger-0.9.0
+event-listener-2.5.2
+fastrand-1.7.0
+form_urlencoded-1.0.1
+futures-0.3.21
+futures-channel-0.3.21
+futures-core-0.3.21
+futures-executor-0.3.21
+futures-io-0.3.21
+futures-lite-1.12.0
+futures-macro-0.3.21
+futures-sink-0.3.21
+futures-task-0.3.21
+futures-util-0.3.21
+generic-array-0.14.5
+getrandom-0.2.5
+hashbrown-0.11.2
+heck-0.4.0
+hermit-abi-0.1.19
+hex-0.4.3
+humantime-2.1.0
+idna-0.2.3
+indexmap-1.8.0
+instant-0.1.12
+ipnet-2.4.0
+iptables-0.5.0
+itoa-1.0.1
+lazy_static-1.4.0
+libc-0.2.121
+lock_api-0.4.6
+log-0.4.16
+matches-0.1.9
+memchr-2.4.1
+memoffset-0.6.5
+mio-0.8.0
+miow-0.3.7
+netlink-packet-core-0.4.2
+netlink-packet-route-0.11.0
+netlink-packet-utils-0.5.1
+netlink-proto-0.9.2
+netlink-sys-0.8.2
+nix-0.22.3
+nix-0.23.1
+ntapi-0.3.7
+num-integer-0.1.44
+num-traits-0.2.14
+num_cpus-1.13.1
+once_cell-1.9.0
+ordered-float-2.10.0
+ordered-stream-0.0.1
+os_str_bytes-6.0.0
+parking-2.0.0
+parking_lot-0.12.0
+parking_lot_core-0.9.1
+paste-1.0.6
+percent-encoding-2.1.0
+pin-project-lite-0.2.8
+pin-utils-0.1.0
+polling-2.2.0
+ppv-lite86-0.2.16
+proc-macro-crate-1.1.2
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro2-1.0.36
+quote-1.0.15
+rand-0.8.5
+rand_chacha-0.3.1
+rand_core-0.6.3
+redox_syscall-0.2.10
+regex-1.5.4
+regex-syntax-0.6.25
+rtnetlink-0.9.1
+ryu-1.0.9
+same-file-1.0.6
+scopeguard-1.1.0
+serde-1.0.136
+serde-value-0.7.0
+serde_derive-1.0.136
+serde_json-1.0.79
+serde_repr-0.1.7
+sha1-0.6.1
+sha1_smol-1.0.0
+sha2-0.10.2
+signal-hook-registry-1.4.0
+simple-error-0.2.3
+slab-0.4.5
+smallvec-1.8.0
+socket2-0.4.4
+static_assertions-1.1.0
+strsim-0.10.0
+syn-1.0.86
+sysctl-0.4.4
+termcolor-1.1.2
+textwrap-0.14.2
+thiserror-1.0.30
+thiserror-impl-1.0.30
+time-0.1.43
+tinyvec-1.5.1
+tinyvec_macros-0.1.0
+tokio-1.17.0
+tokio-macros-1.7.0
+toml-0.5.8
+typenum-1.15.0
+unicode-bidi-0.3.7
+unicode-normalization-0.1.19
+unicode-xid-0.2.2
+url-2.2.2
+version_check-0.9.4
+waker-fn-1.1.0
+walkdir-2.3.2
+wasi-0.10.2+wasi-snapshot-preview1
+wepoll-ffi-0.1.2
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows-sys-0.32.0
+windows_aarch64_msvc-0.32.0
+windows_i686_gnu-0.32.0
+windows_i686_msvc-0.32.0
+windows_x86_64_gnu-0.32.0
+windows_x86_64_msvc-0.32.0
+zbus-2.1.1
+zbus_macros-2.1.1
+zbus_names-2.1.0
+zvariant-3.1.2
+zvariant_derive-3.1.2
+"
+
+inherit cargo
+
+DESCRIPTION="A container network stack"
+HOMEPAGE="https://github.com/containers/netavark"
+SRC_URI="$(cargo_crate_uris) https://github.com/containers/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="app-containers/aardvark-dns
+	dev-go/go-md2man"
+RDEPEND=""
+
+src_compile() {
+	cargo_src_compile
+	go-md2man < docs/${PN}.1.md > ./${PN}.1
+}
+
+src_install() {
+	exeinto /usr/libexec/podman
+	doexe target/release/${PN}
+
+	doman ${PN}.1
+}

app-containers/netavark/netavark-1.0.2.ebuild

@@ -169,7 +169,7 @@ DESCRIPTION="A container network stack"
 HOMEPAGE="https://github.com/containers/netavark"
 SRC_URI="$(cargo_crate_uris) https://github.com/containers/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 RESTRICT="mirror"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""

app-misc/lf/lf-27.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit go-module bash-completion-r1 desktop
+inherit go-module bash-completion-r1 desktop xdg
 
 SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" https://github.com/cantcuckthis/gentoo-lf/raw/main/${P}-deps.tar.xz"

dev-libs/tfdn/Manifest

@@ -1,2 +1,2 @@
-DIST tfdn-1.1.0.tar.gz 206457 BLAKE2B fe8f7a23cb116fc28f8206d3cc085b95a54def69366d0d1ace2174cf4ee5e28fdbd95ffa29b2ea9c716081f3397e7a044fd1205488ad1e5cb1cf0924df02bdfe SHA512 de738bccda56e914bb7ea112318b5272512c10d27a62abc296eba0ff0d100f42555c807d57d59a5efe4f200c90de113652d26dece2cf9665b110dda1dfd49146
 DIST tfdn-1.2.0.tar.gz 208334 BLAKE2B 84f48512a398c605201694f3a964b2c24a4a429e3f44d84ff830cc40b43f6fc3ae34e5813cd3a37b44ab8d1c8037af0c34726f144a0e1a8c214b507bbc536979 SHA512 53d0f42b1b5d75a4ff77e8ca1b14dc8426ecc92dff88d216cf4c4f8d1b7ac368a8bbbf6897ac7ece66a9b3eb77b9000cff93b86aa587950888e36dea0472962a
+DIST tfdn-1.3.0.tar.gz 210376 BLAKE2B 1d2ee5f7c4b48b869dff2669f2d4b2bcc72a2e850bda083f780d378260ab6fe869bea56fc1263024ff3069daf9824148affdeab08ea4f727f548ebda2c8a65b3 SHA512 6bdeeecfe83f08abe54f8c518827f812433aee9e67d267e0f66b1a547e34acb251e65f340498d1f95e264a1d17e88cf11c1014ac0183023752c59a6d79979c8a

dev-libs/tfdn/tfdn-1.3.0.ebuild

@@ -15,7 +15,7 @@ SRC_URI="https://git.skyjake.fi/skyjake/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.t
 S="${WORKDIR}/${MY_PN}"
 
 LICENSE="BSD-2"
-SLOT="0/1"
+SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_x86_sse4_1 curl debug ssl"
 

dev-python/orjson-bin/orjson-bin-3.6.7.ebuild

@@ -47,7 +47,9 @@ src_install() {
 		ARCH="aarch64"
 	fi
 	do_install() {
-		insinto "$(python_get_sitedir)"
+		local my_installdir="$(python_get_sitedir)"
+		my_installdir="${my_installdir##${EPREFIX}/}"
+		insinto "${my_installdir}"
 		# Even though the soname is compatible, the python version has to be
 		# corrected in order for it to work
 		newins orjson/${PN//-bin}.cpython-310-${ARCH}-linux-gnu.so ${PN//-bin}.cpython-3${EPYTHON##python3.}-${ARCH}-linux-gnu.so

eclass/boinc-app.eclass

@@ -25,7 +25,7 @@ case ${EAPI} in
 	*) die "${ECLASS}: EAPI ${EAPI} unsupported."
 esac
 
-# @ECLASS-VARIABLE: BOINC_APP_OPTIONAL
+# @ECLASS_VARIABLE: BOINC_APP_OPTIONAL
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # If set to a non-null value, BOINC part in the ebuild will be
@@ -40,7 +40,7 @@ fi
 
 if [[ ! ${_BOINC_APP_ECLASS} ]]; then
 
-# @ECLASS-VARIABLE: BOINC_MASTER_URL
+# @ECLASS_VARIABLE: BOINC_MASTER_URL
 # @REQUIRED
 # @DESCRIPTION:
 # Each project is publicly identified by a master URL. It also serves
@@ -51,20 +51,20 @@ if [[ ! ${_BOINC_APP_ECLASS} ]]; then
 #	grep "<master_url>" /var/lib/boinc/client_state.xml
 # @CODE
 
-# @ECLASS-VARIABLE: BOINC_INVITATION_CODE
+# @ECLASS_VARIABLE: BOINC_INVITATION_CODE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Some projects restrict account creation to those who present an
 # "invitation code". Write it to BOINC_INVITATION_CODE variable if
 # it's published on project's website.
 
-# @ECLASS-VARIABLE: HOMEPAGE
+# @ECLASS_VARIABLE: HOMEPAGE
 # @DESCRIPTION:
 # This variable defines the HOMEPAGE for BOINC projects if BOINC_MASTER_URL
 # was set before inherit.
 : ${HOMEPAGE:=${BOINC_MASTER_URL}}
 
-# @ECLASS-VARIABLE: BOINC_APP_HELPTEXT
+# @ECLASS_VARIABLE: BOINC_APP_HELPTEXT
 # @DESCRIPTION:
 # Help message to display during the pkg_postinst phase
 : ${BOINC_APP_HELPTEXT:=\

eclass/boinc.eclass

@@ -9,14 +9,12 @@
 # @DESCRIPTION:
 # This eclass provides helper functions to build BOINC applications and libraries.
 
-inherit autotools toolchain-funcs
-
 case ${EAPI} in
 	8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI} unsupported."
 esac
 
-# @ECLASS-VARIABLE: BOINC_SUBMODULE
+# @ECLASS_VARIABLE: BOINC_SUBMODULE
 # @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -26,7 +24,7 @@ esac
 #
 # If unset, no functions will be exported.
 
-# @ECLASS-VARIABLE: BOINC_S
+# @ECLASS_VARIABLE: BOINC_S
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # If defined this variable determines the source directory name after
@@ -34,6 +32,12 @@ esac
 # variable supports a wildcard mechanism to help with github tarballs
 # that contain the commit hash as part of the directory name.
 
+if [[ ! ${_BOINC_ECLASS} ]]; then
+
+inherit autotools toolchain-funcs
+
+fi
+
 if [[ ${BOINC_SUBMODULE} ]]; then
 	EXPORT_FUNCTIONS src_unpack src_prepare src_configure
 fi
@@ -72,7 +76,7 @@ get_boinc_src() {
 
 }
 
-# @ECLASS-VARIABLE: BOINC_BUILD_DIR
+# @ECLASS_VARIABLE: BOINC_BUILD_DIR
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # Temporary build directory, where BOINC sources are located.

eclass/qbs.eclass

@@ -12,16 +12,22 @@
 # @DESCRIPTION:
 # Utility eclass providing wrapper functions for Qbs build system.
 
-if [[ ! ${_QBS_ECLASS} ]]; then
-
-case ${EAPI} in
+case ${EAPI:-0} in
 	8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI} unsupported."
+	*) die "${ECLASS}: EAPI ${EAPI:-0} unsupported."
 esac
 
+if [[ ! ${_QBS_ECLASS} ]]; then
+
 inherit multiprocessing toolchain-funcs qmake-utils
 
-# @ECLASS-VARIABLE: QBS_COMMAND_ECHO_MODE
+fi
+
+EXPORT_FUNCTIONS src_configure src_compile src_install
+
+if [[ ! ${_QBS_ECLASS} ]]; then
+
+# @ECLASS_VARIABLE: QBS_COMMAND_ECHO_MODE
 # @USER_VARIABLE
 # @DESCRIPTION:
 # Determines what kind of output to show when executing commands.  Possible
@@ -38,8 +44,6 @@ inherit multiprocessing toolchain-funcs qmake-utils
 
 BDEPEND="dev-util/qbs"
 
-EXPORT_FUNCTIONS src_configure src_compile src_install
-
 # @FUNCTION: eqbs
 # @USAGE: [<qbs args>...]
 # @DESCRIPTION:

gui-apps/someblocks/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cantcuckthis@danwin1210.de</email>
+		<name>Dex Conner</name>
+	</maintainer>
+</pkgmetadata>

gui-apps/someblocks/someblocks-9999.ebuild

@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig git-r3
+
+DESCRIPTION="Modular status bar for somebar written in c."
+HOMEPAGE="https://git.sr.ht/~raphi/someblocks"
+EGIT_REPO_URI="https://git.sr.ht/~raphi/someblocks"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	default
+
+	restore_config blocks.h
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+
+	einstalldocs
+
+	save_config blocks.h
+}

gui-wm/dwl/Manifest

@@ -1,2 +1,3 @@
 DIST dwl-0.2.1.tar.gz 49275 BLAKE2B e99acc86e937e288fbaf4532fc446d7b6820fec5316b8417824369a142481c67f3a2567733e2836b3dfeb88658f42c8df9db6d3283a3d23082451e868d4f8150 SHA512 caac92082c97d36a8f1ff3b3cf9762ee16e43595223acedb752646de9c78240718a4d118513e8314b0089f7073d6cea5d6a8313fd0d2eeeeb8f9d3b06b0d78af
+DIST dwl-0.3.1.tar.gz 51347 BLAKE2B 754dcf17de405f4a3f69478444fe46199f4e67fd7a7801e02131676e23e7324b49d6f31da629a6ab977262a210b95adcb8407c37b81031aac3ee6d2427f27a10 SHA512 c6bcaf26d6f67f7712f907331c947afc84a5c5b990f5ec6d568d65f624a2cafd1617055ed514cd7e8a331abcd4c37ed574672dcbeeb890607d8eb38e7a304215
 DIST dwl-0.3.tar.gz 48523 BLAKE2B 4064d01641f833a12a9b4cde304efded878a1037f19f477d765366cf41f16358576ddc6e210fb13d91f2acd4874395685aa680a150e034e5fe79ea8202ee3ab3 SHA512 2575c782df55e70f27db5b9ff50f8b47979354f4e9c1a6b37638221db13573790344996cc884e317f3738d848a4209257ae6abe5c173a556b8d2690391e04691

gui-wm/dwl/dwl-0.3.1.ebuild

@@ -0,0 +1,50 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic savedconfig toolchain-funcs desktop
+
+DESCRIPTION="dwm for Wayland"
+HOMEPAGE="https://github.com/djpohly/dwl"
+SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0 GPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libinput
+	dev-libs/wayland
+	>=gui-libs/wlroots-0.15.1[X(-)?]
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	restore_config config.h
+}
+
+src_configure() {
+	use X && append-cppflags -DXWAYLAND
+	tc-export CC
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+
+	domenu "${FILESDIR}"/dwl.desktop
+
+	einstalldocs
+
+	save_config config.h
+}

media-gfx/bonzomatic/bonzomatic-2021.03.07-r1.ebuild

@@ -30,7 +30,7 @@ DEPEND="
 	!system-glfw? (
 		wayland? (
 			dev-libs/wayland
-			media-libs/mesa[egl,wayland]
+			media-libs/mesa[egl(+),wayland]
 			dev-libs/wayland-protocols
 		)
 		!wayland? (

media-gfx/bonzomatic/bonzomatic-9999.ebuild

@@ -30,7 +30,7 @@ DEPEND="
 	!system-glfw? (
 		wayland? (
 			dev-libs/wayland
-			media-libs/mesa[egl,wayland]
+			media-libs/mesa[egl(+),wayland]
 			dev-libs/wayland-protocols
 		)
 		!wayland? (

media-libs/gl4es/gl4es-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,15 +6,15 @@ EAPI=7
 inherit cmake git-r3
 
 DESCRIPTION="OpenGL 2.1/1.5 to GL ES 2.0/1.1 translation library"
-HOMEPAGE="http://ptitseb.github.io/gl4es/"
+HOMEPAGE="https://ptitseb.github.io/gl4es/"
 EGIT_REPO_URI="https://github.com/ptitSeb/gl4es.git"
 LICENSE="MIT"
 SLOT="0"
-IUSE="egl X test"
+IUSE="X test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	media-libs/mesa[X?,egl?]
+	media-libs/mesa[X?,egl(+)]
 "
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-util/apitrace )"
@@ -24,7 +24,6 @@ BDEPEND="test? ( dev-util/apitrace )"
 src_configure() {
 	local mycmakeargs=(
 		-DNOX11=$(usex !X)
-		-DNOEGL=$(usex !egl)
 	)
 
 	cmake_src_configure

media-libs/gl4es/metadata.xml

@@ -5,9 +5,6 @@
 		<email>contact@hacktivis.me</email>
 		<name>Haelwenn (lanodan) Monnier</name>
 	</maintainer>
-	<use>
-		<flag name="egl">Enable EGL support.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">ptitSeb/gl4es</remote-id>
 	</upstream>

media-libs/monado/metadata.xml

@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="dbus">Enable dbus support (for BLE support)</flag>
-		<flag name="egl">Enable OpenGL on EGL Graphics API support</flag>
 		<flag name="ffmpeg">Enable ffmpeg testing video driver</flag>
 		<flag name="gles">Enable OpenGL-ES Graphics API support</flag>
 		<flag name="gstreamer">Enable gstreamer</flag>

media-libs/monado/monado-9999.ebuild

@@ -12,13 +12,13 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/monado/monado.git"
 LICENSE="Boost-1.0"
 SLOT="0"
 
-IUSE="dbus egl ffmpeg gles gstreamer opencv opengl psvr sdl systemd uvc vive vulkan wayland X"
+IUSE="dbus ffmpeg gles gstreamer opencv opengl psvr sdl systemd uvc vive vulkan wayland X"
 
 # TODO: OpenHMD, percetto?, libsurvive?
 BDEPEND=""
 DEPEND="
 	media-libs/openxr-loader
-	media-libs/mesa[egl]
+	media-libs/mesa[egl(+)]
 	dev-cpp/eigen:3
 	dev-util/glslang
 	virtual/libusb:=
@@ -64,7 +64,7 @@ src_configure() {
 		-DXRT_HAVE_VULKAN=$(usex vulkan)
 		-DXRT_HAVE_OPENGL=$(usex opengl)
 		-DXRT_HAVE_OPENGLES=$(usex gles)
-		-DXRT_HAVE_EGL=$(usex egl)
+		-DXRT_HAVE_EGL=ON
 		-DXRT_HAVE_LIBBSD=ON
 		-DXRT_HAVE_SYSTEMD=$(usex systemd)
 		-DXRT_INSTALL_SYSTEMD_UNIT_FILES=ON

net-client/lagrange/Manifest

@@ -1,4 +1,4 @@
-DIST lagrange-1.11.1.tar.gz 8725112 BLAKE2B 6de550b308bec4e2b59e70d65becde7d3a7ebaf7efff710f519537cd7bbcc9debfb078a7cd585356acab3029880c4b6c27ed00d837779de985ceb4c06018f414 SHA512 ba5e6dd97246fbc60a9a34ea56c210218dc6286cb0cb061fa79236c30ab59976cee5620fab5658a1e9a4306c11a1427cbec306ab4ec7fcbc9484244b63889fe6
-DIST lagrange-1.11.1.tar.gz.sig 488 BLAKE2B 57f633780b0c05856e6233534134cf1470ecfa6526dc9eea55a1689b7d8f7d1a738e960da297d4bc297fef2ad23b334d0dc93aa53aa5a580c7626cbe1495e9c1 SHA512 8a47062e112c22174cca94baa4966c48122fffc5c842592977069a41b622d6b5365ea3d88018a215366e401bde0bed1cbff8693d523ebb8cafe6e31d8c6d15b7
 DIST lagrange-1.11.2.tar.gz 8731314 BLAKE2B e173b013db0ffb1bf4823040c458e4e7f6b8466f9ca008e95bf2aab9e95a98a928cedc1f66a98658886b764c7ac394ef1ab921229e7a0cf1259dba267f930c82 SHA512 c3200e52fe123c7086ee2027c6fce8ad678c7539aa0d94f80b8348fad7672e1e92daf91474db8c24afded5acb73c806da7642d9aa19130c37de12c905f03fc27
 DIST lagrange-1.11.2.tar.gz.sig 488 BLAKE2B 20b51e9cda34dbac3f86693170f4abbb60c114083b58894f9cebde81b402a1d8c18c6d58917fe1fa87640ebce2012bbbb1d8a5c899383844ce5a11146a8b1f83 SHA512 cd342f0c1a5e7988ebff8607a1b9b31ad573ce9a7da107b5403a65a3e4986bca133c207ea9e04957c50104ca0b3e0ba6f139f3a6b9abb32ef4a085f1ef9ea002
+DIST lagrange-1.12.1.tar.gz 9243569 BLAKE2B d0dda3b6b85b464c2e8c9df287e56e29ac4814800a681afec868b631e871e04849b6b93af39f02586b6a05f60860f6d459db1119e312bbcf48c2e00c83b5297c SHA512 d31f69b9d0e321a736fdfaf482a157ea7d34da6512ab3e6c9e31d8fe9dba69f9c40c64f217999dfed6a2757f82ab5dd84f1b6d69de96470ca43a9823e4fd09ad
+DIST lagrange-1.12.1.tar.gz.sig 488 BLAKE2B 816add81a1a2adbce1624528be097d9c15c733c3759b1f47230bf0cf4e84f60550fe7e898b2d5beecece01687739d5407acd13f711f7ad494e982235ec2c3129 SHA512 badd058f57cfee0658e9552e7c14214ea1a46839a1eb23e3e48fb609927133c90b2b3c7989bdc681333704264c4824341879edda44dfac81aa9fb822f776f25d

net-mail/dovecot-fts-xapian/Manifest

@@ -0,0 +1 @@
+DIST dovecot-fts-xapian-1.5.2.tar.gz 2985120 BLAKE2B 25ab535a93bbc6c0ce6c50cf01916b3349c7a34d9746ea1f87e1bf45eaa643370a3f6a5e967a168b29d0bd601f3dddbff43dd75eab64f4d62d5277f78374cf9f SHA512 afbdd9866d61104d22875eb326a2a893ef0b252e6a493c939db8a29f2d7460a70c8e7648729840ea89d60c374ce75bb34a9c90e7ca2d9c4a9239fa3b2f5905a4

net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.2.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Dovecot FTS plugin backed by Xapian"
+HOMEPAGE="https://github.com/grosjo/fts-xapian"
+SRC_URI="https://github.com/grosjo/fts-xapian/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/icu:=
+	>=dev-libs/xapian-1.4:=
+	net-mail/dovecot:=
+	"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/fts-xapian-${PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-dovecot="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		$( use_enable static-libs static )
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}

net-mail/dovecot-fts-xapian/metadata.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>git_peep@parallaxshift.com</email>
+		<name>Philippe 'Peep' Chaintreuil</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<name>Joan Moreau</name>
+			<email>jom@grosjo.net</email>
+		</maintainer>
+		<remote-id type="github">grosjo/fts-xapian</remote-id>
+		<changelog>https://github.com/grosjo/fts-xapian/releases</changelog>
+		<bugs-to>https://github.com/grosjo/fts-xapian/issues/new</bugs-to>
+	</upstream>
+</pkgmetadata>

net-voip/gnome-calls/Manifest

@@ -1 +1,2 @@
 DIST calls-42.0.tar.gz 390661 BLAKE2B a30c5f0efd16648428e8437faed6d443f7a2abf2a21933a43b71be2710448ac1d087c3e60157daf2f24cffb38fa271f62ccd5f46f72183f283e849a90d348e17 SHA512 59d7aaee53770706a11dff5ab60379d5c36a7c8ccfd0c5cd4901fae78ff085608c5ba193ce33685f0c6b463d4a2056ccb01dab92751e9a2b2ad755d2ae0e20f6
+DIST libcall-ui-acfbb136bbf74514e0b9801ce6c1e8acf36350b6.tar.gz 159337 BLAKE2B 47cd388043514baf568914adea281e884d0fa04375d8cc116cabd6a1061fcfb5e224a8065afffd2957513657ff5970d1dead33cea99f36117bb80b35d6f34513 SHA512 b79e3d8ac9889109e0fe20f149ffb14bde198f7a364152a60c7175228c283f18a7abe2049b01935d11fd005e14ef4da9c23ada6c651801364c79bc2dca1e71f2

net-voip/gnome-calls/gnome-calls-42.0.ebuild

@@ -6,9 +6,13 @@ VALA_USE_DEPEND="vapigen"
 
 inherit vala meson gnome2-utils xdg
 
+LCU_COMMIT="acfbb136bbf74514e0b9801ce6c1e8acf36350b6"
 DESCRIPTION="Phone dialer and call handler"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/calls"
-SRC_URI="https://gitlab.gnome.org/GNOME/calls/-/archive/${PV}/calls-${PV}.tar.gz"
+SRC_URI="
+	https://gitlab.gnome.org/GNOME/calls/-/archive/${PV}/calls-${PV}.tar.gz
+	https://gitlab.gnome.org/World/Phosh/libcall-ui/-/archive/${LCU_COMMIT}/libcall-ui-${LCU_COMMIT}.tar.gz
+"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -42,6 +46,9 @@ src_prepare() {
 	default
 	eapply_user
 	use vala && vala_src_prepare
+
+	rm -r "${S}"/subprojects/libcall-ui || die
+	mv "${WORKDIR}"/libcall-ui-"${LCU_COMMIT}" "${S}"/subprojects/libcall-ui || die
 }
 
 pkg_postinst() {