Merge updates from master

2026-07-15 18:13:10 -04:00 · 2021-07-20 11:51:06 +00:00
parent e923e2c655 7cc6bc7fbe
commit 3c58ba90c8
33 changed files with 333 additions and 417 deletions
--- a/app-forensics/yara/yara-4.1.1.ebuild
+++ b/app-forensics/yara/yara-4.1.1.ebuild
@@ -35,6 +35,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"

+DOCS=( CONTRIBUTORS sample.{file,rules} )
+
 src_prepare() {
 	default
 	eautoreconf
@@ -42,6 +44,13 @@ src_prepare() {

 src_configure() {
 	local myconf=(
+		--disable-address-sanitizer
+		--disable-debug
+		--disable-gcov
+		--disable-pb-tests
+		--enable-optimization
+		--with-crypto
+
 		$(use_enable cuckoo)
 		$(use_enable debug-dex)
 		$(use_enable dex)
@@ -65,7 +74,5 @@ src_compile() {
 src_install() {
 	default
 	einstalldocs
-	dodoc CONTRIBUTORS sample.{file,rules}
-	find "${ED}" -name '*.la' -delete || die
-	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 }
--- a/app-misc/liquidctl/Manifest
+++ b/app-misc/liquidctl/Manifest
@@ -1 +1 @@
-DIST liquidctl-1.7.0.tar.gz 2036796 BLAKE2B 38227ee16daa769c72b6070e23885f14fce3695db01a5b278b37d570cf9c293d8e7442d9f71e26fe3d50890c8cdcd59114539b014c14d3fc6aeca888bfb652da SHA512 f13925cebad63996475f0535d2db0a0cfb5177a83aebceba0ab45600ab1c175cb76bfb351118acfd4995eec44a75acd86b7b7539d69e999525a3aa9cd88f16ed
+DIST liquidctl-1.7.1.tar.gz 2036957 BLAKE2B fdafe35b9d9066ee9477803a14bf41424a6b7750cebef03751d7789551269f47f41bfc851132c908038673f12e5ec95c38474319b13d8aa20a2cb93a706ec67c SHA512 9ff46a0947a7a1d4d083d25939151d9b877b6b3137c92b7d41bc9aecf60b41bd07346ac6ff0f1a83cb1bf7405a13dbc66b8f84f4f9f59ba3de9792897d5a8f08
--- a/app-misc/liquidctl/liquidctl-1.7.1.ebuild
+++ b/app-misc/liquidctl/liquidctl-1.7.1.ebuild
--- a/app-misc/ssmtool/ssmtool-0.1.11.ebuild
+++ b/app-misc/ssmtool/ssmtool-0.1.11.ebuild
@@ -21,8 +21,15 @@ DEPEND="
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"

+python_prepare_all () {
+	# sed to remove the data_files option, which are necessary to include
+	# data files in the packaged version, but will install files into
+	# /usr/data if not removed before converting it to setup.py
+	sed -i -e '/options\.data_files/,+4d' setup.cfg
+	distutils-r1_python_prepare_all
+}
 python_install() {
+	distutils-r1_python_install
 	newicon icon.png ssmtool.png
 	domenu ssmtool.desktop
-	distutils-r1_python_install
 }
--- a/dev-python/cx-oracle/cx-oracle-8.2.1.ebuild
+++ b/dev-python/cx-oracle/cx-oracle-8.2.1.ebuild
@@ -3,7 +3,7 @@

 EAPI="8"

-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )

 inherit distutils-r1

@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"

-LICENSE="Computronix"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"

--- a/dev-python/cx-oracle/metadata.xml
+++ b/dev-python/cx-oracle/metadata.xml
@@ -11,7 +11,4 @@
 		<email>rozstrojenie.jazni@gmail.com</email>
 		<name>Michał Gasewicz</name>
 	</maintainer>
-	<use>
-		<flag name="examples">Install examples, usually source code</flag>
-	</use>
 </pkgmetadata>
--- a/gui-apps/foot/Manifest
+++ b/gui-apps/foot/Manifest
@@ -2,3 +2,4 @@ DIST foot-1.7.1.tar.gz 390533 BLAKE2B 5eac8041ac5f46b71d8037550bcdd14899071e63fc
 DIST foot-1.7.2.tar.gz 392748 BLAKE2B effd72665c553fbf3687fdb17776b264a775311503d974d12b5de4f4b7d1b835755824781a345f29f4866a33f449c61990830452bdca101952ff8c490e37b5f2 SHA512 2acb46daca5840b3a9fb0fc7055f9234618d7d6884ce74fee382f3904136a85f5c17f7119449fd7943dba2ccce2dde9a62d13a1b363ee234765b6ab65d95e19b
 DIST foot-1.8.0.tar.gz 415924 BLAKE2B ec97a6b76f568770fd9011e2245aee9b96c8fc51fb11f022ce7cc8a40bae81d45172e5e435aeab4575a8123825481fe3537376ac700f7036ea4e7079a0844eac SHA512 eb0e0c1b29490f60b241259819bb2e7ab4b847e1d5a1fe70a31e893d8588e82f04f184d88a91e77222aba6fb9473f10e20461278535b6de4c2f3345440354583
 DIST foot-1.8.1.tar.gz 428685 BLAKE2B 10ad1adf67e3e7171cc60db3dd90a8bdb676f3df61c518f33150c893ee0a552e28b9647cbae03861b85bf4c8501785eaf8a984726a814da2866a06d1a71b3891 SHA512 62a4cc018e49e270b8d806ea5b5c17965428a0f943b814608c25eb674db6130bfedae2431ac0c61f9c8de6bd227859cedb032f0f573a1e0885938d11efbda4e4
+DIST foot-1.8.2.tar.gz 432906 BLAKE2B 25dfa24df5e95a29b0cc19c0d67cd3025cee3cad03069feca748e580dc1a42e1e2c4eebee0c3549edf522d12da5bc80fd5947a0a7f28658e3f207b76562c60a2 SHA512 8442761f20d8d5e315c2cbf75c40a6fd8e449f6ce515a1a3aac2106b4c9d7c8257ed96b5e1808eb0e9fda448a2a1bbb6b55cfb8d7abd6acb184cabcdc43d5fa5
--- a/gui-apps/foot/foot-1.8.2.ebuild
+++ b/gui-apps/foot/foot-1.8.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz  -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://codeberg.org/dnkl/foot.git"
+fi
+
+DESCRIPTION="A fast, lightweight and minimalistic Wayland terminal emulator"
+HOMEPAGE="https://codeberg.org/dnkl/foot"
+LICENSE="MIT"
+SLOT="0"
+IUSE="ime +grapheme-clustering"
+
+DEPEND="
+	dev-libs/libutf8proc
+	dev-libs/wayland
+	media-libs/fcft
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+"
+RDEPEND="
+	${DEPEND}
+	gui-apps/foot-terminfo
+"
+BDEPEND="
+	app-text/scdoc
+	dev-libs/tllist
+	dev-libs/wayland-protocols
+	sys-libs/ncurses
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use ime)
+		$(meson_feature grapheme-clustering)
+		"-Dterminfo=disabled"
+		"-Dwerror=false"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die
+}
--- a/gui-apps/foot/foot-9999.ebuild
+++ b/gui-apps/foot/foot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -18,9 +18,10 @@ DESCRIPTION="A fast, lightweight and minimalistic Wayland terminal emulator"
 HOMEPAGE="https://codeberg.org/dnkl/foot"
 LICENSE="MIT"
 SLOT="0"
-IUSE="ime"
+IUSE="ime +grapheme-clustering"

 DEPEND="
+	dev-libs/libutf8proc
 	dev-libs/wayland
 	media-libs/fcft
 	media-libs/fontconfig
@@ -42,6 +43,7 @@ BDEPEND="
 src_configure() {
 	local emesonargs=(
 		$(meson_use ime)
+		$(meson_feature grapheme-clustering)
 		"-Dterminfo=disabled"
 		"-Dwerror=false"
 	)
@@ -50,5 +52,5 @@ src_configure() {

 src_install() {
 	meson_src_install
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die
 }
--- a/licenses/Computronix
+++ b/licenses/Computronix
@@ -1,36 +0,0 @@
-LICENSE AGREEMENT FOR CX_ORACLE
-
-Copyright 2016, 2018, Oracle and/or its affiliates. All rights reserved.
-
-Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-
-Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-Canada. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions, and the disclaimer that follows.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions, and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the names of the copyright holders nor the names of any contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-DISCLAIMER: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*AS IS* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Computronix is a registered trademark of Computronix (Canada) Ltd.
-
--- a/media-libs/fcft/Manifest
+++ b/media-libs/fcft/Manifest
@@ -2,3 +2,4 @@ DIST fcft-2.3.3.tar.gz 313168 BLAKE2B b3dbc3af511e8a8007a17400fe6880a08a62ca0cb6
 DIST fcft-2.4.0.tar.gz 323605 BLAKE2B 1926d26b633cf768257340f093de734513678f3b5e62cb2fa89fd08496d06b36de89fe797a5328c35a5b467d3ea48214d5a3e76660d2effaea0f28fddbc7bd48 SHA512 0904344cf69875e5ed2b0543911cfcbd7fddafcc19ef611ff6abb30004515eb61a69f5add25f9576132dcd60bc0c2cc7f6461fade9124a32c4026154e56d8e64
 DIST fcft-2.4.1.tar.gz 323792 BLAKE2B d33c087ec4bf6f0b2bba6da0110abe50de5f232beac970e657416e73f1d02fd54d342686d954e67eca86e5f676d793d94edae52f64a85ea62e662a8552289ae4 SHA512 2cce6db53010262eec36a8ef8ba146e296513b89d6a9358868c49acce1db75e058c66ef43b66433d9644460d85c6cbcdb8d755f14ca3b5a58912cd8e0e83f120
 DIST fcft-2.4.2.tar.gz 323827 BLAKE2B ae19997f3ad1ccd4170332978b83dd00547be1fff5908be84d7811357821f7606fa6da1bfaf51f94f8fd6dd68609eea6098079336cc606ea831ffe97b1ce6f28 SHA512 667a2adabca4538e8b8db5ea9f7dba5eb703aa675c3aa869769ee927c8a29860294811756746e9f308a3ded9e8ef259f8c078d528b9fecd19536e6f5926cf558
+DIST fcft-2.4.3.tar.gz 324345 BLAKE2B 06f79351887b875bc37e940b2fe6fb89f00d9051713f951070e836618f3817c189f4fc167ea2334acf8f03135fa40597c07016cbd7ae9be0d86cbbfec1bd79c0 SHA512 8eb7fc108e89eeaf240eec2d3e4157b13e707ab996d5e94d5bb5488ee45a0f5df3686e7e515f9c50efa0199e9cbb2fc0192d7a09a20a298fa6edd77227a3d623
--- a/media-libs/fcft/fcft-2.4.3.ebuild
+++ b/media-libs/fcft/fcft-2.4.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz  -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://codeberg.org/dnkl/fcft.git"
+fi
+
+DESCRIPTION="A simple library for font loading and glyph rasterization"
+HOMEPAGE="https://codeberg.org/dnkl/fcft"
+LICENSE="MIT"
+SLOT="0/3"
+IUSE="examples +text-shaping test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/tllist
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/pixman
+	text-shaping? ( media-libs/harfbuzz )
+	examples? (
+		dev-libs/libutf8proc:=
+		dev-libs/wayland
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		text-shaping? ( media-fonts/noto-emoji )
+	)
+"
+BDEPEND="
+	app-text/scdoc
+	app-i18n/unicode-data
+	examples? (
+		dev-libs/wayland-protocols
+		dev-util/wayland-scanner
+	)
+"
+
+src_prepare() {
+	default
+
+	rm -r "unicode" || die "Failed removing vendored unicode-data"
+
+	sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
+		meson.build || die "Failed changing UnicodeData.txt to system's copy"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature text-shaping)
+		$(meson_use examples)
+		"-Dwerror=false"
+	)
+
+	use test && emesonargs+=(
+		$(meson_use text-shaping test-text-shaping)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	use examples && newbin "${BUILD_DIR}/example/example" fcft-example
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
+}
--- a/sys-apps/dust/Manifest
+++ b/sys-apps/dust/Manifest
@@ -6,6 +6,7 @@ DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585
 DIST assert_cmd-1.0.1.crate 24575 BLAKE2B e204b79da44a27b9c70be8dbf53356714ac994b4e5daced1b4f570c9e6c4a422572e825a54387df25292bd27e9ae11fa57d803bcfe4643382a2f739859dd42fd SHA512 969e1f6ba28edc0d4d25a10390f8e94578562602d303e9a9e402f29655cb9d67edc1040b283e1bc9fb4a88a5817814d88e85b77944204288aabcfb6da69bbdbf
 DIST assert_cmd-1.0.2.crate 25037 BLAKE2B b7fe731a66ce7270b165e30da774420ff17f29a881e738b8b8a9ed37170edc6d0c27f1b052553c408c93b832f879742123b1585abccfde9c7e4b5830d0f327a6 SHA512 1d17d4ac5748a3a44ed25c8788f17bb5edcc15ce0e3f2232dfcb0c88cf735406e1048752473ae76fb033aad6d544c142c699c49e0398d2625e59b36526417f7a
 DIST assert_cmd-1.0.5.crate 26641 BLAKE2B 9d4129cbaed044c556bb041954dfc8b0857381b46cd3513e3ce727f465e361999555d8535a5a7b2a978be179a0114c44ebff38ef66cba7a1db272e408af1ca08 SHA512 fc261e4411cc5113c63c2e6c12c81dd97e924eb961e5851ec84c43c76d1271c08a6c36798e1951a0ceaa54acd91a75575cefa7fbfad8123fd4652192c0ebc396
+DIST assert_cmd-1.0.7.crate 26777 BLAKE2B a27a6c59969b6202ceebc72b50331e056f02e05befe710f3f1fe77622a61ed4ed11e258cc2df43f52a7f57c18e4bc9b33c72946d012a4fd6f5417c1a5fedddff SHA512 9e0e67bdf14df8235cdd11d9c453bb2f0723188a39961d8aab26fd98f2c64629d085c8d3eb50ee88371ecdc2ea306bfe5dda1ca4872082b40f13a4cea99e05d1
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
@@ -25,10 +26,12 @@ DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066
 DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST dust-0.5.3.tar.gz 85876 BLAKE2B b547939bba382fe09e3ce61bff9233e8d54a7539601c69df3b27b939eca09a0002ae5855c74a29e8d064b39b25f8d31470ac309bfd8c5b02786b9d6d2344ac22 SHA512 f58f62da0394e196369580bb67174405552a878c98dea643842b19d6aacb53b3ed6acdb2cb39c7ac18a1453d3ad53d6b6ec46bd17e3a32ba60bf55aab2fc51f6
 DIST dust-0.5.4.tar.gz 86135 BLAKE2B 9de6668297e01fb5eec1c411f719296f49b4b9e94ba6bd8ce64df8d27bf84ba943f75c8ee17f99b40411ca8bcd12d2a53027a30844db65ddc5df0581920e013a SHA512 4ab89180d4757dd235a44988ea56fbe130e3b5cac596e8a1f7839c665c1eaa68819f37d4935a61db7d4f25befab3686c098e2a8e937822bede8a4167fb408142
 DIST dust-0.6.0.tar.gz 86205 BLAKE2B 623f0bc074ec1ba8e95a302385f0d5f4fb3679e88db0c4004d997e79eff723bebce3f00a4073ce1be058c9e2fb06a634056d0f00ed988ec0616b294de7845558 SHA512 6552b2dc34a077bda1db0e2773074238dac1154a3852f748a81513e28417374e8c06630176d70cc70e52cb44b5b9f9109417d83cf03751441434af0a9cf50377
+DIST dust-0.6.1.tar.gz 86682 BLAKE2B 639421a6935a79ff0c8656456e5aa13fb557c17f779d1d8d37dfd799ad785259f1df20221c7e42c215dbf6b5db273e55ceb015a514270679415dbc2fd6c781c6 SHA512 c83b0c938c0495c55e6548537f15cb0e377baa68fa1c761b4ac31ebc8c3636cf96a293a51b1492fc78daefcf03d7a3183c1fa741ec5118cab716dd746abc724b
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
@@ -39,12 +42,15 @@ DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8
 DIST hermit-abi-0.1.15.crate 9597 BLAKE2B 012fdcd6ed09e4bfc9256d524648b0e7f65e9bc8dc6351d04249c492a0b5e836c529791f79fd144b9f09ae55462c034b9a3fbcff5b2abb40a7c78f7f8d78f64a SHA512 f81f6a87e0a182b5e49a2edf60f47243b7cbb116df5aa6a3354f1e230d4030bb5697ad4eb9abb6203ff66c1cfac1fc35b7d7e76dedc276767124ea4f41f97535
 DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST ignore-0.4.16.crate 52343 BLAKE2B fa232eec0a35a2b144225ac804f2d8d198a95ab58d63d9a80378fcd9e9dc99b7aa800d8855da59d51a6004be496bb51a3eb9d318bcfc6c38b257c1de68a86abd SHA512 23d0205d25dee02067a6af9ccaab9abcf1eb812e309d029697f0b0a3fd6062e33d8fb1dcae8c78494867e82132ee6797bd4af716d7c1523afc29feebed6d6698
 DIST ignore-0.4.17.crate 53056 BLAKE2B 734e74210f13e5ad08864cc8b143fb780383cd36048e78da04a0475eaa760867dd4a385b37fdfaff0c5aca946d4aab19c4901df0833271a3ba05887ea5dec9c5 SHA512 52380126bb46478875093eb39972949625e1d9ada6fac7148faeccc22807d8e2a1e41c34549e7d9f884fd3cd6dc3d42b47a88b5b6de1089d7e3ee8014b3aea35
+DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.74.crate 503397 BLAKE2B b38c932a29de204e9cdbae39fcdbd1a054256e8c0f37227ba71bffbc133d80bb68d34f4011fc83db7300254c381fe0855e1df19db2dd75234a5ee029f1ea9e63 SHA512 6aa984cd325bfa37736d3afe4518093468927607daf7b12bd8a5a396d2ec3740876504ab4a2a622c5e7caa9872f31263a42ce53f10c15f61f9e45891eaf41df1
 DIST libc-0.2.82.crate 515967 BLAKE2B 60c1ebdf659f1eb37f47a068e778567412bb133526df28fee1d20b3fd58dbe7fee1abbdd21c5445bc1022f2cdc39847244dcb7412114037a0be64f5a2a383978 SHA512 25eaf390acb409d329b9e32008078824eed4ca3a10af851f5097b653793db316419a395910c23dff293dfe2bac051a51871281a6bf2487937121b403286630c1
 DIST libc-0.2.97.crate 517712 BLAKE2B ad769579a8e89e9e0ea6a08b8fd82b69a3a299721d63b63efcb436b333021c097933565e86f4b66ffcce6a589718bed2aacb36b80a936dd3dda763b9c0c240d7 SHA512 9b94a43d7da1e419900f7a016d5eb958bc42a006e1bb621ab8e2be2167e91f05cee81144c25e81a85c1b1ea2a26ff88980a4cc292fd42db8b09c5c49bf5531ed
+DIST libc-0.2.98.crate 522087 BLAKE2B 950686d7cde31322e1cdf82ae189192091b8543d14d0da0dcf3892910f4216e8e46bb1d5e7e8fcb1693a372577c57a6eb6538a0fef997c1c1a0466c3a1f7acb8 SHA512 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST log-0.4.13.crate 36015 BLAKE2B e71388a74a491e519a6c4dc048c46d2ec7fc30e68663806084db1bd772b8cbf89f684879114c09865b1ddc37d187499652d1731f62268eb634567d2166147e04 SHA512 22713712656ffdbfee7d2862c208fc7ad1c1c5380601ae9d0cc100fa460902ebd7a90cdf9fb5dccb5dcd17248d5c8ae8b1c53946c1baa8490cc9f06cab3d4a4a
 DIST lscolors-0.7.1.crate 17986 BLAKE2B 927e3d9155591c5223fccf78f011dfce21f29c7f9322de0e3a97703eec2b27ff1eb93890b9ef62cb0916ceb06bb88660b34443ef815aef621801f7917ff46b31 SHA512 65c618c25624b360a98f98142e0867d524d19e7060887993f35899a26a812e360d8b8d627d36a72fa3c604a1cb5615d6a425850087183b694083b9649e120776
@@ -59,6 +65,7 @@ DIST ppv-lite86-0.2.8.crate 20848 BLAKE2B ca85104fc1d6b300aab69c7b9367ba04f77ccd
 DIST predicates-1.0.5.crate 26097 BLAKE2B 4adc79981c706796bef11e75e4a87cdfc5ff7f5066869f8d26f5ba0f3699c292edd6e5dd1be8854ff9e8b2604bf24904f1242056719e1d863951ca6f5ad042ae SHA512 696890cb9ed83b6ebd1b46e42bde95b148fe067174b0057e4ae83d9b3a4d2043dcedf0cc58b78e88b36a460402cd6359580356018986b4a136cba9e1afde55b6
 DIST predicates-1.0.6.crate 26093 BLAKE2B 20eec0af0b3464931f486938fd7a058d4ccd15fc12d7842387906f142897b929ec79068ef410853b6008b71945424930064bafd84ead7afcdca29f35b9624926 SHA512 0e971a05e1ada5ffe61054d551330a6bcb1c9a5df541d19b442d7a06842ccfec9db981d347e3357f83b1cad750e8af1f90cc9130df94f417267063e7954c529e
 DIST predicates-1.0.8.crate 26996 BLAKE2B 0e45f2de536395c001475654c5ec2327c66151999ac00fba34abe637c4a2cd10e380597745de0e0bd85b3b088d09d171ec21d40664d878e100cc5d73f3eb5c6b SHA512 a6d8278c331223c24a7189e9dfeddd11a20e7e9010e647a8fbc554f4847b72a13aba2ad22d4e0fedfb2ed4490fd11b05fb2d0e7fda373794b7c0a70094998a6a
+DIST predicates-2.0.0.crate 27026 BLAKE2B 42429cbf1ace7f8fc9837448f43968ea2b2d565877bac7cbd337f6d521a6ba00dd4033f82dcd865361313dd0a0fffa061c756c307abd6fd8e10c4160c1141c19 SHA512 39919bbdad3ff01151ddea985a26d2237df5af4cff429f982e131d405e2213fe8de9c2f8dbe183e5f8f6ac6a54abf57dc705ee5daa7ab3b139012f7ce43033e7
 DIST predicates-core-1.0.0.crate 8066 BLAKE2B 71e70aec3adfae302287a1cd3d7d19eff8a697659d61ced33b89caa8a2a3359ab7251db012d973dd574abecec82acc010c5169d0670096af06e325761363c34d SHA512 024f997976ae618e3b82d59613f8b6c41b3c0b3b595b6cf38d10d2d27a11388e9511ca38c06d46b52a12fc19d3cec36a69ca14e1e21f316a719539e41c86d6f4
 DIST predicates-core-1.0.1.crate 8186 BLAKE2B cef5cbdc252e3f953fb9417bd5a439f226f627b2ca6a9c537834ee8ee59cf3a252ad92ef5ee40f4e544e388757e5dba6b07b6807e95dd89eb35bf45f612d09b8 SHA512 3addfc4f6e3f549125eddc9f1aa11072e17f48909f53ce8e476ce783cc690c0b52a1fe6416d87816d8b558350fb8b4666adc6b79cff880956bf258f646459da0
 DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
--- a/sys-apps/dust/dust-0.6.1.ebuild
+++ b/sys-apps/dust/dust-0.6.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.2
+
+EAPI=7
+
+CRATES="
+	aho-corasick-0.7.18
+	ansi_term-0.11.0
+	ansi_term-0.12.1
+	assert_cmd-1.0.7
+	atty-0.2.14
+	autocfg-1.0.1
+	bitflags-1.2.1
+	bstr-0.2.16
+	cfg-if-1.0.0
+	clap-2.33.3
+	crossbeam-channel-0.5.1
+	crossbeam-deque-0.8.0
+	crossbeam-epoch-0.9.5
+	crossbeam-utils-0.8.5
+	difflib-0.4.0
+	doc-comment-0.3.3
+	either-1.6.1
+	getrandom-0.2.3
+	hermit-abi-0.1.19
+	itertools-0.10.1
+	lazy_static-1.4.0
+	libc-0.2.98
+	lscolors-0.7.1
+	memchr-2.4.0
+	memoffset-0.6.4
+	num_cpus-1.13.0
+	ppv-lite86-0.2.10
+	predicates-2.0.0
+	predicates-core-1.0.2
+	predicates-tree-1.0.2
+	rand-0.8.4
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rand_hc-0.3.1
+	rayon-1.5.1
+	rayon-core-1.9.1
+	redox_syscall-0.2.9
+	regex-1.5.4
+	regex-automata-0.1.10
+	regex-syntax-0.6.25
+	remove_dir_all-0.5.3
+	scopeguard-1.1.0
+	stfu8-0.2.4
+	strsim-0.8.0
+	tempfile-3.2.0
+	term_size-0.3.2
+	terminal_size-0.1.17
+	textwrap-0.11.0
+	thousands-0.2.0
+	treeline-0.1.0
+	unicode-width-0.1.8
+	vec_map-0.8.2
+	wait-timeout-0.2.0
+	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
+"
+
+inherit cargo
+
+DESCRIPTION="A more intuitive version of du"
+HOMEPAGE="https://github.com/bootandy/dust"
+SRC_URI="https://github.com/bootandy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored.
+#
+# Specifying `test` to ignore failing tests.
+# See <https://github.com/bootandy/dust/issues/138>.
+RESTRICT="mirror test"
+
+QA_FLAGS_IGNORED="usr/bin/dust"
+
+src_install() {
+	cargo_src_install
+
+	dodoc README.md
+}
--- a/www-servers/hinsightd/Manifest
+++ b/www-servers/hinsightd/Manifest
@@ -1,3 +1 @@
-DIST hin9-v0.9.3.tar.gz 65343 BLAKE2B 4b475f8088aa113ae7dbd2cfe091ee10efb39d60b7277cb821eb010e752b39adf5e2a3c53aedc73c612ed4ba3d96178c09f255b9a07caf64b9cad34af2da5841 SHA512 768f0e55c2992b0ce50187a62e4c75ae2c2e2c31067d77898d221ad89afba20a3121853f01267bf6f1e43942ddca273bfed6c63849ce922c9c9d2c971a9061e0
-DIST hin9-v0.9.4.tar.gz 77019 BLAKE2B 7339b407ba60c740f51f47794bd5fa4b73c662c718841c8de10be53bc6bec53f5ba511e2f69859ef9312aa85a318f0feeab5088b839dcae1dd734951f52f87a4 SHA512 817ac692778b9b7d9b2b7dd82a0d92fa0303d875601d6b52ddd75bb470cab1c9ac39170a0a1f5737ec4d28849837a8b61bf34bc96481044fe9864932bcfdd6cf
-DIST hin9-v0.9.5.tar.gz 79621 BLAKE2B 2bf1fb03abf1d10d20bd47788e0d2eb39bc01be7fab867fb9b2ddb40e233cc0eed3e55cdfef84881c205de8d35da5bb9a4a56744a69e232b5f7baa6a5910c4a4 SHA512 8db159d95b008f3f4070844ba078f523f6159461c66ebe889e0a0af473e3a888cefa43eedc97c450b3a7bcc35079bfa4530cdcc8741da513a17e08ea896af1f5
+DIST hin9-v0.9.7.tar.gz 86527 BLAKE2B 243e627f67b6ce4efe683ca51a175e0364eebf47e7a1a881c0650f65aa922bb596dbc7814fff59b9e8d5c61ff16152cc1da0ab764b10027bed4b48bb7961b41c SHA512 161aacf50d6581643fff2c494e13faa7a07dd58fdc74ffbf14d1199500ae231be90b358bd9223e1a4cb8cb7c7502793b127c7c933d67ddd1bfbaa2984c3ae715
--- a/www-servers/hinsightd/files/hinsightd-defines-v3.patch
+++ b/www-servers/hinsightd/files/hinsightd-defines-v3.patch
@@ -1,21 +1,18 @@
 diff --git a/src/hin/conf.h b/src/hin/conf.h
-index 61db395..1eaaa14 100644
+index 9edb801..1deefd5 100644
 --- a/src/hin/conf.h
 +++ b/src/hin/conf.h
-@@ -2,11 +2,11 @@
+@@ -2,10 +2,10 @@
 #ifndef HIN_CONF_H
 #define HIN_CONF_H
 
 -#define HIN_CONF_PATH "workdir/main.lua"
 -#define HIN_LOGDIR_PATH "workdir/logs/"
-#define HIN_WORKDIR_PATH "./"
-#define HIN_TEMP_PATH "/tmp/"
-#define HIN_DEBUG_MASK 0xffffffff
 +#define HIN_CONF_PATH "/etc/hinsightd/main.lua"
 +#define HIN_LOGDIR_PATH "/var/log/hinsightd/"
-+#define HIN_WORKDIR_PATH "/etc/hinsightd/"
+ #define HIN_WORKDIR_PATH "./"
+-#define HIN_TEMP_PATH "/tmp/"
 +#define HIN_TEMP_PATH "/var/tmp/hinsightd/"
-+#define HIN_DEBUG_MASK 0x27f0f
+ #define HIN_DEBUG_MASK 0x20007
 
 #define HIN_URING_QUEUE_DEPTH 256
- #define HIN_URING_DONT_FORK 0
--- a/www-servers/hinsightd/files/hinsightd-default-config.patch
+++ b/www-servers/hinsightd/files/hinsightd-default-config.patch
@@ -1,12 +0,0 @@
-diff --git a/workdir/main.lua b/workdir/main.lua
-index 4d516c6..08dd597 100644
--- a/workdir/main.lua
-+++ b/workdir/main.lua
-@@ -2,6 +2,7 @@
- 
- --redirect_log (logdir.."debug.log")
- --redirect_log (NULL, "ffffffff")
-+redirect_log (logdir.."debug.log")
- 
- function printf (...)
-   io.write (string.format (...))
--- a/www-servers/hinsightd/files/hinsightd-redefine-directories-v2.patch
+++ b/www-servers/hinsightd/files/hinsightd-redefine-directories-v2.patch
@@ -1,21 +0,0 @@
-diff --git a/src/hin/conf.h b/src/hin/conf.h
-index 4a6f071..f4f6f36 100644
--- a/src/hin/conf.h
-+++ b/src/hin/conf.h
-@@ -2,11 +2,11 @@
- #ifndef HIN_CONF_H
- #define HIN_CONF_H
- 
-#define HIN_CONF_PATH "workdir/main.lua"
-#define HIN_LOGDIR_PATH "build/"
-#define HIN_WORKDIR_PATH "./"
-#define HIN_TEMP_PATH "/tmp/"
-#define HIN_DEBUG_MASK 0xffffffff
-+#define HIN_CONF_PATH "/etc/hinsightd/main.lua"
-+#define HIN_LOGDIR_PATH "/var/log/hinsightd/"
-+#define HIN_WORKDIR_PATH "/etc/hinsightd/"
-+#define HIN_TEMP_PATH "/var/tmp/hinsightd/"
-+#define HIN_DEBUG_MASK 0x27f0f
- 
- #define HIN_URING_QUEUE_DEPTH 256
- #define HIN_URING_DONT_FORK 0
--- a/www-servers/hinsightd/files/hinsightd-redefine-directories.patch
+++ b/www-servers/hinsightd/files/hinsightd-redefine-directories.patch
@@ -1,30 +0,0 @@
-diff --git a/src/hin/conf.h b/src/hin/conf.h
-index 8dfe060..3874d6c 100644
--- a/src/hin/conf.h
-+++ b/src/hin/conf.h
-@@ -2,10 +2,10 @@
- #ifndef HIN_CONF_H
- #define HIN_CONF_H
- 
-#define HIN_CONF_PATH "workdir/main.lua"
-#define HIN_LOGDIR_PATH "build/"
-#define HIN_WORKDIR_PATH "./"
-#define HIN_PRINT_GREETING 1
-+#define HIN_CONF_PATH "/etc/hinsightd/hinsightd.lua"
-+#define HIN_LOGDIR_PATH "/var/log/hinsightd/"
-+#define HIN_WORKDIR_PATH "/var/www/localhost/"
-+#define HIN_PRINT_GREETING 0
- 
- #define HIN_URING_QUEUE_DEPTH 256
- #define HIN_URING_DONT_FORK 0
-@@ -21,8 +21,8 @@
- #define HIN_HTTPD_MAX_HEADER_LINE_SIZE 4096
- #define HIN_HTTPD_MAX_POST_SIZE 4121440
- #define HIN_HTTPD_MAX_DEFLATE_SIZE 0
-#define HIN_HTTPD_POST_DIRECTORY "/tmp"
-#define HIN_HTTPD_CACHE_DIRECTORY "/tmp"
-+#define HIN_HTTPD_POST_DIRECTORY "/var/tmp/hinsightd/"
-+#define HIN_HTTPD_CACHE_DIRECTORY "/var/tmp/hinsightd/"
- #define HIN_HTTPD_CACHE_CLEAN_ON_EXIT 1
- #define HIN_HTTPD_CACHE_TMPFILE 0
- #define HIN_HTTPD_CACHE_MAX_SIZE 64 * 1024 * 1024
--- a/www-servers/hinsightd/files/hinsightd.service
+++ b/www-servers/hinsightd/files/hinsightd.service
@@ -3,7 +3,7 @@ Description=hinsightd is a http/1.1 webserver
 After=syslog.target network.target

 [Service]
-ExecStart=/usr/bin/hinsightd --config /etc/hinsightd/hinsightd.lua
+ExecStart=/usr/sbin/hinsightd --config /etc/hinsightd/hinsightd.lua
 ExecReload=/bin/kill -USR1 $MAINPID

 [Install]
--- a/www-servers/hinsightd/files/init.d.sh
+++ b/www-servers/hinsightd/files/init.d.sh
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-
-NAME=$RC_SVCNAME
-RUN_DIR=/var/run/$NAME
-LOG_DIR=/var/log/$NAME
-TMP_DIR=/var/tmp/$NAME
-CWD_DIR=/var/www/localhost
-PID_FILE=$RUN_DIR/$NAME.pid
-CFG_FILE=/etc/hinsightd/main.lua
-LOG_FILE=$LOG_DIR/hindsight.log
-
-RUN_FILE=/usr/bin/hinsightd
-RUN_USER="hinsightd"
-
-extra_commands="checkconfig reload"
-
-command=$RUN_FILE
-command_args="--config $CFG_FILE --logdir $LOG_DIR --cwd $CWD_DIR --pidfile $PID_FILE --tmpdir $TMP_DIR --log $LOG_FILE"
-pidfile="$PID_FILE"
-command_args_background="--daemonize"
-command_user="$RUN_USER:$RUN_USER"
-
-depend() {
-  use net
-}
-
-checkconfig() {
-  start-stop-daemon --quiet --user $RUN_USER --start --exec $command -- --check $command_args
-}
-
-start_pre() {
-  checkpath --directory --owner $command_user --mode 06770 $LOG_DIR $TMP_DIR $RUN_DIR
-  checkconfig || return 1
-}
-
-reload() {
-  if ! service_started "${NAME}" ; then
-    eerror " * ERROR ${NAME} isn't running"
-    return 1
-  fi
-
-  checkconfig || return 1
-
-  echo " * Reloading ${NAME} ..."
-
-  start-stop-daemon --quiet --signal USR1 --pidfile ${PID_FILE}
-  eend $?
-}
-
-
--- a/www-servers/hinsightd/files/initd-v1.sh
+++ b/www-servers/hinsightd/files/initd-v1.sh
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-
-NAME=$RC_SVCNAME
-RUN_DIR=/var/run/$NAME
-LOG_DIR=/var/log/$NAME
-TMP_DIR=/var/tmp/$NAME
-CWD_DIR=/var/www/localhost
-PID_FILE=$RUN_DIR/$NAME.pid
-CFG_FILE=/etc/hinsightd/main.lua
-LOG_FILE=$LOG_DIR/hindsight.log
-
-RUN_FILE=/usr/sbin/hinsightd
-RUN_USER="hinsightd"
-
-extra_commands="checkconfig reload"
-
-command=$RUN_FILE
-command_args="--config $CFG_FILE --logdir $LOG_DIR --cwd $CWD_DIR --pidfile $PID_FILE --tmpdir $TMP_DIR --log $LOG_FILE"
-pidfile="$PID_FILE"
-command_args_background="--daemonize"
-command_user="$RUN_USER:$RUN_USER"
-
-depend() {
-  use net
-}
-
-checkconfig() {
-  start-stop-daemon --quiet --user $RUN_USER --start --exec $command -- --check $command_args
-}
-
-start_pre() {
-  checkpath --directory --owner $command_user --mode 06770 $LOG_DIR $TMP_DIR $RUN_DIR
-  checkconfig || return 1
-}
-
-reload() {
-  if ! service_started "${NAME}" ; then
-    eerror " * ERROR ${NAME} isn't running"
-    return 1
-  fi
-
-  checkconfig || return 1
-
-  echo " * Reloading ${NAME} ..."
-
-  start-stop-daemon --quiet --signal USR1 --pidfile ${PID_FILE}
-  eend $?
-}
-
-
--- a/www-servers/hinsightd/files/logrotate.d.sh
+++ b/www-servers/hinsightd/files/logrotate.d.sh
@@ -1,14 +0,0 @@
-/var/log/hinsightd/*.log {
-daily
-missingok
-rotate 7
-compress
-delaycompress
-minsize 1M
-notifempty
-sharedscripts
-postrotate
-	test -e /run/openrc/softlevel && /etc/init.d/hinsightd reload 1>/dev/null || true
-	test -e /run/systemd/system && systemctl reload hinsightd.service || true
-endscript
-}
--- a/www-servers/hinsightd/hinsightd-0.9.3.ebuild
+++ b/www-servers/hinsightd/hinsightd-0.9.3.ebuild
@@ -1,81 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit fcaps lua-single systemd cmake linux-info
-
-DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
-HOMEPAGE="https://gitlab.com/tiotags/hin9"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
-else
-	SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"
-	S="${WORKDIR}/hin9-v${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="+openssl"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-RDEPEND="
-	${LUA_DEPS}
-	acct-user/hinsightd
-	acct-group/hinsightd
-	sys-libs/liburing
-	sys-libs/zlib
-	openssl? ( dev-libs/openssl )
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/hinsightd-redefine-directories.patch"
-	"${FILESDIR}/hinsightd-default-config.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_OPENSSL=$(usex openssl)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	newbin "${BUILD_DIR}/hin9" hinsightd
-	newinitd "${FILESDIR}/init.d.sh" hinsightd
-	systemd_dounit "${FILESDIR}/hinsightd.service" # not tested
-
-	insinto /etc/hinsightd
-	newins "${S}/workdir/main.lua" hinsightd.lua
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate.d.sh hinsightd
-
-	keepdir /var/www/localhost/htdocs
-	keepdir /var/log/hinsightd
-	keepdir /var/tmp/hinsightd
-}
-
-pkg_postinst() {
-	fcaps CAP_NET_BIND_SERVICE /usr/bin/hinsightd
-
-	if kernel_is lt 5 7; then
-		ewarn ""
-		ewarn "hinsightd requires io_uring and kernel ~5.6.0"
-		ewarn ""
-	fi
-}
--- a/www-servers/hinsightd/hinsightd-0.9.4.ebuild
+++ b/www-servers/hinsightd/hinsightd-0.9.4.ebuild
@@ -1,87 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit fcaps lua-single systemd cmake linux-info
-
-DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
-HOMEPAGE="https://gitlab.com/tiotags/hin9"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
-else
-	SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"
-	S="${WORKDIR}/hin9-v${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="+openssl"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-RDEPEND="
-	${LUA_DEPS}
-	acct-user/hinsightd
-	acct-group/hinsightd
-	sys-libs/liburing
-	sys-libs/zlib
-	openssl? ( dev-libs/openssl )
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/hinsightd-redefine-directories-v2.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_OPENSSL=$(usex openssl)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	newbin "${BUILD_DIR}/hin9" $PN
-	newinitd "${FILESDIR}/init.d.sh" $PN
-	systemd_dounit "${FILESDIR}/$PN.service" # not tested
-
-	# config
-	insinto /etc/$PN
-	doins "${S}/workdir/main.lua"
-	doins "${S}/workdir/lib.lua"
-	doins "${S}/workdir/default_config.lua"
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate.d.sh $PN
-
-	keepdir /var/www/localhost/htdocs
-}
-
-pkg_postinst() {
-	fcaps CAP_NET_BIND_SERVICE /usr/bin/$PN
-
-	if kernel_is lt 5 7; then
-		ewarn ""
-		ewarn "hinsightd requires io_uring and kernel ~5.6.0"
-		ewarn ""
-	fi
-
-	ewarn ""
-	ewarn "hinsightd requires a higher than default RLIMIT_MEMLOCK for"
-	ewarn "things like graceful restarting"
-	ewarn "memory limit can be increased in /etc/security/limits.conf"
-	ewarn ""
-}
--- a/www-servers/hinsightd/hinsightd-0.9.7.ebuild
+++ b/www-servers/hinsightd/hinsightd-0.9.7.ebuild
@@ -36,13 +36,14 @@ RDEPEND="
 	acct-group/hinsightd
 	sys-libs/liburing
 	sys-libs/zlib
+	virtual/libcrypt
 	openssl? ( dev-libs/openssl )
 "

 DEPEND="${RDEPEND}"

 PATCHES=(
-	"${FILESDIR}/hinsightd-defines-v3.patch"
+	"${FILESDIR}/defines-v4.patch"
 )

 src_configure() {
@@ -54,7 +55,8 @@ src_configure() {

 src_install() {
 	newsbin "${BUILD_DIR}/hin9" $PN
-	newinitd "${FILESDIR}/initd-v1.sh" $PN
+	newinitd "${S}/external/packaging/$PN.initd.sh" $PN
+	newconfd "${S}/external/packaging/$PN.confd.sh" $PN
 	systemd_dounit "${FILESDIR}/$PN.service" # not tested

 	# config
@@ -65,7 +67,7 @@ src_install() {

 	# logrotate
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate.d.sh $PN
+	newins "${S}/external/packaging/$PN.logrotate.sh" $PN

 	keepdir /var/www/localhost/htdocs
 }
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-9999.ebuild
@@ -36,13 +36,14 @@ RDEPEND="
 	acct-group/hinsightd
 	sys-libs/liburing
 	sys-libs/zlib
+	virtual/libcrypt
 	openssl? ( dev-libs/openssl )
 "

 DEPEND="${RDEPEND}"

 PATCHES=(
-	"${FILESDIR}/hinsightd-defines-v3.patch"
+	"${FILESDIR}/defines-v4.patch"
 )

 src_configure() {
@@ -54,7 +55,8 @@ src_configure() {

 src_install() {
 	newsbin "${BUILD_DIR}/hin9" $PN
-	newinitd "${FILESDIR}/initd-v1.sh" $PN
+	newinitd "${S}/external/packaging/$PN.initd.sh" $PN
+	newconfd "${S}/external/packaging/$PN.confd.sh" $PN
 	systemd_dounit "${FILESDIR}/$PN.service" # not tested

 	# config
@@ -65,7 +67,7 @@ src_install() {

 	# logrotate
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate.d.sh $PN
+	newins "${S}/external/packaging/$PN.logrotate.sh" $PN

 	keepdir /var/www/localhost/htdocs
 }
--- a/x11-misc/betterlockscreen/Manifest
+++ b/x11-misc/betterlockscreen/Manifest
@@ -1,2 +1,2 @@
-DIST betterlockscreen-3.1.1.tar.gz 8913 BLAKE2B eb4eb1bb3e775490a6e6048236f8b3cb51e3ecf338b30c45c0e1e46e4164a03728d5cd3e72d6476ebdb50881a15f0fb66cecd97b1e2c4ee06798880e74dbcc5c SHA512 a4facb9a66c6fdbff1ae83bbb94aa74ed00431d0b67fe4e34348cc85d385e73b01551a60fad0bdf9193799c0f4c808406d43d34ffb7be3256ee589ede93f78d7
 DIST betterlockscreen-3.2.0.tar.gz 9043 BLAKE2B c61a41e09e1842fece991e41b55dd6fbc457357157c8facaedd754cc01d8bf0e18623ce0fec43a452063f55c7da701853d6984bfdb0d4edf88f2182ffd864543 SHA512 3816e5f3214b4a956ac158193753786393c4e239d477a1cc9f2d3ec00b6cfac6e696325f7c75401667924ed6ad7256e4ea7f9e20a4604a88eb82c5d3bad34190
+DIST betterlockscreen-4.0.0_beta1.tar.gz 13246 BLAKE2B 8031bf7de534ffe84b52266f73e987a4487a013d32278d788abd49eccb44f7f18afbdf4dd7d06f8f82196db2bd55575fb9fa9325f4e18cc71adb353d0958b272 SHA512 c52038fab783a93dc04d3421a50bb1635bb36f992b394601aef359ae855df645319d33c587674b77470282ea911b9c9d0104a23947d98d86d6e7ec3defef76da
--- a/x11-misc/betterlockscreen/betterlockscreen-3.2.0.ebuild
+++ b/x11-misc/betterlockscreen/betterlockscreen-3.2.0.ebuild
@@ -43,7 +43,7 @@ pkg_postinst() {
 	elog ''
 	elog 'How to use:'
 	elog '1. Updating image cache(required)'
-	elog 'betterlockscreen -u ~/Pictures'
+	elog 'betterlockscreen -u "/path/to/img.jpg"'
 	elog '2. Lockscreen'
 	elog 'betterlockscreen -l dim '
 }
--- a/x11-misc/betterlockscreen/betterlockscreen-4.0.0_beta1.ebuild
+++ b/x11-misc/betterlockscreen/betterlockscreen-4.0.0_beta1.ebuild
@@ -8,11 +8,14 @@ HOMEPAGE="https://github.com/pavanjadhaw/betterlockscreen"

 inherit systemd

+MY_PV=${PV//_beta/-beta}
+MY_P="${PN}-${MY_PV}"
+
 if [[ "${PV}" == 9999 ]];then
 	inherit git-r3
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
-	SRC_URI="https://github.com/pavanjadhaw/betterlockscreen/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/pavanjadhaw/betterlockscreen/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi

@@ -29,6 +32,12 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"

+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	sed -i '19s/i3lock-color/i3lock/' betterlockscreen || die
+}
+
 src_install() {
 	dobin betterlockscreen

@@ -43,7 +52,7 @@ pkg_postinst() {
 	elog ''
 	elog 'How to use:'
 	elog '1. Updating image cache(required)'
-	elog 'betterlockscreen -u ~/Pictures'
+	elog 'betterlockscreen -u "/path/to/img.jpg"'
 	elog '2. Lockscreen'
 	elog 'betterlockscreen -l dim '
 }
--- a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
+++ b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
@@ -20,7 +20,16 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""

-RDEPEND="x11-misc/rofi"
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="dev-libs/glib:2"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/cairo
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-misc/rofi
+"

 PATCHES=(
 	"${FILESDIR}/${P}-do-not-install-man-page.patch"
--- a/x11-misc/xob/Manifest
+++ b/x11-misc/xob/Manifest
@@ -1 +1,2 @@
 DIST xob-0.2.tar.gz 510814 BLAKE2B fa2590511a8cb48d009a8e07d5d8a57aebb09a70caa80e648304a1af6ea48378db062151cacfd87efa589486c2699985c3904718bb75055968c17c57009fca8e SHA512 f1981bb04172c5453428ecbdab33cc22453d1336aaac54ff613b29924179533c040cc82e640f12f3c5d1753c227af010aee3ac725ff4fb22d64ba1b07692a97e
+DIST xob-0.3.tar.gz 516433 BLAKE2B 66dbd3e6228eec35bd3f6a71312976ae914ec67daecc12e5279a879f37742d9c3167053c43560a38c081c106e03385231c45a7ebaecb0e63e3087ff4daeabd0b SHA512 b599ab37fb9eda15ecb4b6963eb4ca993905e8e34af8496a8a92de50b20724c799f222d5e37a430a9499df2b2c0ceb322f607e2d0e82db01cffba646ab9e3309
--- a/x11-misc/xob/xob-0.3.ebuild
+++ b/x11-misc/xob/xob-0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A lightweight overlay volume (or anything) bar for the X Window System"
+HOMEPAGE="https://github.com/florentc/xob"
+SRC_URI="https://github.com/florentc/xob/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	dev-libs/libconfig
+	x11-libs/libXrender
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake prefix="${EPREFIX}"/usr \
+		  sysconfdir="${EPREFIX}"/etc \
+		  DESTDIR="${D}" install
+	dodoc CHANGELOG.md README.md
+}