diff --git a/app-admin/awscli-bin/Manifest b/app-admin/awscli-bin/Manifest
index dd7fa83ef1..28e612550c 100644
--- a/app-admin/awscli-bin/Manifest
+++ b/app-admin/awscli-bin/Manifest
@@ -1 +1,3 @@
DIST awscli-bin-2.3.2.zip 44955907 BLAKE2B dd5331e3a7944f2910fdbb1539fac9773a751b655620cc014db638cb6bc2f87b8e8889bf861bad8c0e36d7e315ad863f56c762b51fe4737c6c344bd085e5b3cf SHA512 b435f9352c910ebf7daf3ae641135b06024fefa17596780ae0c1b4d20f5d5400e930ea5643072a15fee404c093914f394acf990c5483cfeff4edc248f67932a8
+DIST awscli-exe-linux-aarch64-2.4.27.zip 45315570 BLAKE2B 1477cbdbdbf1306f43b4cd138c3484dfb1579d8504d52d887b714aed4f90ee45396fc252e5a2533f023bf054f67000cdeef14c325d611cd1df26bf085f0b3156 SHA512 0efef5333c535f1f46ea9cdb867e3b43abeb3a898086e0ba59d5a2d0d55471f679c26643d30738e7b4de5f19ce365341358f515d278e93fe44ca852fdfae2142
+DIST awscli-exe-linux-x86_64-2.4.27.zip 46271162 BLAKE2B a9c9852764b9241ed962a40fe122c6c6ba838fb3dc60eb9dea3c6c98e8b94fd4a06f3fb3a6161959500d52860c97a2e4b740016d2bafe62c1c348f629fadd09f SHA512 906d884f24414c4737aee73b0a93285377b07fba173b77a8432c0c5bf77be9f7eb31854d8455105db51fd666352a3c88e2bdd1748ab274047f899a846d5cb1cb
diff --git a/app-admin/awscli-bin/awscli-bin-2.4.27.ebuild b/app-admin/awscli-bin/awscli-bin-2.4.27.ebuild
new file mode 100644
index 0000000000..3b1b45b0d7
--- /dev/null
+++ b/app-admin/awscli-bin/awscli-bin-2.4.27.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Universal Command Line Interface for Amazon Web Services version 2"
+HOMEPAGE="https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html"
+SRC_URI="
+ amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
+ arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="!app-admin/awscli"
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="*"
+QA_PRESTRIPPED="*"
+
+S="${WORKDIR}/aws"
+
+DOCS=( THIRD_PARTY_LICENSES )
+
+src_install() {
+ ./install --install-dir "${D}/opt/awscli" --bin-dir "${D}/usr/bin" \
+ || die "install failed"
+
+ einstalldocs
+}
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index d5a344c272..2544ca4299 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1 +1 @@
-DIST fastfetch-0.619.tar.gz 327381 BLAKE2B c85425478fa1cf42570232927e7bbd12b53cd450925a64ff21318ea9a3f22544d66e66b32f4f5b33a660082ca0dfc8666cc8b705078c8cec29de657385e1d564 SHA512 57ba0697e0b2f1d984a4ede21b50873a7ba0381b54eed07ad508fc454903e3dbcdfdb6ac6456141aff5cf0ce6d880f58f4343b2cad6e785491b397ab7413329e
+DIST fastfetch-1.0.0.tar.gz 326757 BLAKE2B 65a63a930bcc59f8ffc95f41515ea1eb924803c9365d830a8b5f17627b64ba4b64795cc5c3af24d0971fd8969f557fcd398234fca845481b38417ebe3ea0177c SHA512 c32df2276176e475c434ea9aae60debd9d05b0fed1861f2b1ce659ff693d98b181bf54aeb35abbd80944d72fd2280d2b7325f91eef1ee124083a81c46c9c7a10
diff --git a/app-misc/fastfetch/fastfetch-0.619.ebuild b/app-misc/fastfetch/fastfetch-1.0.0.ebuild
similarity index 66%
rename from app-misc/fastfetch/fastfetch-0.619.ebuild
rename to app-misc/fastfetch/fastfetch-1.0.0.ebuild
index e89cd5ab8b..414ee9c3d4 100644
--- a/app-misc/fastfetch/fastfetch-0.619.ebuild
+++ b/app-misc/fastfetch/fastfetch-1.0.0.ebuild
@@ -11,10 +11,7 @@ if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git"
else
- COMMIT="0f6e266fc3142cb214920852fd127e868dc7a61c"
- VERSION_REV="0f6e266"
- SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${COMMIT}"
+ SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
fi
LICENSE="MIT"
@@ -55,18 +52,5 @@ src_configure() {
-DENABLE_XFCONF=$(usex xfce)
)
- if [[ ${PV} == *9999 ]]; then
- elog "REV=\"r$(git rev-list --count HEAD)\""
- elog "COMMIT=\"$(git rev-parse HEAD)\""
- elog "VERSION_REV=\"$(git rev-parse --short HEAD)\""
- else
- # version comes from git, fake it
- local project_version_major=$(ver_cut 2)
- mycmakeargs+=(
- -DPROJECT_VERSION="r${project_version_major}.${VERSION_REV}"
- -DPROJECT_VERSION_MAJOR="${project_version_major}"
- )
- fi
-
cmake_src_configure
}
diff --git a/app-misc/fastfetch/fastfetch-9999.ebuild b/app-misc/fastfetch/fastfetch-9999.ebuild
index 5e1fc6be7e..8690c19ddb 100644
--- a/app-misc/fastfetch/fastfetch-9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-9999.ebuild
@@ -11,10 +11,7 @@ if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git"
else
- COMMIT="0cb6e40bacfed8c217afc4bd580b7905d6d6893b"
- VERSION_REV="0cb6e40"
- SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${COMMIT}"
+ SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
fi
LICENSE="MIT"
@@ -54,18 +51,5 @@ src_configure() {
-DENABLE_XFCONF=$(usex xfce)
)
- if [[ ${PV} == *9999 ]]; then
- elog "REV=\"r$(git rev-list --count HEAD)\""
- elog "COMMIT=\"$(git rev-parse HEAD)\""
- elog "VERSION_REV=\"$(git rev-parse --short HEAD)\""
- else
- # version comes from git, fake it
- local project_version_major=$(ver_cut 2)
- mycmakeargs+=(
- -DPROJECT_VERSION="r${project_version_major}.${VERSION_REV}"
- -DPROJECT_VERSION_MAJOR="${project_version_major}"
- )
- fi
-
cmake_src_configure
}
diff --git a/app-misc/tealdeer/tealdeer-1.5.0.ebuild b/app-misc/tealdeer/tealdeer-1.5.0.ebuild
index 43664c7dd3..67b46c8555 100644
--- a/app-misc/tealdeer/tealdeer-1.5.0.ebuild
+++ b/app-misc/tealdeer/tealdeer-1.5.0.ebuild
@@ -194,7 +194,7 @@ HOMEPAGE="https://github.com/tldr-pages/tldr
SRC_URI="https://github.com/dbrgn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
$(cargo_crate_uris ${CRATES})"
-LICENSE="MIT"
+LICENSE="Apache-2.0 ISC MIT MPL-2.0"
SLOT="0"
KEYWORDS="~amd64"
diff --git a/app-misc/yaf/Manifest b/app-misc/yaf/Manifest
new file mode 100644
index 0000000000..8354441957
--- /dev/null
+++ b/app-misc/yaf/Manifest
@@ -0,0 +1 @@
+DIST 0.0.3.tar.gz 76604 BLAKE2B f8c18fd59b922ee3a9b023eb240e7bb2b420383ef499124b1fa57887bc891dd4b51e9951af1d739b49ec471ef632592f3cc73c8d99b35d256bbcd885229895a7 SHA512 ece522c106baff8423d74a596f6f175206860661379afabee4f4c54d1c94b2ea0b3bc4845338a7c37080cd1a9d240e9fb77ae4eae02964a34516d096cc60f536
diff --git a/app-misc/yaf/metadata.xml b/app-misc/yaf/metadata.xml
new file mode 100644
index 0000000000..b693af4196
--- /dev/null
+++ b/app-misc/yaf/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ contact@thamognya.com
+ Thamognya Kodi
+ Primary maintainer
+
+
+ Yet Another Fetch is a tool that fetches system information and shows it in a beautiful way for some extra upvotes on r/unixporn.
+ Yet another system fetch that is minimal and customizable.
+
+
+ deepjyoti30/yaf
+
+
diff --git a/app-misc/yaf/yaf-0.0.3.ebuild b/app-misc/yaf/yaf-0.0.3.ebuild
new file mode 100644
index 0000000000..976f8ec68c
--- /dev/null
+++ b/app-misc/yaf/yaf-0.0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Yet another system fetch that is minimal and customizable."
+HOMEPAGE="https://github.com/deepjyoti30/yaf"
+SRC_URI="https://github.com/deepjyoti30/${PN}/archive/refs/tags/${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-lang/go"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_install() {
+ emake DESTDIR="${D}" install
+}
diff --git a/app-shells/fzf-fish/Manifest b/app-shells/fzf-fish/Manifest
index 7d41f8d4ac..b831eb8fd1 100644
--- a/app-shells/fzf-fish/Manifest
+++ b/app-shells/fzf-fish/Manifest
@@ -1,2 +1,2 @@
-DIST fzf-fish-7.3.tar.gz 5495974 BLAKE2B be1d29e01aae34ea010df44af53658ce0a6b8a58bd885c9e5a3e1e1428d36312f9affbf0a9dc6eac7bca3fe3ae26a67ace343a9a3bc5d22055ef7898eb209b85 SHA512 160735d107f2e6feaf9c51699abe425d36562bfb3a11135564c32944650b76c071fc7d5adc717a0d4f66df43c1ddad9a447d085a3063099dab7a6be1f9c395e7
DIST fzf-fish-8.1.tar.gz 6486433 BLAKE2B 09f5d5232b99c2e7fad89e952fb9e2d9291c2ea6d7cae79466c9b011b9df82e3ae1f67c9f4fe29675ba43ba3b6174c0efc4f5d2c37dc191367b29fd597a90611 SHA512 19f1426afcf0591136c0a7af73f5472e90f59efe46ebfa48563ef91f61c71c669f4e8685c3c32c7dd34f87efc4f790e373f783acbe0a110ac24e4de1270f729c
+DIST fzf-fish-8.2.tar.gz 6486432 BLAKE2B ea23434254cc4365acd8a22ff9b157efeae4d34c2911179944108732026c6f7f7cd1e679769d0eea2822bb876a172a263c691a7fc80d14ebf50b4d4c9328914d SHA512 851f111a280a165905e0461ee90825d47d782793a38ba15a9934e0b183ac8d641b3ceeef04c36a9b6b63a675b2355d3a0aa216da2d31b628f262d806867f5abc
diff --git a/app-shells/fzf-fish/fzf-fish-7.3.ebuild b/app-shells/fzf-fish/fzf-fish-8.2.ebuild
similarity index 96%
rename from app-shells/fzf-fish/fzf-fish-7.3.ebuild
rename to app-shells/fzf-fish/fzf-fish-8.2.ebuild
index 7626946542..bbcf57925e 100644
--- a/app-shells/fzf-fish/fzf-fish-7.3.ebuild
+++ b/app-shells/fzf-fish/fzf-fish-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/app-text/OCRmyPDF/Manifest b/app-text/OCRmyPDF/Manifest
index 8296047819..f095dd87bb 100644
--- a/app-text/OCRmyPDF/Manifest
+++ b/app-text/OCRmyPDF/Manifest
@@ -2,3 +2,4 @@ DIST OCRmyPDF-12.0.2.tar.gz 7895055 BLAKE2B 4fab449f9edf8788c74773da0e73adca9dc6
DIST OCRmyPDF-12.6.0.tar.gz 7897200 BLAKE2B e183280e11414a7b2bedd339e971f1c74697d9847771e24592207e5bfe82af184544576c067856cdee9d8409bdca856e8aeb48c8e5b4e32154b69111fba2d775 SHA512 0792fccec7ecdfc93a02c4e29d0c88076c191aed3a2848c4db5d6b18ad4837a24e325dfc961aaa7c68407de7dd471e45e7b6389d6cf8f9465fe3892038696e97
DIST OCRmyPDF-13.2.0.tar.gz 7885396 BLAKE2B 0eea864d056d2238f7ea244a7fc9b6a548409caf9264349be2e0d5be5dea7ddc474f5e95ce92ad926992e42b27cdedf77005d124782374be5b6606a01338aa69 SHA512 476924ad440042fb75a9cd56fb90a93b636fc805393087952d704602f92bd0d33ed5701b45ed037b312874800857da784b367eaea3858dc0b38e4b1d49417e52
DIST OCRmyPDF-13.4.0.tar.gz 7889193 BLAKE2B 42923508524df38ed62f1a0c4d6b308dac8e00a44b428dee2dd5494915778910e434d5bf8a5957fe48685c0263b3151044794b14cbc209e4a3909da1e2411fe3 SHA512 1b581ba469e0f625481c551d9b53c553745a02c748bd2e16bd7a589f4eacfd3f21ba5d435b52286694220627de0d3d7202513191ee5e1e04b7bdd392d0abc5cd
+DIST OCRmyPDF-13.4.1.tar.gz 7888750 BLAKE2B 178954136f797f166a37db602b302cf50752010504b934b6633b0b2f52f2fb57e88995b3ffbb534990857698fa63c9966a92babaf9bcb7e3833e4f6f3d325e15 SHA512 c65dd1d6dc957fbfff7926241c4b887146d3efbf1181dd9bc43fca464ebc07e1507425e90af72311e89fe1ed75ee1e293600d6f7f538f7a5ee8dd8998173c972
diff --git a/app-text/OCRmyPDF/OCRmyPDF-13.4.1.ebuild b/app-text/OCRmyPDF/OCRmyPDF-13.4.1.ebuild
new file mode 100644
index 0000000000..ec16fef121
--- /dev/null
+++ b/app-text/OCRmyPDF/OCRmyPDF-13.4.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="OCRmyPDF adds an OCR text layer to scanned PDF files"
+HOMEPAGE="https://github.com/jbarlow83/OCRmyPDF"
+SRC_URI="https://github.com/jbarlow83/OCRmyPDF/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# This uses *a lot* of RAM, I have 32gb and these tests tried to use it all
+RESTRICT="test"
+IUSE="jbig2enc"
+
+RDEPEND="
+ app-text/ghostscript-gpl
+ app-text/tesseract
+ app-text/unpaper
+ dev-python/cffi[${PYTHON_USEDEP}]
+ dev-python/coloredlogs[${PYTHON_USEDEP}]
+ >=dev-python/pdfminer-six-20191110[${PYTHON_USEDEP}]
+ <=dev-python/pdfminer-six-20201018[${PYTHON_USEDEP}]
+ dev-python/pikepdf[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pluggy[${PYTHON_USEDEP}]
+ dev-python/reportlab[${PYTHON_USEDEP}]
+ dev-python/tqdm[${PYTHON_USEDEP}]
+ media-gfx/img2pdf[${PYTHON_USEDEP}]
+ media-gfx/pngquant
+ media-libs/leptonica
+ virtual/python-cffi[${PYTHON_USEDEP}]
+ jbig2enc? ( media-libs/jbig2enc )
+"
+DEPEND="
+ test? (
+ dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ ~dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs --no-autodoc
+
+src_install() {
+ distutils-r1_src_install
+ newbashcomp misc/completion/ocrmypdf.bash "${PN,,}"
+ insinto /usr/share/fish/vendor_completions.d
+ doins misc/completion/ocrmypdf.fish
+}
diff --git a/dev-libs/cglm/Manifest b/dev-libs/cglm/Manifest
index 78b0abb0ff..da7d3c1b89 100644
--- a/dev-libs/cglm/Manifest
+++ b/dev-libs/cglm/Manifest
@@ -1,2 +1,2 @@
-DIST cglm-0.8.3.tar.gz 246664 BLAKE2B 70e89d8926b3470c32ef847d2076fb1d8cbce0b0aa726f84c0bcf0207419b3ee7d70f1bfb40b1598827cd74c1b3482d86d0bb4cb3c77c3667ae341829580cca6 SHA512 71062814637e2523b2632980384fa58a639cdc1bbe8b647e7826fe334a53cd880bd5b29baac7d5eaff2bb009a97830c76b239e7273af46908ad7ab52cc8b8173
DIST cglm-0.8.4.tar.gz 620905 BLAKE2B 9891172bd97c714f81ec931daa82c62d7f2a91008a44b8a49a24cd899bd15b7a5d21c2e7ae322d670336233682435f0f28eab2630891d153b8df5c562478e610 SHA512 507875119eac77cb3f60fe2353cd92b39f50605fdbf68f56d27b7062b7ec6b1cadd868f70c059ebde17adaf4a9167e5082c0151f1af5b0a5e751864a1eca1fa8
+DIST cglm-0.8.5.tar.gz 621734 BLAKE2B 7cde681529a1e43444a431793bbeb09122c636b50650489c44b98f03a01477c5192e2109e6777d5a9c4254dbe6fd91371011762c77f76011a245dbbddf24f359 SHA512 a8f6df415dc482a9b16bb7ff44aba77c32e7297b48d5e7b0fb5b2e0d92fc80cad8e436d0c83fdd7cc0836ba451137d72af2f0f823ce9698000bf257b3019b7c5
diff --git a/dev-libs/cglm/cglm-0.8.3.ebuild b/dev-libs/cglm/cglm-0.8.5.ebuild
similarity index 89%
rename from dev-libs/cglm/cglm-0.8.3.ebuild
rename to dev-libs/cglm/cglm-0.8.5.ebuild
index 92e9105c7c..4fb50580ed 100644
--- a/dev-libs/cglm/cglm-0.8.3.ebuild
+++ b/dev-libs/cglm/cglm-0.8.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DOCS_BUILDER="sphinx"
DOCS_AUTODOC=0
DOCS_DIR="${S}/docs/source"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
inherit python-any-r1
inherit docs meson
diff --git a/dev-libs/cglm/cglm-9999.ebuild b/dev-libs/cglm/cglm-9999.ebuild
index 92e9105c7c..4fb50580ed 100644
--- a/dev-libs/cglm/cglm-9999.ebuild
+++ b/dev-libs/cglm/cglm-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DOCS_BUILDER="sphinx"
DOCS_AUTODOC=0
DOCS_DIR="${S}/docs/source"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
inherit python-any-r1
inherit docs meson
diff --git a/dev-python/confluent-kafka/confluent-kafka-1.8.2.ebuild b/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild
similarity index 92%
rename from dev-python/confluent-kafka/confluent-kafka-1.8.2.ebuild
rename to dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild
index 29c388bfc6..3c5073bc71 100644
--- a/dev-python/confluent-kafka/confluent-kafka-1.8.2.ebuild
+++ b/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild
@@ -35,6 +35,11 @@ BDEPEND="
distutils_enable_tests pytest
+python_install_all() {
+ distutils-r1_python_install_all
+ rm "${ED}/usr/LICENSE.txt" || die
+}
+
pkg_postinst() {
optfeature "avro support" dev-python/fastavro dev-python/avro dev-python/requests
optfeature "json support" dev-python/jsonschema dev-python/pyrsistent dev-python/requests
diff --git a/dev-python/cursive/cursive-0.2.2-r2.ebuild b/dev-python/cursive/cursive-0.2.2-r2.ebuild
index 7ad5ec635f..44af571841 100644
--- a/dev-python/cursive/cursive-0.2.2-r2.ebuild
+++ b/dev-python/cursive/cursive-0.2.2-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
@@ -12,7 +12,7 @@ HOMEPAGE="
https://github.com/openstack/cursive
https://opendev.org/x/cursive
https://launchpad.net/cursive
- https://pypi.org/project/cursive
+ https://pypi.org/project/cursive/
"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@@ -29,8 +29,8 @@ RDEPEND="
>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
test? (
>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/dropbox-sdk-python/Manifest b/dev-python/dropbox-sdk-python/Manifest
index 2c59e52210..b21c57ee43 100644
--- a/dev-python/dropbox-sdk-python/Manifest
+++ b/dev-python/dropbox-sdk-python/Manifest
@@ -1 +1 @@
-DIST dropbox-sdk-python-11.27.0.tar.gz 1155164 BLAKE2B bb5fe7f077691f6d6bda188dcffa711d8981b97bd64dc28452bef0282cac17802569e263b369fbe82ee77705a87033be034a0ba6728a37d721c59204fc119423 SHA512 14e9aee9e582e3548404843a303d00b58122f0b9a538c5725d23181f3e4cbc87ba2a250c89f76e911cdc563fbe07208ecc2b0a7b1ed50d80f74d615cdc17e251
+DIST dropbox-sdk-python-11.28.0.tar.gz 1155409 BLAKE2B b4b664b0f3c0ebaef23a4878d5331293f015b23fd8c5ed4f691dd309a98a21b82f67bc4f7cd0eced446d055808d17d6871088b1126499e340f34b15e7d6a013f SHA512 9776a75962d7370ea38b50d05801b662884086ccf865288f00cb0941143f41f8d9ab0947676cd403acdc92cd08fce519bf9f1471da9ccc64f0dd7278487be174
diff --git a/dev-python/dropbox-sdk-python/dropbox-sdk-python-11.27.0.ebuild b/dev-python/dropbox-sdk-python/dropbox-sdk-python-11.28.0.ebuild
similarity index 100%
rename from dev-python/dropbox-sdk-python/dropbox-sdk-python-11.27.0.ebuild
rename to dev-python/dropbox-sdk-python/dropbox-sdk-python-11.28.0.ebuild
diff --git a/dev-python/glance_store/glance_store-3.0.0.ebuild b/dev-python/glance_store/glance_store-3.0.0-r1.ebuild
similarity index 95%
rename from dev-python/glance_store/glance_store-3.0.0.ebuild
rename to dev-python/glance_store/glance_store-3.0.0-r1.ebuild
index af3dc14c94..ab7242f742 100644
--- a/dev-python/glance_store/glance_store-3.0.0.ebuild
+++ b/dev-python/glance_store/glance_store-3.0.0-r1.ebuild
@@ -66,3 +66,8 @@ REQUIRED_USE="
"
distutils_enable_tests pytest
+
+python_install_all() {
+ distutils-r1_python_install_all
+ mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/microversion-parse/microversion-parse-1.0.1.ebuild b/dev-python/microversion-parse/microversion-parse-1.0.1-r1.ebuild
similarity index 54%
rename from dev-python/microversion-parse/microversion-parse-1.0.1.ebuild
rename to dev-python/microversion-parse/microversion-parse-1.0.1-r1.ebuild
index 492d564158..de7b0df240 100644
--- a/dev-python/microversion-parse/microversion-parse-1.0.1.ebuild
+++ b/dev-python/microversion-parse/microversion-parse-1.0.1-r1.ebuild
@@ -1,22 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_8 )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
DESCRIPTION="A simple parser for OpenStack microversion headers"
-HOMEPAGE="https://github.com/openstack/microversion-parse"
+HOMEPAGE="
+ https://opendev.org/openstack/microversion-parse
+ https://github.com/openstack/microversion-parse
+"
SRC_URI="mirror://pypi/${PN:0:1}/microversion_parse/microversion_parse-${PV}.tar.gz"
S="${WORKDIR}/microversion_parse-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64"
DEPEND="
>=dev-python/pbr-5.0[${PYTHON_USEDEP}]
>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
"
RDEPEND="${DEPEND}"
+BDEPEND="
+ test? (
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/gabbi-1.35.0[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/os-resource-classes/os-resource-classes-1.1.0.ebuild b/dev-python/os-resource-classes/os-resource-classes-1.1.0.ebuild
index bf1cbef85d..4440bfa6f4 100644
--- a/dev-python/os-resource-classes/os-resource-classes-1.1.0.ebuild
+++ b/dev-python/os-resource-classes/os-resource-classes-1.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
@@ -11,7 +11,7 @@ DESCRIPTION="A list of standardized resource classes for OpenStack"
HOMEPAGE="
https://github.com/openstack/os-resource-classes
https://opendev.org/openstack/os-resource-classes
- https://pypi.org/project/os-resource-classes
+ https://pypi.org/project/os-resource-classes/
"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/oslo-reports/oslo-reports-2.3.0.ebuild b/dev-python/oslo-reports/oslo-reports-2.3.0.ebuild
index 6b19ba0b4f..0ab8b858a8 100644
--- a/dev-python/oslo-reports/oslo-reports-2.3.0.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-2.3.0.ebuild
@@ -3,14 +3,14 @@
EAPI=8
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
DESCRIPTION="generified reports for openstack"
HOMEPAGE="
https://opendev.org/openstack/oslo.reports
- https://pypi.org/project/oslo.reports
+ https://pypi.org/project/oslo.reports/
https://launchpad.net/oslo.reports
"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
@@ -28,8 +28,8 @@ RDEPEND="
>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
test? (
>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index b185ce7309..8011b74d7e 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1 +1 @@
-DIST oslo.service-2.6.0.tar.gz 84317 BLAKE2B 9f0d4b541a7bf30e8bc4c29acf17ee2e8a0f0f09b80ed65972a5e914cb51ffd181481288f5693da9293f508ad9a299e050c1cd9e22ec203572d99aa5ce8b6a7b SHA512 102690b122822bafaf7614d97c753475665befc2153c6af0348e6766fdbb9e96bcb1dcda0221fa925031691a53a9f3c9bf9102a380c2f561c057241920192e12
+DIST oslo.service-2.8.0.tar.gz 84816 BLAKE2B cac1f99b27fe84008c64d2e211901a6b6d948bc92320b72dde04e54db4a61e9f52a5fc80613d23d045b2706d15a21ba8965b41afdbcdf6f7328a42a2361f78e9 SHA512 fcaf1cacbfbb7b804e4abb0a1cddb59d4df2b5c790186300f8efa540ea3a18bd0c87bb53000c38db875d4f8688d10daf1ee6f58958e71332f40ef4cf64f22ea3
diff --git a/dev-python/oslo-service/oslo-service-2.6.0.ebuild b/dev-python/oslo-service/oslo-service-2.8.0.ebuild
similarity index 99%
rename from dev-python/oslo-service/oslo-service-2.6.0.ebuild
rename to dev-python/oslo-service/oslo-service-2.8.0.ebuild
index 43defa22c7..374a3685ab 100644
--- a/dev-python/oslo-service/oslo-service-2.6.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-2.8.0.ebuild
@@ -40,6 +40,8 @@ RDEPEND="
DEPEND="
${RDEPEND}
>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
test? (
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.4.0.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.4.0.ebuild
index fb8787c978..59bacc23f6 100644
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.4.0.ebuild
+++ b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.4.0.ebuild
@@ -5,14 +5,14 @@ EAPI=8
DISTUTILS_USE_SETUPTOOLS=bdepend
MY_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
DESCRIPTION="Common code for writing OpenStack upgrade checks"
HOMEPAGE="
https://opendev.org/openstack/oslo.upgradecheck
- https://pypi.org/project/oslo.upgradecheck
+ https://pypi.org/project/oslo.upgradecheck/
"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MY_PN}-${PV}"
@@ -31,6 +31,8 @@ RDEPEND="
DEPEND="
${RDEPEND}
>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
test? (
>=dev-python/oslotest-3.5.0[${PYTHON_USEDEP}]
>=dev-python/oslo-serialization-2.21.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pypandoc/files/pypandoc-1.7.4-dont-install-examples.patch b/dev-python/pypandoc/files/pypandoc-1.7.4-dont-install-examples.patch
new file mode 100644
index 0000000000..2e84756c8f
--- /dev/null
+++ b/dev-python/pypandoc/files/pypandoc-1.7.4-dont-install-examples.patch
@@ -0,0 +1,23 @@
+From 44fa67fc92993301ec3e446d342a74c49d58334c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Anna=20=E2=80=9CCyberTailor=E2=80=9D?=
+Date: Fri, 18 Mar 2022 08:41:08 +0500
+Subject: [PATCH] Don't install examples
+
+See Gentoo Bugzilla: https://bugs.gentoo.org/835475
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -32,14 +32,6 @@ packages = [
+ { include = "pypandoc" },
+ ]
+
+-include = [
+-"examples/*",
+-"LICENSE",
+-"README.md",
+-"tests.py",
+-"filter_test.md",
+-]
+-
+ [tool.poetry.dependencies]
+ python = "^2.7 || ^3.6"
+
diff --git a/dev-python/pypandoc/pypandoc-1.7.4.ebuild b/dev-python/pypandoc/pypandoc-1.7.4.ebuild
index 4e5cda380b..e58e3e7bda 100644
--- a/dev-python/pypandoc/pypandoc-1.7.4.ebuild
+++ b/dev-python/pypandoc/pypandoc-1.7.4.ebuild
@@ -32,6 +32,7 @@ DEPEND="
dev-python/urllib3[${PYTHON_USEDEP}]
"
+PATCHES=( "${FILESDIR}/${P}-dont-install-examples.patch" )
PROPERTIES="test_network"
RESTRICT="test"
diff --git a/dev-python/python-mistralclient/python-mistralclient-4.4.0.ebuild b/dev-python/python-mistralclient/python-mistralclient-4.4.0.ebuild
index 82baf51461..d5fcded1bc 100644
--- a/dev-python/python-mistralclient/python-mistralclient-4.4.0.ebuild
+++ b/dev-python/python-mistralclient/python-mistralclient-4.4.0.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+EPYTEST_IGNORE=( mistralclient/tests/functional )
PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
diff --git a/dev-python/tchannel/Manifest b/dev-python/tchannel/Manifest
index 57cae519f4..cff63b8da0 100644
--- a/dev-python/tchannel/Manifest
+++ b/dev-python/tchannel/Manifest
@@ -1 +1 @@
-DIST tchannel-2.1.0.tar.gz 89466 BLAKE2B cbda9700d0bb547e972ebd295706a82b02e1a6472edeca9f9b494bb10b8604bfd5f8c173bcb51a75a848e36bb0984407aa6a4fd252e6905c47946bfd0e0f38d7 SHA512 cf9bd0f4d4390c58e80dc784ea304114bebfa6ee00f4dd34daaafe63ba00c9c9c4ac14bc2766df5e5087357aefadb1b716b3a8d9f6a940484fe7b650caaaabef
+DIST tchannel-2.1.0-gh.tar.gz 199413 BLAKE2B 20c25526440e9378acfba1dd9c05aaa5a5300bb19ec2c78c1997bfc7ce6be740bca7ef6d4fd49048c42e57f649f33b8c124955dc347bba81501fdf778ce4177e SHA512 651159cdbb83f59039d1c51ad5d5af7c0bf20e8a8fbb6c83c76bdc78cda809bea883d65947c5171c6dd2992ea499d543c4a2dad1102c6a7a4d631e24f005453c
diff --git a/dev-python/tchannel/metadata.xml b/dev-python/tchannel/metadata.xml
index 629511b0b5..57a5d0973d 100644
--- a/dev-python/tchannel/metadata.xml
+++ b/dev-python/tchannel/metadata.xml
@@ -8,6 +8,6 @@
https://github.com/uber/tchannel/issues
tchannel
- uber/tchannel
+ uber/tchannel-python
diff --git a/dev-python/tchannel/tchannel-2.1.0.ebuild b/dev-python/tchannel/tchannel-2.1.0.ebuild
index d427ecb9b2..64e477dcec 100644
--- a/dev-python/tchannel/tchannel-2.1.0.ebuild
+++ b/dev-python/tchannel/tchannel-2.1.0.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+MYPN="${PN}-python"
PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
DESCRIPTION="Network multiplexing and framing protocol for RPC"
-HOMEPAGE="https://github.com/uber/tchannel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/uber/tchannel-python"
+SRC_URI="https://github.com/uber/${MYPN}/archive/refs/tags/${PV}.tar.gz -> ${P}-gh.tar.gz"
+S="${WORKDIR}/${MYPN}-${PV}"
SLOT="0"
LICENSE="MIT"
@@ -23,8 +25,8 @@ RDEPEND="
>=dev-python/threadloop-1[${PYTHON_USEDEP}]
>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
test? (
>=dev-python/hypothesis-1.14[${PYTHON_USEDEP}]
dev-python/ipdb[${PYTHON_USEDEP}]
diff --git a/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild b/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1-r1.ebuild
similarity index 51%
rename from dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
rename to dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1-r1.ebuild
index 44e242c99f..235ba17c26 100644
--- a/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
+++ b/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1-r1.ebuild
@@ -1,27 +1,39 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_8 )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
DESCRIPTION="a development sdk for managing z/VM"
-HOMEPAGE="https://github.com/mfcloud/python-zvm-sdk"
+HOMEPAGE="
+ https://github.com/mfcloud/python-zvm-sdk
+ https://pypi.org/project/zVMCloudConnector/
+"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
+KEYWORDS="~amd64"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
>=dev-python/jsonschema-2.3.0[${PYTHON_USEDEP}]
>=dev-python/netaddr-0.7.5[${PYTHON_USEDEP}]
>=dev-python/pyjwt-1.0.1[${PYTHON_USEDEP}]
>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
>=dev-python/routes-2.2.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+ >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ test? (
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-1.6.2[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-util/annobin/Manifest b/dev-util/annobin/Manifest
new file mode 100644
index 0000000000..65bf6bb5a2
--- /dev/null
+++ b/dev-util/annobin/Manifest
@@ -0,0 +1 @@
+DIST annobin-10.58.tar.xz 846744 BLAKE2B 86a7beb46d7fce153f44d2a42e538ff99d40de239655f001580e34c8e0f40fe4309b908681047d012dc315977a93889f9e4e05f00a97145c5c04663d5f239fb8 SHA512 7d40fe9ddbee788db3331ec138aa588936d726ec50e0286b23be3792f20c2fc111c635b70598e0d8b6ba24a92de514fc637d5cea6b9d7781de781fbf244dfbd8
diff --git a/dev-util/annobin/annobin-10.58.ebuild b/dev-util/annobin/annobin-10.58.ebuild
new file mode 100644
index 0000000000..0b10a8cacc
--- /dev/null
+++ b/dev-util/annobin/annobin-10.58.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools llvm toolchain-funcs
+
+DESCRIPTION="Binary annotation compiler plugin and tools"
+HOMEPAGE="https://nickc.fedorapeople.org"
+SRC_URI="https://nickc.fedorapeople.org/${P}.tar.xz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="clang doc llvm test"
+
+RDEPEND="
+ app-arch/rpm
+ dev-libs/elfutils
+ sys-libs/binutils-libs
+
+ clang? (
+
+ #include
+-#include
++#include
+
+ #define PACKAGE "annocheck"
+
diff --git a/dev-util/annobin/files/annobin-10.58-fix-bashism.patch b/dev-util/annobin/files/annobin-10.58-fix-bashism.patch
new file mode 100644
index 0000000000..dd04172461
--- /dev/null
+++ b/dev-util/annobin/files/annobin-10.58-fix-bashism.patch
@@ -0,0 +1,28 @@
+--- a/config/debuginfod.m4
++++ b/config/debuginfod.m4
+@@ -34,5 +34,5 @@
+ fi
+ fi
+ AM_CONDITIONAL([HAVE_DEBUGINFOD],
+- [test x"$have_debuginfod_lib" == xyes -a x"$have_debuginfod_h" == xyes])
++ [test x"$have_debuginfod_lib" = xyes && x"$have_debuginfod_h" = xyes])
+ ])
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,13 +149,13 @@
+ AM_CONDITIONAL([COND_DOCS], [test "$with_docs" != no])
+ AM_CONDITIONAL([COND_TESTS], [test "$with_tests" != no])
+ AM_CONDITIONAL([COND_ANNOCHECK], [test "$with_annocheck" != no])
+-AM_CONDITIONAL([COND_CLANG], [test "$with_clang_plugin" == yes])
++AM_CONDITIONAL([COND_CLANG], [test "$with_clang_plugin" = yes])
+ AM_CONDITIONAL([COND_GCC_PLUGIN], [test "$with_gcc_plugin" != no])
+-AM_CONDITIONAL([COND_LLVM], [test "$with_llvm_plugin" == yes])
++AM_CONDITIONAL([COND_LLVM], [test "$with_llvm_plugin" = yes])
+
+ AC_CONFIG_FILES(Makefile)
+
+-if test "$with_annocheck" != no -o test "$with_gcc_plugin" != no; then
++if test "$with_annocheck" != no || test "$with_gcc_plugin" != no; then
+ AC_CONFIG_HEADERS(gcc-plugin/config.h)
+ fi
+ if test "$with_docs" != no; then
diff --git a/dev-util/annobin/metadata.xml b/dev-util/annobin/metadata.xml
new file mode 100644
index 0000000000..f04b58c065
--- /dev/null
+++ b/dev-util/annobin/metadata.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ co-maintainers welcome
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
+ A plugin for GCC that records extra information in the files that it compiles.
+ This information can be used to analyze the files, and provide the loader
+ with extra information about the requirements of the loaded file.
+
+
+
diff --git a/dev-util/blueprint-compiler/Manifest b/dev-util/blueprint-compiler/Manifest
index c0379ca60c..0333a4e1ae 100644
--- a/dev-util/blueprint-compiler/Manifest
+++ b/dev-util/blueprint-compiler/Manifest
@@ -1 +1,2 @@
DIST blueprint-compiler-0.1.0_pre20220219.tar.gz 51398 BLAKE2B 282fa95486d0fd18d8fc41682f29a4ecd9b94b4f4b617697809630d66d7fdcaebd8f1830bc0675f1f5917787c80d0d15f10a72230378390fd32642fc9473ccc2 SHA512 ca4b0f654bb212750f5381fa6d95dc66e0fbc494962bb60d370ec919bae239f657bcc3873522b3c903eb2441e684d83d794835df249b8107e40ac5429a53f067
+DIST blueprint-compiler-0.1.0_pre20220319.tar.gz 52091 BLAKE2B 84184cada20257dd2717bd5ecd4f2493deca67c63a6005417310f1d7dd9e049398d341a037e71ca08d87417af7627d2bdc5dfd56f2e8ca73f0076eec7bcd671d SHA512 6acfc1b9000e99ca270ee940c47824e8683a3433d7846548b488563b1ce924b8a893cba475bc3b28b971bb3d7a6634c8539dfb34fa12e0bc7ce81c1aed959452
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-0.1.0_pre20220319.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-0.1.0_pre20220319.ebuild
new file mode 100644
index 0000000000..871c0eae10
--- /dev/null
+++ b/dev-util/blueprint-compiler/blueprint-compiler-0.1.0_pre20220319.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit meson python-r1
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler.git"
+else
+ # Upstream has not started to tag releases yet, so each keyworded (normal)
+ # ebuild is to be based on a Git commit snapshot at this moment.
+ # Live ebuild: Might be intentionally left blank
+ # Normal ebuild: Fill in commit SHA-1 object name to this variable's value
+ GIT_COMMIT="3f37380c25c66d81166d2871ffa1c7bc16c6af1d"
+ KEYWORDS="~amd64"
+
+ SRC_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/${GIT_COMMIT}/blueprint-compiler-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+fi
+
+DESCRIPTION="Compiler for Blueprint, a markup language for GTK user interfaces"
+HOMEPAGE="https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/furo[${PYTHON_USEDEP}]
+ )
+"
+
+DEPEND="
+ test? (
+ gui-libs/gtk:4[introspection]
+ )
+"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use doc docs)
+ )
+ python_foreach_impl meson_src_configure
+}
+
+src_compile() {
+ python_foreach_impl meson_src_compile
+}
+
+src_test() {
+ python_foreach_impl meson_src_test
+}
+
+src_install() {
+ my_src_install() {
+ local exe="${ED}/usr/bin/${PN}"
+
+ # Meson installs a Python script at ${ED}/usr/bin/${PN}; on
+ # Gentoo, the script should go into ${ED}/usr/lib/python-exec,
+ # and ${ED}/usr/bin/${PN} should be a symbolic link to
+ # ${ED}/usr/lib/python-exec/python-exec2.
+ #
+ # When multiple PYTHON_TARGETS are enabled, then after the
+ # package has been installed for one Python implementation,
+ # Meson will follow the ${ED}/usr/bin/${PN} symbolic link and
+ # install the script at ${ED}/usr/lib/python-exec/python-exec2
+ # for the remaining implementations, leading to file collision.
+ if [[ -L "${exe}" ]]; then
+ rm -v "${exe}" || die "Failed to remove symbolic link ${exe}"
+ fi
+
+ meson_src_install
+ python_doscript "${exe}"
+ python_optimize
+
+ # Install Sphinx-generated documentation only once
+ # since the documentation is supposed to be identical
+ # between different Python implementations
+ use doc && HTML_DOCS=( "${BUILD_DIR}/docs"/* )
+ }
+
+ python_foreach_impl my_src_install
+ einstalldocs
+}
diff --git a/dev-util/devscripts/Manifest b/dev-util/devscripts/Manifest
index 457d5db0bd..8bfe80aaf8 100644
--- a/dev-util/devscripts/Manifest
+++ b/dev-util/devscripts/Manifest
@@ -1,2 +1,2 @@
-DIST devscripts_2.21.2.tar.xz 980516 BLAKE2B 907f2f4e258a8396ad0a28eead1e2058b8e19be205f024ea80c0fbd9621d5ca4299844fe83d66cac7f653a917705d9c36eddb9d51454a7fbb9d7e2b52bc994ff SHA512 a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01
DIST devscripts_2.21.3.tar.xz 980408 BLAKE2B 99207ed58c0fdc592ce491ddda79a2ecb22a8975ef70828749bf58dff9cc94f63779025b3f0326d0c2c49ca768a7e651b1f9e7843e6da298c25340916334de25 SHA512 84122dd36de7961c26044ac8b8eeee2c0aae1dd4a811b5f0d522fe43488dad2872aa044ad1f38a78e49f9d13d8c19eb583a8082d636caeebb188f1dd4f1caec7
+DIST devscripts_2.22.1.tar.xz 989556 BLAKE2B 2a2e3ca9757c710e181e807f0369c137f21070d86b4c51d8b5132ca4add33677edbd26e04a2faae93e9e4586080286888880ce450119579aa40ad205c8e5d857 SHA512 260603e1a655035c5aca3c9734db1bc6aa7e9aa017ece7e9158c57e06a1ee548922ec2defdd9dcb4560743d78aef08d30695b1bc833bd4d77fe1c7497d157c45
diff --git a/dev-util/devscripts/devscripts-2.21.2.ebuild b/dev-util/devscripts/devscripts-2.22.1.ebuild
similarity index 63%
rename from dev-util/devscripts/devscripts-2.21.2.ebuild
rename to dev-util/devscripts/devscripts-2.22.1.ebuild
index cc89922643..5280277000 100644
--- a/dev-util/devscripts/devscripts-2.21.2.ebuild
+++ b/dev-util/devscripts/devscripts-2.22.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_9 )
DISTUTILS_OPTIONAL=true
+PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
+inherit bash-completion-r1 distutils-r1
DESCRIPTION="Scripts to make the life of a Debian Package maintainer easier"
HOMEPAGE="https://salsa.debian.org/debian/devscripts"
@@ -16,8 +16,6 @@ LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
CDEPEND="
dev-lang/perl:=
@@ -31,7 +29,9 @@ CDEPEND="
dev-util/distro-info
python? ( ${PYTHON_DEPS} )
"
-DEPEND="${CDEPEND}
+DEPEND="
+ ${CDEPEND}
+ app-text/docbook-xsl-stylesheets
test? (
app-arch/zip
dev-perl/Git-Wrapper
@@ -48,7 +48,8 @@ DEPEND="${CDEPEND}
virtual/perl-DB_File
)
"
-RDEPEND="${CDEPEND}
+RDEPEND="
+ ${CDEPEND}
app-arch/dpkg
app-crypt/gnupg
app-text/wdiff
@@ -58,19 +59,24 @@ RDEPEND="${CDEPEND}
"
BDEPEND="virtual/pkgconfig"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( python )
+"
+RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/distutils-r1.patch"
"${FILESDIR}/Remove-failing-tests.patch"
"${FILESDIR}/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch"
)
-DISTUTILS_S="${S}"/scripts
+DISTUTILS_S="${S}/scripts"
src_prepare() {
default
# Avoid file collision with app-shells/bash-completion
- rm "${DISTUTILS_S}"/bts.bash_completion || die
+ rm "${DISTUTILS_S}/bts.bash_completion" || die
}
src_configure() {
@@ -78,7 +84,7 @@ src_configure() {
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
- distutils-r1_src_configure
+ python_foreach_impl distutils-r1_src_configure
popd > /dev/null || die
fi
}
@@ -88,7 +94,7 @@ src_compile() {
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
- distutils-r1_src_compile
+ python_foreach_impl distutils-r1_src_compile
popd > /dev/null || die
fi
}
@@ -99,22 +105,21 @@ src_install() {
if use python; then
pushd "${DISTUTILS_S}" > /dev/null || die
- distutils-r1_src_install
+ python_foreach_impl distutils-r1_src_install
popd > /dev/null || die
fi
- mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+ mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
- # "incorrect name, no completions for command defined"
- rm "${ED}"/usr/share/bash-completion/completions/{debcheckout,pkgnames} || die
+ rm "${ED}/usr/share/bash-completion/completions/debcheckout" || die
+ mv "${ED}"/usr/share/bash-completion/completions/{pkgnames,debsnap} || die
+ bashcomp_alias debsnap wnpp-alert wnpp-check mk-build-deps rmadison mass-bug dd-list build-rdeps who-uploads transition-check getbuildlog grep-excuses rc-alert whodepends dget pts-subscribe pts-unsubscribe
}
src_test() {
default
- if use python; then
- pushd "${DISTUTILS_S}" > /dev/null || die
- distutils-r1_src_test
- popd > /dev/null || die
- fi
+ pushd "${DISTUTILS_S}" > /dev/null || die
+ python_foreach_impl distutils-r1_src_test
+ popd > /dev/null || die
}
diff --git a/dev-util/rpmlint/Manifest b/dev-util/rpmlint/Manifest
index 9a3ca3099f..cf7b07fdff 100644
--- a/dev-util/rpmlint/Manifest
+++ b/dev-util/rpmlint/Manifest
@@ -1,2 +1,2 @@
-DIST rpmlint-2.0.0.tar.gz 5670600 BLAKE2B 31ce8c8c630c967204d9fc5768a6689656e941d0498b53274e4a147ebd15eeafeed0fe14a0df258201c105a03216a6b32c0600008605778ea2c8306ec5d76e65 SHA512 f8f65ec90306bf59c0e31a8a3434477c38b8fb08aa2798b805afd57a506b00110797d514431e69dcb8dde5a54afad8606d8e1c973b8584c47cebed1420d6d61c
DIST rpmlint-2.1.0.tar.gz 5670384 BLAKE2B cb7947956324a0c9e10d2bdc1e5d9d2354c37b748c97c3bbe0426104898e7ddc96bcad84fe7f03952688256c0f20da43b19ab98969056063f647a60851c841a7 SHA512 75df896259b5c340c528357309b2e5e1ce574b7e5e55dff573a1a7808faa3617da799df37e7e65064952a16549225beb16c1e12ba22f2fe4976a69696ed66f46
+DIST rpmlint-2.2.0.tar.gz 5736449 BLAKE2B 765ca9b4e3f594b85e70fd85f0e7207c22e1d3b9503361afd3af095101f55aeed84ecb204bf0f8a64b8df4daf9e9fb94f536db80201a3078ec93fa4d38ef3909 SHA512 5e16747231e3f815b405db194e5d1768d19a2b378db674f57b1ebcba17d0f3320626e4c2b648e79cc180621444439c2c84fd176cd1e0fd7b6585d50492a7f272
diff --git a/dev-util/rpmlint/rpmlint-2.0.0.ebuild b/dev-util/rpmlint/rpmlint-2.2.0.ebuild
similarity index 76%
rename from dev-util/rpmlint/rpmlint-2.0.0.ebuild
rename to dev-util/rpmlint/rpmlint-2.2.0.ebuild
index 60fc536ec7..bbdf5ec061 100644
--- a/dev-util/rpmlint/rpmlint-2.0.0.ebuild
+++ b/dev-util/rpmlint/rpmlint-2.2.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
@@ -56,12 +57,3 @@ DEPEND="
PATCHES=( "${FILESDIR}/no-coverage.patch" )
distutils_enable_tests pytest
-
-python_test() {
- pytest -vv \
- --deselect test/test_speccheck.py::test_check_invalid_url[spec/SpecCheck2] \
- --deselect test/test_lint.py::test_run_installed_and_no_files \
- --deselect test/test_lint.py::test_run_installed[packages0] \
- --deselect test/test_ldd_parser.py::test_dependencies \
- || die
-}
diff --git a/dev-vcs/mergestat/mergestat-0.5.4.ebuild b/dev-vcs/mergestat/mergestat-0.5.4.ebuild
index 0afbba284d..8c33869901 100644
--- a/dev-vcs/mergestat/mergestat-0.5.4.ebuild
+++ b/dev-vcs/mergestat/mergestat-0.5.4.ebuild
@@ -1025,6 +1025,8 @@ RDEPEND="
DEPEND="${RDEPEND}"
DOCS=( README.md )
+RESTRICT="test"
+PROPERTIES="test_network"
src_prepare() {
# remove bundled sqlite
@@ -1034,7 +1036,7 @@ src_prepare() {
src_compile() {
export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CFLAGS="${CFLAGS} -DUSE_LIBSQLITE"
+ export CGO_CFLAGS="${CFLAGS} -DUSE_LIBSQLITE3"
export CGO_LDFLAGS="${LDFLAGS} -Wl,--unresolved-symbols=ignore-in-object-files -lsqlite3"
local tags="sqlite_vtable,vtable,sqlite_json1,system_libgit2"
go build \
@@ -1055,3 +1057,7 @@ src_install() {
dobin mergestat
dolib.so libmergestat.so
}
+
+src_test() {
+ go test -x -v -tags="sqlite_vtable,vtable,sqlite_json1,system_libgit2,static" ./... || die
+}
diff --git a/gnome-extra/extension-manager/Manifest b/gnome-extra/extension-manager/Manifest
index 3534858c56..bfb1562de7 100644
--- a/gnome-extra/extension-manager/Manifest
+++ b/gnome-extra/extension-manager/Manifest
@@ -1,2 +1 @@
-DIST extension-manager-0.2.2.tar.gz 1381383 BLAKE2B bd3a945761da27aa5e9c701cc78b8b0d5404a94f18f988281c152223e470752417a20c7f6b86409392ada6bfce2ea4615d32ed38f4071df2f4dc9e102d693a4d SHA512 319182d0d08cc94ec5db6fceb52c1efab287400ec9572f7d5eb96bbd765a8e3a5031b2a43066a535ff7a288d93647c8ecf5ed85ea202281e666e2dbdb0b812d6
DIST extension-manager-0.2.3.tar.gz 1384925 BLAKE2B 3bd98f67f419c646a4a7b9d1dee656de305eff5e35124f3765d5d9c82aff7d9e7bbeea912f24c0766c95e0c497b070831ee9922747f200bbcd57470a6adcec7e SHA512 9bb078f3d00cdfe1e84a757f7cce32f5a33333fdf4f60f3952523ac48779becab9c00da78974551f224c194806217eddf3116a29eb33f1e9982ff8caa5e06218
diff --git a/gnome-extra/extension-manager/extension-manager-0.2.2.ebuild b/gnome-extra/extension-manager/extension-manager-0.2.2.ebuild
deleted file mode 100644
index c59138704b..0000000000
--- a/gnome-extra/extension-manager/extension-manager-0.2.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2-utils meson xdg
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mjakeman/extension-manager.git"
-else
- SRC_URI="https://github.com/mjakeman/extension-manager/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A native tool for browsing and installing GNOME Shell Extensions"
-HOMEPAGE="https://github.com/mjakeman/extension-manager"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-IUSE="test"
-# 'Validate appstream file' test case requires Internet connection
-PROPERTIES="test_network"
-RESTRICT="test"
-
-BDEPEND="
- dev-libs/glib:2
- dev-util/blueprint-compiler
- virtual/pkgconfig
- test? (
- dev-libs/appstream-glib
- dev-util/desktop-file-utils
- )
-"
-
-DEPEND="
- dev-libs/glib:2
- dev-libs/json-glib
- gui-libs/gtk:4[introspection]
- gui-libs/libadwaita:1[introspection]
- net-libs/libsoup:3.0
-"
-
-RDEPEND="
- ${DEPEND}
-"
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-extra/extension-manager/extension-manager-0.2.3.ebuild b/gnome-extra/extension-manager/extension-manager-0.2.3.ebuild
index ffce3d0d24..561186b6b0 100644
--- a/gnome-extra/extension-manager/extension-manager-0.2.3.ebuild
+++ b/gnome-extra/extension-manager/extension-manager-0.2.3.ebuild
@@ -19,23 +19,41 @@ HOMEPAGE="https://github.com/mjakeman/extension-manager"
LICENSE="GPL-3+"
SLOT="0"
-DEPEND="
- dev-libs/glib:2
- dev-libs/json-glib
- gui-libs/gtk:4[introspection]
- gui-libs/libadwaita:1[introspection]
- net-libs/libsoup:3.0
-"
-RDEPEND="${DEPEND}"
BDEPEND="
dev-libs/glib:2
dev-util/blueprint-compiler
virtual/pkgconfig
"
-# disable AppStream test
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/json-glib
+ gui-libs/gtk:4[introspection]
+ gui-libs/libadwaita:1[introspection]
+ net-libs/libsoup:3.0
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+# Tests are skipped because as of version 0.2.3, the tests only validate
+# resource files and do not verify any functionality of the program. Those
+# validations are either already handled by QA checks or not relevant on
+# Gentoo. For more information about the rationale, please refer to:
+# https://github.com/gentoo/guru/commit/f896bee213fbb62c70e818c1bf503fee2a41919a#comments
+#
+# If tests are to be executed in the future because the upstream adds
+# functionality tests or for other reasons, and should there be no convenient
+# way to skip the validations, the following variable values need to be set:
+#
+# IUSE="test"
+# # 'Validate appstream file' test case requires Internet connection
+# PROPERTIES="test_network"
+# RESTRICT="test"
+# BDEPEND="test? ( dev-libs/appstream-glib dev-util/desktop-file-utils )"
src_test() {
-:
+ :
}
pkg_postinst() {
diff --git a/gnome-extra/extension-manager/extension-manager-9999.ebuild b/gnome-extra/extension-manager/extension-manager-9999.ebuild
index 4a5dfc5e06..7949012b78 100644
--- a/gnome-extra/extension-manager/extension-manager-9999.ebuild
+++ b/gnome-extra/extension-manager/extension-manager-9999.ebuild
@@ -19,20 +19,25 @@ HOMEPAGE="https://github.com/mjakeman/extension-manager"
LICENSE="GPL-3+"
SLOT="0"
-DEPEND="
- dev-libs/glib:2
- dev-libs/json-glib
- gui-libs/gtk:4[introspection]
- gui-libs/libadwaita:1[introspection]
- net-libs/libsoup:3.0
-"
-RDEPEND="${DEPEND}"
BDEPEND="
dev-libs/glib:2
dev-util/blueprint-compiler
virtual/pkgconfig
"
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/json-glib
+ gui-libs/gtk:4[introspection]
+ gui-libs/libadwaita:1[introspection]
+ gui-libs/text-engine
+ net-libs/libsoup:3.0
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
src_configure() {
local emesonargs=()
if has live ${PROPERTIES}; then
@@ -44,14 +49,13 @@ src_configure() {
# Tests are skipped because as of version 0.2.3, the tests only validate
# resource files and do not verify any functionality of the program. Those
-# validations are either already handled by QA checks or are not relevant on
+# validations are either already handled by QA checks or not relevant on
# Gentoo. For more information about the rationale, please refer to:
# https://github.com/gentoo/guru/commit/f896bee213fbb62c70e818c1bf503fee2a41919a#comments
#
# If tests are to be executed in the future because the upstream adds
-# functionality tests in the future or for other reasons, and should there be
-# no convenient way to skip the validations, the following variable values need
-# to be set:
+# functionality tests or for other reasons, and should there be no convenient
+# way to skip the validations, the following variable values need to be set:
#
# IUSE="test"
# # 'Validate appstream file' test case requires Internet connection
diff --git a/gui-libs/text-engine/Manifest b/gui-libs/text-engine/Manifest
new file mode 100644
index 0000000000..d433631272
--- /dev/null
+++ b/gui-libs/text-engine/Manifest
@@ -0,0 +1 @@
+DIST text-engine-0.1.0.tar.gz 15728 BLAKE2B 41a5b4bb0347eca29268cf089a7ea127a0a467fa123384bc1d92cbb215ca98f9963742ba5f93972d163c7f6708ac428762a92023d98ad130b56657b6eccb7956 SHA512 36be3e913187dfbba96945891a64cb2b3efde8324cdb3457a64c2fdfd19e2c1289d48a92ca60c957c52e18a6cabbcc13f178c34687f183f60557e41db5c36418
diff --git a/gui-libs/text-engine/metadata.xml b/gui-libs/text-engine/metadata.xml
new file mode 100644
index 0000000000..20643c52a9
--- /dev/null
+++ b/gui-libs/text-engine/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ liaoyuan@gmail.com
+ Yuan Liao
+
+
+ mjakeman/text-engine
+
+
diff --git a/gui-libs/text-engine/text-engine-0.1.0.ebuild b/gui-libs/text-engine/text-engine-0.1.0.ebuild
new file mode 100644
index 0000000000..5b29e87539
--- /dev/null
+++ b/gui-libs/text-engine/text-engine-0.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mjakeman/text-engine.git"
+else
+ SRC_URI="https://github.com/mjakeman/text-engine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A lightweight rich-text framework for GTK 4"
+HOMEPAGE="https://github.com/mjakeman/text-engine"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ dev-libs/libxml2:2
+ gui-libs/gtk:4
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-libs/json-glib
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/pango
+"
+
+src_prepare() {
+ default
+ sed -i -e "/subdir('demo')/d" meson.build ||
+ die "Failed to modify meson.build to exclude the demo program"
+}
diff --git a/gui-libs/text-engine/text-engine-9999.ebuild b/gui-libs/text-engine/text-engine-9999.ebuild
new file mode 100644
index 0000000000..5b29e87539
--- /dev/null
+++ b/gui-libs/text-engine/text-engine-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mjakeman/text-engine.git"
+else
+ SRC_URI="https://github.com/mjakeman/text-engine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A lightweight rich-text framework for GTK 4"
+HOMEPAGE="https://github.com/mjakeman/text-engine"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ dev-libs/libxml2:2
+ gui-libs/gtk:4
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-libs/json-glib
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/pango
+"
+
+src_prepare() {
+ default
+ sed -i -e "/subdir('demo')/d" meson.build ||
+ die "Failed to modify meson.build to exclude the demo program"
+}
diff --git a/net-im/cawbird/Manifest b/net-im/cawbird/Manifest
deleted file mode 100644
index c6e6dbb839..0000000000
--- a/net-im/cawbird/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cawbird-1.4.2.tar.gz 653216 BLAKE2B c05008a310152c5d190233a7251cf0ca7104f5ca564a1c0f2ac06fb23ded9eb6429965624ae7b7a0b0b763db19ebcb159a138cbed8dac36c3fcaa56d2ead62ee SHA512 409d2b838b9c14c45fb6aa2b04dc1ccaaf76baab7394d630d254dc9a4001f7f53321b88f600e2c3f9c39e19da38dd717f46abb4a63b11696f41e61b9ab8e6452
diff --git a/net-im/cawbird/cawbird-1.4.2.ebuild b/net-im/cawbird/cawbird-1.4.2.ebuild
deleted file mode 100644
index c0ba375841..0000000000
--- a/net-im/cawbird/cawbird-1.4.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit vala meson xdg
-
-DESCRIPTION="Cawbird is a fork of the Corebird Twitter client from Baedert."
-HOMEPAGE="https://github.com/IBBoard/cawbird"
-SRC_URI="https://github.com/IBBoard/cawbird/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+X gstreamer spell"
-
-DEPEND="
- dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/json-glib
- net-libs/libsoup:2.4
- net-libs/liboauth
- media-plugins/gst-plugins-libav
- sys-devel/gettext
- x11-libs/gtk+:3
- X? ( x11-libs/libX11 )
- gstreamer? (
- media-libs/gst-plugins-base
- media-libs/gst-plugins-bad
- )
- spell? ( app-text/gspell )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- $(vala_depend)
- dev-libs/gobject-introspection
-"
-
-src_configure() {
- local emesonargs=(
- $(meson_use X x11)
- $(meson_use gstreamer video)
- $(meson_use spell spellcheck)
- -Dconsumer_key_base64=VmY5dG9yRFcyWk93MzJEZmhVdEk5Y3NMOA==
- -Dconsumer_secret_base64=MThCRXIxbWRESDQ2Y0podzVtVU13SGUyVGlCRXhPb3BFRHhGYlB6ZkpybG5GdXZaSjI=
- )
- meson_src_configure
-}
diff --git a/net-im/cawbird/metadata.xml b/net-im/cawbird/metadata.xml
deleted file mode 100644
index 4f14ca4a22..0000000000
--- a/net-im/cawbird/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- gjdijkman@gjdwebserver.nl
- Gerben Jan Dijkman
-
-
- Cawbird is a fork of the Corebird Twitter client from Baedert, which became unsupported after Twitter disabled the streaming API.
-
- Cawbird works with the new APIs and includes a few fixes and modifications that have historically been patched in to IBBoard's custom Corebird build on his personal Open Build Service account.
-
-
- https://github.com/IBBoard/cawbird
- https://github.com/IBBoard/cawbird/issues
-
-
diff --git a/net-im/go-sendxmpp/Manifest b/net-im/go-sendxmpp/Manifest
index d92c8f5a0b..993b621112 100644
--- a/net-im/go-sendxmpp/Manifest
+++ b/net-im/go-sendxmpp/Manifest
@@ -4,11 +4,10 @@ DIST github.com%2Fmattn%2Fgo-xmpp%2F@v%2Fv0.0.0-20211029151415-912ba614897a.mod
DIST github.com%2Fmattn%2Fgo-xmpp%2F@v%2Fv0.0.0-20211029151415-912ba614897a.zip 20592 BLAKE2B 42c5e4c9aafda1a6b980194d1f16ce8554a69e286dadd93e56e7f501cbd55d3ca39e63970f798ce53b35b5f3553d4c6c00314f815accdcd4e714da4cd68b20ac SHA512 2408fe13432b586f0d11c9760d9404a1f3a002759458e194c51fb5608eef3c8d2d9ce05a64c149e5597090b1f800bb0c6019844320062be395b7281ef4fc137b
DIST github.com%2Fpborman%2Fgetopt%2Fv2%2F@v%2Fv2.1.0.mod 45 BLAKE2B 5271e906de3f986c13185a62ca783ae1f7ba4b2d88669040fdccedce8af496b7595a5757d75b2a20198818c7eaa01f37471b0ed6b9793965e4d23858c51ba75e SHA512 9990e84cffa9777543bdce26e4348a827ec7b236890cbe46b218e97da0c9dd35d4a2322ce33f8d3f1a237c312b9e4c4a76af3dcac8f02ede68b3172d473a38b3
DIST github.com%2Fpborman%2Fgetopt%2Fv2%2F@v%2Fv2.1.0.zip 36834 BLAKE2B 79f103ff1bdb4953621341ebc194e61e44750fff6548b0986d429ea50e1e7556fd87b12177c2a4576b354ba321750719d8562e5dacd420faa162a69d5241159c SHA512 00bc26e4c904c4e77855c495c3e2718605268b7f431166e02ea3244fe7c30436d7b82428c1ad4a346440f688c7ccdaa6ab4ee0643c7ec61f6aca08fc783b027e
-DIST go-sendxmpp-0.1.3.tar.bz2 16351 BLAKE2B 5bf63cc34910eca060e41446e8d1ca892532d1fcfb6ffbdfdd0b7e954b2bde973dc30e5407cbb747d5a1a289e9ac4c80bab3bf4bef821f21ba63501c99243a4b SHA512 885bde598b8e1de1379ffa715a74068c5b585efd41d6a3ccc737d6c097db57dbe4927f9ce2d92a28f4831267d0c06995104daaa1ec5330bde051891833ba594e
DIST go-sendxmpp-0.2.0.tar.bz2 17312 BLAKE2B c2bf1d3ee3a1ed1fb3eec24897820974da120f7e00d57e30489526d4d04f88147534c9c4ff03bebce7009a2c66ce7619aa8a85e7ab151712b51125eff1713b26 SHA512 cc48ac99f52aa144d1265666a541e9838d698c890383ebfd692d8673b746495d42750bcba8e0e5d545a34be00f694df3fb83ec61815631d4f1608c856b087555
+DIST go-sendxmpp-0.3.0-vendor.tar.xz 694672 BLAKE2B eb84432a5f809d60e28a11b834afbcd1067d3e89c10ed5ba2c4a5087f04485b5316be313b383a0d22602b97b783ad3585060b8d0fa0e0d1e993f023a8e744824 SHA512 d05d9f720b4c1044b11532d18b80b4a013d0d88171e29187b631009889a9c5be6a65c56b463a96015c1016abe3c43399f931fcf2ac058a333b940fee1b44eb6a
+DIST go-sendxmpp-0.3.0.tar.bz2 17809 BLAKE2B 8c1a0fcf44ed4986fd17806cac169653f05901338169ab8d552f59474ff5eb01dc5ceace1e399edf79c9e967fcaf15216c78f44803f3cb9a6995095e519bdf94 SHA512 9ceefd156d558c8c396956b190504c24fd2824a1ee0308606945d046d378a1d745789a86578e5f6af7b6c0ce0a92c6f7069e1007e96c075df26e92c7f3917501
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210505024714-0287a6fb4125.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20220121210141-e204ce36a2ba.mod 179 BLAKE2B aeb0b9d0e68dac6692cf3e9e4a7395ef0a2d4e44eab6ebc7ad8fb33150c264dd86ad609e6c08fdca6084f5ad49e695de45de7032cd999c5b805a94f8a91f610c SHA512 429ece90e145151ec4cff356689cdbc04ab43f85f2dbd594f60176f49b0ee5f9f2bfe7c7bd88bb5564adb8f3d28ea12a2722ad79a80640ede67a3ad4f9e72caa
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20220121210141-e204ce36a2ba.zip 1581821 BLAKE2B c79fd99f837f274d0235169924ff5e5da92daa595dc2a12ff693a0223eae9f1d7cfbef98bcfcb846cb57884165788ee344483638ee950306e8cebed005dafb9b SHA512 0eda8cdec1af1f4ffd8571340b5e0c90fe40e1d622de985f9168805fbaf779c79b6700dbba84e41cd1bd8e26ddd95476dcf375c7430f27833ebe1e4ba12d480d
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20220127200216-cd36cc0744dd.mod 179 BLAKE2B aeb0b9d0e68dac6692cf3e9e4a7395ef0a2d4e44eab6ebc7ad8fb33150c264dd86ad609e6c08fdca6084f5ad49e695de45de7032cd999c5b805a94f8a91f610c SHA512 429ece90e145151ec4cff356689cdbc04ab43f85f2dbd594f60176f49b0ee5f9f2bfe7c7bd88bb5564adb8f3d28ea12a2722ad79a80640ede67a3ad4f9e72caa
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20220127200216-cd36cc0744dd.zip 1582089 BLAKE2B 98cac34317e5d6b8b0b0193e8556a16af3d2c7410725ac8a464216f9fbba5c4f35160cafe446d3a9bbfc643190e4a3c39c4dbf4a8030df78dadc8cfa9cb1bcd6 SHA512 4979b9a571e26c1f62e6dcb3ac56e11011d36eb240b9da685f61a7b9c5fa6395deb660597d551139f8629de8bbbe610e8d4f54c3572a7eb894bb0deeb4b477e8
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -20,7 +19,5 @@ DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210927222741-03fcf44c2211.mod 95 BLAK
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.mod 97 BLAKE2B cba29395bf9693152732776bde498cfd90a27c053feb5d1ca655e5e792ff68b9cd0a519bdff559450491e918a171c8a4fdbd4c0b4bcc9b578182f63ca37754db SHA512 e77211a503c35d8b6c392fc1b44daed580659b997673cd312ae8e579d1d715d7a53f8f0f0dd2d4dedbc6c5ca5ab7e3d52269a6536a42824cce267c89eb29cbbd
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-DIST salsa.debian.org%2Fmdosch%2Fxmppsrv%2F@v%2Fv0.1.0.mod 39 BLAKE2B b3cdaad27de35a520797acb4a88342572d102f6f7ec83acfa4da602450fc6be7d9cadcf665fc55c66609d6eeb0b5981d15c971f908a663121e987aadd14e0455 SHA512 4f3bfde5aa7165e8a463b491a70df0eb098f70a518b1d09a57d0e444e6ed040f54c305b1c47adfe6cee982d6991288ac737c55006a0e7fac54ad8f8e51eb2145
-DIST salsa.debian.org%2Fmdosch%2Fxmppsrv%2F@v%2Fv0.1.0.zip 2880 BLAKE2B fb6dd3c63492e5ebdb370d285c249ec4954c5841088c5c50da90717f84910d6df62c52d9a1651b7aba7ad66b88a3958c73f62d2e086dc8d331cb14ad96534f25 SHA512 1669fe57989a25f246ab80e7477d8b0eec9a5bf814191ab8567b5d34f99e716aff46f37907f1fde34f84d3c37efe17f569f235da8677ea7094250675ec241772
DIST salsa.debian.org%2Fmdosch%2Fxmppsrv%2F@v%2Fv0.1.1.mod 48 BLAKE2B dbf01010824936a530a69b45f29fea41eb1189c7ee13085fe03b5b74cfcac9545e1a18c802a960efe6743d76b4361efc99af9c1c5d8650510d8a21905f397838 SHA512 0197fd9b0e0a7212740eeda52269415de0e2eef2422beb2ede3024c323d3664fde79ae2c927a1d953c0efe3941d33638798a49365f28fc07142dcbd91263a36f
DIST salsa.debian.org%2Fmdosch%2Fxmppsrv%2F@v%2Fv0.1.1.zip 4129 BLAKE2B 354fa6fdb33fcaa244263dce21ea05e74e983e967ce126c2d60c10be4f8aad339f1932ba80bb61948a7d80ac468fe32ee0cff8be36bead9c92c408381af52372 SHA512 53ce9566febcd18f52460cdd64d710fb9635ec52f084b2590a39051dc5c1b8d5361dc9b5c71cc48578f86a4b6793dc54f348987d279d0aa3206fe4c1a89df49d
diff --git a/net-im/go-sendxmpp/go-sendxmpp-0.1.3.ebuild b/net-im/go-sendxmpp/go-sendxmpp-0.1.3.ebuild
deleted file mode 100644
index b880308a6d..0000000000
--- a/net-im/go-sendxmpp/go-sendxmpp-0.1.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-EGO_SUM=(
- "github.com/gabriel-vasile/mimetype v1.4.0"
- "github.com/gabriel-vasile/mimetype v1.4.0/go.mod"
- "github.com/mattn/go-xmpp v0.0.0-20211029151415-912ba614897a"
- "github.com/mattn/go-xmpp v0.0.0-20211029151415-912ba614897a/go.mod"
- "github.com/pborman/getopt/v2 v2.1.0"
- "github.com/pborman/getopt/v2 v2.1.0/go.mod"
- "golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod"
- "golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba"
- "golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba/go.mod"
- "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
- "golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
- "golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
- "golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod"
- "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
- "golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod"
- "golang.org/x/text v0.3.6/go.mod"
- "golang.org/x/text v0.3.7/go.mod"
- "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
- "salsa.debian.org/mdosch/xmppsrv v0.1.0"
- "salsa.debian.org/mdosch/xmppsrv v0.1.0/go.mod"
-)
-go-module_set_globals
-
-DESCRIPTION="A little tool to send messages to an XMPP contact or MUC"
-HOMEPAGE="https://salsa.debian.org/mdosch/go-sendxmpp"
-SRC_URI="
- https://salsa.debian.org/mdosch/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2
- ${EGO_SUM_SRC_URI}
-"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="BSD-2 BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_compile() {
- go build || die
-}
-
-src_install() {
- default
-
- dobin go-sendxmpp
-}
diff --git a/net-im/go-sendxmpp/go-sendxmpp-0.3.0.ebuild b/net-im/go-sendxmpp/go-sendxmpp-0.3.0.ebuild
new file mode 100644
index 0000000000..8d07b0f3fa
--- /dev/null
+++ b/net-im/go-sendxmpp/go-sendxmpp-0.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A little tool to send messages to an XMPP contact or MUC"
+HOMEPAGE="https://salsa.debian.org/mdosch/go-sendxmpp"
+SRC_URI="
+ https://salsa.debian.org/mdosch/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2
+ https://tastytea.de/files/${P}-vendor.tar.xz
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ ego build
+}
+
+src_install() {
+ dobin go-sendxmpp
+ default
+}
diff --git a/net-misc/maestral/Manifest b/net-misc/maestral/Manifest
index 46b9bdc183..e22afe2114 100644
--- a/net-misc/maestral/Manifest
+++ b/net-misc/maestral/Manifest
@@ -1,2 +1,3 @@
DIST maestral-1.5.2.tar.gz 8277812 BLAKE2B df901a0a98a51f3c611cd3aa3ff4d4662fa10cdd595df2214f1a4c9fd0da8c787531a21671261df7196869d1822c69884299f2bcecd0e4190bb81fcb55a8885f SHA512 eafed2a3dbc55e3ee9417da393864ec94c76724949855805e99e3c65c29b1d33aeeb2ac063c0a4c115d3f03c002dbe899b6ec1ec6ebcb0a29386a39eabdeb769
DIST maestral-1.5.3.tar.gz 8280040 BLAKE2B dcda43880cea3fb00098b6bf87e43318a523a7c9d83886efff58be715cde17f67504b31735a006b951963e5cf0ef70b4b6431cb84200722cae186053a01edd63 SHA512 aa21277623f4e6f3283cd989be910eeb1caa3a842abca595b27a551c1c9bd1e7ef083e495ee0f096190accd91835939cb2f4a26624feae0046d8770d53aaac2f
+DIST maestral-1.6.0.tar.gz 8285354 BLAKE2B 05cfaee17018be913d89d9eee6b648bd18c377e1dd7a877d21fdb018a874b638d8254de83ea39c461daf30b1d953b9dc09e5d26c095dacacd8fe6783eb2d8c6e SHA512 1a0dec0d9f644ba8c5584ceb601d6b5fb617a19b3571352e52b8c8b5709cca392710fb8ee2a062f7612bd0d5d1047e51192366b1134f912eb05813b6b33afd9a
diff --git a/net-misc/maestral/maestral-1.6.0.ebuild b/net-misc/maestral/maestral-1.6.0.ebuild
new file mode 100644
index 0000000000..69156a07d9
--- /dev/null
+++ b/net-misc/maestral/maestral-1.6.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Maestral is an open-source Dropbox client written in Python"
+HOMEPAGE="https://maestral.app"
+SRC_URI="https://github.com/samschott/maestral/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-python/click-8.0.2[${PYTHON_USEDEP}]
+ >=dev-python/desktop-notifier-3.3.0[${PYTHON_USEDEP}]
+ >=dev-python/dropbox-sdk-python-11.28.0[${PYTHON_USEDEP}]
+ =dev-python/fasteners-0.15[${PYTHON_USEDEP}]
+ >=dev-python/keyring-22.0.0[${PYTHON_USEDEP}]
+ >=dev-python/keyrings-alt-3.1.0[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ >=dev-python/pathspec-0.5.8[${PYTHON_USEDEP}]
+ >=dev-python/Pyro5-5.10[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.16.2[${PYTHON_USEDEP}]
+ >=dev-python/sdnotify-0.3.2[${PYTHON_USEDEP}]
+ >=dev-python/survey-3.4.3[${PYTHON_USEDEP}]
+ =dev-python/watchdog-2.0.1[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_8)
+"
+BDEPEND="
+ dev-python/build[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest-benchmark[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all()
+{
+ # this test requires systemd
+ sed -i -e 's/test_autostart/_&/' tests/offline/test_cli.py || die
+
+ # this test requires network
+ sed -i -e 's/test_check_for_updates/_&/' tests/offline/test_main.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+pkg_postinst()
+{
+ xdg_icon_cache_update
+}
+
+pkg_postrm()
+{
+ xdg_icon_cache_update
+}
diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
index 2c84f7f4c0..61345cd839 100644
--- a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
+++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
@@ -34,7 +34,9 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- test? ( appqos? ( dev-python/mock[${PYTHON_USEDEP}] ) )
+ test? (
+ appqos? ( dev-python/mock[${PYTHON_USEDEP}] )
+ )
"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -101,7 +103,7 @@ src_install() {
unset DOCS
python_foreach_impl python_install
- if use perl ; then
+ if use perl; then
pushd "lib/perl" || die
unset DOCS
myinst=( DESTDIR="${D}" )
@@ -113,7 +115,7 @@ src_install() {
}
src_test() {
- python_foreach_impl python_test
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/lib" python_foreach_impl python_test
}
python_install() {
diff --git a/sys-cluster/fti/fti-1.6.ebuild b/sys-cluster/fti/fti-1.6-r1.ebuild
similarity index 92%
rename from sys-cluster/fti/fti-1.6.ebuild
rename to sys-cluster/fti/fti-1.6-r1.ebuild
index a7da6c7287..74bb2c5804 100644
--- a/sys-cluster/fti/fti-1.6.ebuild
+++ b/sys-cluster/fti/fti-1.6-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/leobago/fti/archive/refs/tags/v${PV}.tar.gz -> ${P}.
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="doc examples fi-io hdf5 lustre fortran openssl sionlib test tutorial"
+IUSE="doc examples fi-io hdf5 fortran openssl sionlib test tutorial"
#TODO: unbundle jerasure bpp iniparser
RDEPEND="
@@ -29,7 +29,6 @@ RDEPEND="
virtual/mpi
hdf5? ( sci-libs/hdf5[mpi] )
- lustre? ( sys-cluster/lustre )
openssl? ( dev-libs/openssl )
sionlib? ( sys-cluster/sionlib )
"
@@ -58,7 +57,6 @@ src_configure() {
-DENABLE_FI_IO=$(usex fi-io)
-DENABLE_FORTRAN=$(usex fortran)
-DENABLE_HDF5=$(usex hdf5)
- -DENABLE_LUSTRE=$(usex lustre)
-DENABLE_OPENSSL=$(usex openssl)
-DENABLE_SIONLIB=$(usex sionlib)
-DENABLE_TESTS=$(usex test)
diff --git a/sys-cluster/fti/metadata.xml b/sys-cluster/fti/metadata.xml
index 1c078d89e1..390df57b24 100644
--- a/sys-cluster/fti/metadata.xml
+++ b/sys-cluster/fti/metadata.xml
@@ -15,7 +15,6 @@ FTI stands for Fault Tolerance Interface and is a library that aims to give comp