diff --git a/TODO.md b/TODO.md
index 6e0d235da6..7fd8209ffb 100644
--- a/TODO.md
+++ b/TODO.md
@@ -27,6 +27,7 @@ Name | Buildsystem | Category | User | RFH | Dependency
[imb](https://software.intel.com/content/www/us/en/develop/articles/intel-mpi-benchmarks.html) | make | cluster | Alessandro-Barbieri | ✖ | ✔
[gnat-llvm](https://github.com/AdaCore/gnat-llvm) | make | compiler | Alessandro-Barbieri | ✔ | ✖
[csparse](https://people.sc.fsu.edu/~jburkardt/c_src/csparse/csparse.html) | make | science | Alessandro-Barbieri | ✖ | ✔
+[gslib](https://github.com/Nek5000/gslib) | make | cluster | Alessandro-Barbieri | ✖ | ✔
[dimemas](https://github.com/bsc-performance-tools/dimemas) | autotools | cluster | Alessandro-Barbieri | ✖ | ✔
[argobots](https://www.argobots.org/) | autotools | devel | Alessandro-Barbieri | ✖ | ✔
[mochi-ssg](https://github.com/mochi-hpc/mochi-ssg) | autotools | cluster | Alessandro-Barbieri | ✖ | ✔
@@ -82,6 +83,8 @@ Name | Buildsystem | Category | User | RFH | Dependency
[scorec](https://github.com/SCOREC/core) | cmake | science | Alessandro-Barbieri | ✖ | ✔
[slate](https://bitbucket.org/icl/slate/) | cmake | science | Alessandro-Barbieri | ✖ | ✔
[tasmanian](https://github.com/ORNL/TASMANIAN) | cmake | science | Alessandro-Barbieri | ✖ | ✔
+[vite](https://solverstack.gitlabpages.inria.fr/vite/) | cmake | visualization | Alessandro-Barbieri | ✖ | ✔
+[zpp](https://github.com/jbigot/zpp) | cmake | devel | Alessandro-Barbieri | ✖ | ✔
[enarx](https://enarx.dev/) | cargo | util | Alessandro-Barbieri | ✖ | ✖
[ruplacer](https://github.com/dmerejkowsky/ruplacer) | cargo | sys | Alessandro-Barbieri | ✖ | ✖
[gping](https://github.com/orf/gping) | cargo | net | Alessandro-Barbieri | ✖ | ✖
@@ -104,10 +107,10 @@ Name | Buildsystem | Category | User | RFH | Dependency
[mmtracking](https://github.com/open-mmlab/mmtracking) | setuptools | science | Alessandro-Barbieri | ✖
[ueberzug](https://github.com/seebye/ueberzug) | setuptools | cli | N-R-K | | ✖
[libensemble](https://github.com/Libensemble/libensemble) | setuptools | cluster | Alessandro-Barbieri | ✖ | ✔
+[ActivityWatch](https://github.com/ActivityWatch/activitywatch) | setuptools | utils | David Roman | ✔ | ✖
[greenclip](https://github.com/erebe/greenclip) | cabal | desktop | N-R-K | | ✖
[kaitai](https://github.com/kaitai-io/kaitai_struct) | sbt | util | Alessandro-Barbieri | ✔ | ✖
[casadi](https://web.casadi.org/) | cmake swig | science | Alessandro-Barbieri | ✖ | ✔
[ipyleaflet](https://github.com/jupyter-widgets/ipyleaflet) | setuptools yarn | jupyter | Alessandro-Barbieri | ✔ | ✖
[gitlab](https://gitlab.com/gitlab-org/gitlab-foss) | yarn gem | vcs | Alessandro-Barbieri | ✔ | ✖
[HOL4](http://hol-theorem-prover.org/) | ? | math | Alessandro-Barbieri | ✔ | ✖
-[ActivityWatch](https://github.com/ActivityWatch/activitywatch) | ? | utils | David Roman | ✔ | ✖
diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest
index 82532a5c67..ff7788dd30 100644
--- a/app-backup/timeshift/Manifest
+++ b/app-backup/timeshift/Manifest
@@ -1 +1,2 @@
DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b
+DIST timeshift-22.06.1.tar.gz 1425559 BLAKE2B 78cf47f65b0bda6bb9bbdb8e3abe250b3b8b4d1c5e651a7b40d8c1d5eab4802930a97520721616eda44f2dbe8a7f06bde097d0ffe24c3a251ddef78b04b8c0d5 SHA512 ee35d7270e7625ae51398392c24aa80b85494c524bb12de4b6c0d5e5ee47d496031feb058fbd6905360b40d63d1088d48faebccabac04020f226b5d05608a9a7
diff --git a/app-backup/timeshift/timeshift-22.06.1.ebuild b/app-backup/timeshift/timeshift-22.06.1.ebuild
new file mode 100644
index 0000000000..97f794686b
--- /dev/null
+++ b/app-backup/timeshift/timeshift-22.06.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.44"
+inherit vala xdg
+
+DESCRIPTION="A system restore utility for Linux"
+HOMEPAGE="https://github.com/teejee2008/timeshift"
+SRC_URI="https://github.com/teejee2008/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/json-glib
+ dev-libs/libgee
+ dev-util/desktop-file-utils
+ net-libs/libsoup
+ net-misc/rsync
+ sys-process/cronie
+ x11-libs/gtk+:3
+ x11-libs/xapp
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ $(vala_depend)
+ net-misc/rsync
+ sys-apps/diffutils
+ sys-apps/coreutils
+ sys-fs/btrfs-progs
+ >=x11-libs/vte-0.60.3[vala]
+"
+
+src_prepare() {
+# sed -i -e "s:--thread:& Core/AppExcludeEntry.vala:" "src/makefile"
+ sed -i -e "s:valac:valac-$(vala_best_api_version):" "src/makefile"
+ vala_src_prepare
+ default
+}
diff --git a/app-containers/dnsname-cni-plugin/dnsname-cni-plugin-1.3.0.ebuild b/app-containers/dnsname-cni-plugin/dnsname-cni-plugin-1.3.0.ebuild
index 01ce66053c..ba02f5cfc3 100644
--- a/app-containers/dnsname-cni-plugin/dnsname-cni-plugin-1.3.0.ebuild
+++ b/app-containers/dnsname-cni-plugin/dnsname-cni-plugin-1.3.0.ebuild
@@ -36,8 +36,7 @@ RDEPEND="${DEPEND}"
src_unpack() {
default
if [[ ${PV} == *9999 ]]; then
- git-r3_fetch
- git-r3_checkout
+ git-r3_src_unpack
pushd ${P}/plugins/meta/dnsname || die "location change for module building failed"
ego get
popd || die "location reset from module building failed"
diff --git a/app-containers/dnsname-cni-plugin/dnsname-cni-plugin-9999.ebuild b/app-containers/dnsname-cni-plugin/dnsname-cni-plugin-9999.ebuild
index ef5548ff1a..b3a5dfffd2 100644
--- a/app-containers/dnsname-cni-plugin/dnsname-cni-plugin-9999.ebuild
+++ b/app-containers/dnsname-cni-plugin/dnsname-cni-plugin-9999.ebuild
@@ -35,8 +35,7 @@ RDEPEND="${DEPEND}"
src_unpack() {
default
if [[ ${PV} == *9999 ]]; then
- git-r3_fetch
- git-r3_checkout
+ git-r3_src_unpack
pushd ${P}/plugins/meta/dnsname || die "location change for module building failed"
ego get
popd || die "location reset from module building failed"
diff --git a/app-text/OCRmyPDF/Manifest b/app-text/OCRmyPDF/Manifest
index 736bb91da9..782ea27029 100644
--- a/app-text/OCRmyPDF/Manifest
+++ b/app-text/OCRmyPDF/Manifest
@@ -2,3 +2,4 @@ DIST OCRmyPDF-13.2.0.tar.gz 7885396 BLAKE2B 0eea864d056d2238f7ea244a7fc9b6a54840
DIST OCRmyPDF-13.4.0.tar.gz 7889193 BLAKE2B 42923508524df38ed62f1a0c4d6b308dac8e00a44b428dee2dd5494915778910e434d5bf8a5957fe48685c0263b3151044794b14cbc209e4a3909da1e2411fe3 SHA512 1b581ba469e0f625481c551d9b53c553745a02c748bd2e16bd7a589f4eacfd3f21ba5d435b52286694220627de0d3d7202513191ee5e1e04b7bdd392d0abc5cd
DIST OCRmyPDF-13.4.1.tar.gz 7888750 BLAKE2B 178954136f797f166a37db602b302cf50752010504b934b6633b0b2f52f2fb57e88995b3ffbb534990857698fa63c9966a92babaf9bcb7e3833e4f6f3d325e15 SHA512 c65dd1d6dc957fbfff7926241c4b887146d3efbf1181dd9bc43fca464ebc07e1507425e90af72311e89fe1ed75ee1e293600d6f7f538f7a5ee8dd8998173c972
DIST OCRmyPDF-13.4.3.tar.gz 7889740 BLAKE2B d107b83f0d66fe6d19cc22bf76851650cd75c79900eff2c1e68d02a15ffb875dfa97472f8a8e80fe7051a7a8d33b9729855277121ed2e204b50729b6171bde26 SHA512 301efe2492de00527cacb8640eea68bf3f5398ca53a932872f3c62ef85616fc45e2c08c662cb42cfca69c6e2b5debf8860b192421c4370e7191cea5dbc4bf32d
+DIST OCRmyPDF-13.4.6.tar.gz 7890082 BLAKE2B 5d1fe4a0147dc7ca5bf5d1468e6cb23b57d436b80ec60b3cec9af4b1768af10fb387b724975e0c5e83aaa79806d4ba7a984fcf1d78f8bfaf97f42edfefa20f81 SHA512 fedf17630af21e94e45373aec45966cca2baa8abaca604a2a6820a74e62cf115bad376234b69dffad1ab26e50d5b891b1255026262512b518547f133f12c33d5
diff --git a/app-text/OCRmyPDF/OCRmyPDF-13.4.6.ebuild b/app-text/OCRmyPDF/OCRmyPDF-13.4.6.ebuild
new file mode 100644
index 0000000000..0692a0baef
--- /dev/null
+++ b/app-text/OCRmyPDF/OCRmyPDF-13.4.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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/ocrmypdf/OCRmyPDF"
+SRC_URI="https://github.com/ocrmypdf/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-20200720[${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-R/BH/BH-1.78.0.0.ebuild b/dev-R/BH/BH-1.78.0.0-r1.ebuild
similarity index 97%
rename from dev-R/BH/BH-1.78.0.0.ebuild
rename to dev-R/BH/BH-1.78.0.0-r1.ebuild
index b4fceef8b7..1fbfecb038 100644
--- a/dev-R/BH/BH-1.78.0.0.ebuild
+++ b/dev-R/BH/BH-1.78.0.0-r1.ebuild
@@ -14,6 +14,7 @@ HOMEPAGE="
"
SRC_URI="mirror://cran/src/contrib/${MY_P}.tar.gz"
+SLOT="0/${PV}"
LICENSE='Boost-1.0'
KEYWORDS="~amd64"
diff --git a/dev-R/RcppArmadillo/RcppArmadillo-0.10.8.1.0.ebuild b/dev-R/RcppArmadillo/RcppArmadillo-0.10.8.1.0-r1.ebuild
similarity index 98%
rename from dev-R/RcppArmadillo/RcppArmadillo-0.10.8.1.0.ebuild
rename to dev-R/RcppArmadillo/RcppArmadillo-0.10.8.1.0-r1.ebuild
index 364b05a04f..30280253aa 100644
--- a/dev-R/RcppArmadillo/RcppArmadillo-0.10.8.1.0.ebuild
+++ b/dev-R/RcppArmadillo/RcppArmadillo-0.10.8.1.0-r1.ebuild
@@ -9,6 +9,8 @@ MY_PV="$(ver_cut 2-3 ${PV})"
DESCRIPTION='Rcpp Integration for the Armadillo templated linear algebra library'
SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
+
+SLOT="0/${PV}"
KEYWORDS="~amd64"
LICENSE='GPL-2+'
diff --git a/dev-R/RcppEnsmallen/RcppEnsmallen-0.2.19.0.1.ebuild b/dev-R/RcppEnsmallen/RcppEnsmallen-0.2.19.0.1-r1.ebuild
similarity index 98%
rename from dev-R/RcppEnsmallen/RcppEnsmallen-0.2.19.0.1.ebuild
rename to dev-R/RcppEnsmallen/RcppEnsmallen-0.2.19.0.1-r1.ebuild
index f65fe2842b..6369326489 100644
--- a/dev-R/RcppEnsmallen/RcppEnsmallen-0.2.19.0.1.ebuild
+++ b/dev-R/RcppEnsmallen/RcppEnsmallen-0.2.19.0.1-r1.ebuild
@@ -14,6 +14,7 @@ HOMEPAGE="
"
#SRC_URI="mirror://cran/src/contrib/RcppEnsmallen/RcppEnsmallen_${PV}.tar.gz"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
LICENSE='GPL-2+'
diff --git a/dev-R/reticulate/reticulate-1.25.ebuild b/dev-R/reticulate/reticulate-1.25.ebuild
index ca86445b0b..40dd597595 100644
--- a/dev-R/reticulate/reticulate-1.25.ebuild
+++ b/dev-R/reticulate/reticulate-1.25.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit python-single-r1 R-packages
diff --git a/dev-cpp/MEL/MEL-1.0.0.ebuild b/dev-cpp/MEL/MEL-1.0.0-r1.ebuild
similarity index 97%
rename from dev-cpp/MEL/MEL-1.0.0.ebuild
rename to dev-cpp/MEL/MEL-1.0.0-r1.ebuild
index 1edb276168..c666a6ffd9 100644
--- a/dev-cpp/MEL/MEL-1.0.0.ebuild
+++ b/dev-cpp/MEL/MEL-1.0.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/pcarruscag/MEL"
SRC_URI="https://github.com/pcarruscag/MEL/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-3"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="test"
diff --git a/dev-cpp/dtl/dtl-1.20.ebuild b/dev-cpp/dtl/dtl-1.20-r1.ebuild
similarity index 98%
rename from dev-cpp/dtl/dtl-1.20.ebuild
rename to dev-cpp/dtl/dtl-1.20-r1.ebuild
index f2b82a83b0..b31728a106 100644
--- a/dev-cpp/dtl/dtl-1.20.ebuild
+++ b/dev-cpp/dtl/dtl-1.20-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/cubicdaiya/dtl"
SRC_URI="https://github.com/cubicdaiya/dtl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="examples test"
diff --git a/dev-cpp/fbthrift/fbthrift-2022.04.11.00.ebuild b/dev-cpp/fbthrift/fbthrift-2022.04.11.00-r1.ebuild
similarity index 93%
rename from dev-cpp/fbthrift/fbthrift-2022.04.11.00.ebuild
rename to dev-cpp/fbthrift/fbthrift-2022.04.11.00-r1.ebuild
index d05d4ff9ac..18d9c90039 100644
--- a/dev-cpp/fbthrift/fbthrift-2022.04.11.00.ebuild
+++ b/dev-cpp/fbthrift/fbthrift-2022.04.11.00-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit cmake python-single-r1
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/facebook/fbthrift"
SRC_URI="https://github.com/facebook/fbthrift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
RDEPEND="
diff --git a/dev-cpp/fizz/fizz-2022.04.11.00.ebuild b/dev-cpp/fizz/fizz-2022.04.11.00-r1.ebuild
similarity index 98%
rename from dev-cpp/fizz/fizz-2022.04.11.00.ebuild
rename to dev-cpp/fizz/fizz-2022.04.11.00-r1.ebuild
index 3ce14c10f3..5ca4db736f 100644
--- a/dev-cpp/fizz/fizz-2022.04.11.00.ebuild
+++ b/dev-cpp/fizz/fizz-2022.04.11.00-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/facebookincubator/fizz"
SRC_URI="https://github.com/facebookincubator/fizz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="examples test"
diff --git a/dev-cpp/gemmlowp/Manifest b/dev-cpp/gemmlowp/Manifest
index 7dd3b9b122..7707861e5f 100644
--- a/dev-cpp/gemmlowp/Manifest
+++ b/dev-cpp/gemmlowp/Manifest
@@ -1 +1 @@
-DIST gemmlowp-0_pre20211220.tar.gz 842220 BLAKE2B 74139935c01683f894a2ee8bb6f5373a64b8346e5860addd9dcccd47ceffe8942509def3ed242fcd92021c7f82f2e8858313df12369257e2172143a14cec82ed SHA512 934bc79cc951dd18bff413148f3526332685bf0980ddcc0f990ba347bafcd73725e5ffd4bd255dcaa21f0fd71698d26726e2f9f36aa8df87380048041e536e20
+DIST gemmlowp-0_pre20211220-r1.tar.gz 842220 BLAKE2B 74139935c01683f894a2ee8bb6f5373a64b8346e5860addd9dcccd47ceffe8942509def3ed242fcd92021c7f82f2e8858313df12369257e2172143a14cec82ed SHA512 934bc79cc951dd18bff413148f3526332685bf0980ddcc0f990ba347bafcd73725e5ffd4bd255dcaa21f0fd71698d26726e2f9f36aa8df87380048041e536e20
diff --git a/dev-cpp/gemmlowp/gemmlowp-0_pre20211220.ebuild b/dev-cpp/gemmlowp/gemmlowp-0_pre20211220-r1.ebuild
similarity index 97%
rename from dev-cpp/gemmlowp/gemmlowp-0_pre20211220.ebuild
rename to dev-cpp/gemmlowp/gemmlowp-0_pre20211220-r1.ebuild
index 19c2ddd6f1..b4d5f093d6 100644
--- a/dev-cpp/gemmlowp/gemmlowp-0_pre20211220.ebuild
+++ b/dev-cpp/gemmlowp/gemmlowp-0_pre20211220-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${COMMIT}.tar.gz -> ${PF}.tar.g
S="${WORKDIR}/${PN}-${COMMIT}/contrib"
LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="test"
diff --git a/dev-cpp/parallel-hashmap/parallel-hashmap-1.34.ebuild b/dev-cpp/parallel-hashmap/parallel-hashmap-1.34-r1.ebuild
similarity index 98%
rename from dev-cpp/parallel-hashmap/parallel-hashmap-1.34.ebuild
rename to dev-cpp/parallel-hashmap/parallel-hashmap-1.34-r1.ebuild
index a4119b6dcc..6ef5bc9f65 100644
--- a/dev-cpp/parallel-hashmap/parallel-hashmap-1.34.ebuild
+++ b/dev-cpp/parallel-hashmap/parallel-hashmap-1.34-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
SRC_URI="https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="examples test"
diff --git a/dev-cpp/plog/plog-1.1.6.ebuild b/dev-cpp/plog/plog-1.1.6-r1.ebuild
similarity index 97%
rename from dev-cpp/plog/plog-1.1.6.ebuild
rename to dev-cpp/plog/plog-1.1.6-r1.ebuild
index 0e9d992c0c..da4a7d2e76 100644
--- a/dev-cpp/plog/plog-1.1.6.ebuild
+++ b/dev-cpp/plog/plog-1.1.6-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/SergiusTheBest/${PN}/archive/${PV}.tar.gz -> ${P}.ta
KEYWORDS="~amd64"
LICENSE="MPL-2.0"
-SLOT="0"
+SLOT="0/${PV}"
IUSE="examples"
src_install() {
diff --git a/dev-cpp/std-format/std-format-0_pre20220112.ebuild b/dev-cpp/std-format/std-format-0_pre20220112-r1.ebuild
similarity index 97%
rename from dev-cpp/std-format/std-format-0_pre20220112.ebuild
rename to dev-cpp/std-format/std-format-0_pre20220112-r1.ebuild
index 1a13be61ca..bf72695584 100644
--- a/dev-cpp/std-format/std-format-0_pre20220112.ebuild
+++ b/dev-cpp/std-format/std-format-0_pre20220112-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/ananicy-cpp/stl-polyfills/${PN}/-/archive/${COMMIT}/
S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="CC0-1.0"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="test"
diff --git a/dev-cpp/tiny-dnn/tiny-dnn-1.0.0_alpha3-r1.ebuild b/dev-cpp/tiny-dnn/tiny-dnn-1.0.0_alpha3-r2.ebuild
similarity index 97%
rename from dev-cpp/tiny-dnn/tiny-dnn-1.0.0_alpha3-r1.ebuild
rename to dev-cpp/tiny-dnn/tiny-dnn-1.0.0_alpha3-r2.ebuild
index 7235c5afa3..2b7378778b 100644
--- a/dev-cpp/tiny-dnn/tiny-dnn-1.0.0_alpha3-r1.ebuild
+++ b/dev-cpp/tiny-dnn/tiny-dnn-1.0.0_alpha3-r2.ebuild
@@ -7,7 +7,7 @@ DOCS_BUILDER="sphinx"
DOCS_DEPEND="dev-python/recommonmark"
DOCS_DIR="docs"
MYPV="${PV/_alpha/a}"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit cmake python-any-r1 docs
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${MYPV}.tar.gz -> ${P
S="${WORKDIR}/${PN}-${MYPV}"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse double-precision opencl openmp +serialization tbb test" # TODO: cuda
diff --git a/dev-cpp/vexcl/vexcl-1.4.3-r1.ebuild b/dev-cpp/vexcl/vexcl-1.4.3-r2.ebuild
similarity index 99%
rename from dev-cpp/vexcl/vexcl-1.4.3-r1.ebuild
rename to dev-cpp/vexcl/vexcl-1.4.3-r2.ebuild
index 4d03273cb5..5d47f489b2 100644
--- a/dev-cpp/vexcl/vexcl-1.4.3-r1.ebuild
+++ b/dev-cpp/vexcl/vexcl-1.4.3-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ddemidov/vexcl"
SRC_URI="https://github.com/ddemidov/vexcl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE_BACKEND="
backend_compute
diff --git a/dev-cpp/wangle/wangle-2022.04.11.00.ebuild b/dev-cpp/wangle/wangle-2022.04.11.00-r1.ebuild
similarity index 98%
rename from dev-cpp/wangle/wangle-2022.04.11.00.ebuild
rename to dev-cpp/wangle/wangle-2022.04.11.00-r1.ebuild
index 2fa00be7d3..4969ffe702 100644
--- a/dev-cpp/wangle/wangle-2022.04.11.00.ebuild
+++ b/dev-cpp/wangle/wangle-2022.04.11.00-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/facebook/wangle"
SRC_URI="https://github.com/facebook/wangle/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="examples test"
diff --git a/dev-cpp/xdgpp/xdgpp-0_pre20201007.ebuild b/dev-cpp/xdgpp/xdgpp-0_pre20201007-r1.ebuild
similarity index 97%
rename from dev-cpp/xdgpp/xdgpp-0_pre20201007.ebuild
rename to dev-cpp/xdgpp/xdgpp-0_pre20201007-r1.ebuild
index 2a94506495..140637eaf3 100644
--- a/dev-cpp/xdgpp/xdgpp-0_pre20201007.ebuild
+++ b/dev-cpp/xdgpp/xdgpp-0_pre20201007-r1.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
@@ -19,7 +19,7 @@ SRC_URI="
S="${WORKDIR}"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="test"
diff --git a/dev-libs/fsst/Manifest b/dev-libs/fsst/Manifest
index 417198ca88..38a3f83ee1 100644
--- a/dev-libs/fsst/Manifest
+++ b/dev-libs/fsst/Manifest
@@ -1 +1 @@
-DIST fsst-0_pre20200830.tar.gz 32289281 BLAKE2B 21184f7d80193ebcc279f38b8fdc2be563a65a7296ce226c8ae4da19cbd946b1bb412c5f4c661e3ad0405b03b57f83b4257ecf78f9642fb09a9eccd56616a8b1 SHA512 9dd416d0a711a6c38e8e0d8b445f328e5826096293dc1f1152ae3e67470d2f8f1d9df2bb88815f1178b67c8cd0ad130f9fa9b59a9547bcc272d37782c239d7b7
+DIST fsst-0_pre20200830.gh.tar.gz 32289281 BLAKE2B 21184f7d80193ebcc279f38b8fdc2be563a65a7296ce226c8ae4da19cbd946b1bb412c5f4c661e3ad0405b03b57f83b4257ecf78f9642fb09a9eccd56616a8b1 SHA512 9dd416d0a711a6c38e8e0d8b445f328e5826096293dc1f1152ae3e67470d2f8f1d9df2bb88815f1178b67c8cd0ad130f9fa9b59a9547bcc272d37782c239d7b7
diff --git a/dev-libs/fsst/fsst-0_pre20200830.ebuild b/dev-libs/fsst/fsst-0_pre20200830-r1.ebuild
similarity index 89%
rename from dev-libs/fsst/fsst-0_pre20200830.ebuild
rename to dev-libs/fsst/fsst-0_pre20200830-r1.ebuild
index 6c49b03ba7..402640bea5 100644
--- a/dev-libs/fsst/fsst-0_pre20200830.ebuild
+++ b/dev-libs/fsst/fsst-0_pre20200830-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
COMMIT="fffb613071cb44319c0d6b743a8d6eafc2ed2ad7"
+
DESCRIPTION="Fast Static Symbol Table: fast text compression that allows random access"
HOMEPAGE="https://github.com/cwida/fsst"
-SRC_URI="https://github.com/cwida/fsst/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/cwida/fsst/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
BDEPEND="app-admin/chrpath"
diff --git a/dev-libs/memkind/Manifest b/dev-libs/memkind/Manifest
index a753c820a7..cb2fa92430 100644
--- a/dev-libs/memkind/Manifest
+++ b/dev-libs/memkind/Manifest
@@ -1,2 +1 @@
-DIST memkind-1.11.0.tar.gz 1072455 BLAKE2B 2de2cf053687ba2150f694e8c4143eeca74fc377feee2b6892067b661d8c58d7d5fcacb021fc92a47dad27f52aa4cbc6408cfede3141ab1f8ae81147b49aa6a7 SHA512 0b5bde35b3565c730fa954aebfe2ccbecd1e120c920d05acdbc0a74914731a90aeef8d57101f1f47bd35fd310bc143fa517bc871b32e592b8412384ff652fc05
DIST memkind-1.13.0.tar.gz 1111767 BLAKE2B fb2b0ca70b6da32b2bf42cba68f549c279f301f2c9b2eb2f7dfcb2909105bb1eb84bd6abdf15dfcb5f45a5e0bab7fbd0aef95ce090b06b02bc8ae099bdf1b0ca SHA512 509d49e3c67321496b322469d4bb13aa8b9038e94dc9bdfb379c38e86a5705ba13bc015443da8291be49711e14bce9845b697f62cfcc981168f255f9fb515b0e
diff --git a/dev-libs/memkind/memkind-1.11.0-r2.ebuild b/dev-libs/memkind/memkind-1.11.0-r2.ebuild
deleted file mode 100644
index f6d2be77a2..0000000000
--- a/dev-libs/memkind/memkind-1.11.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit autotools linux-info python-any-r1 toolchain-funcs
-
-DESCRIPTION="user extensible heap manager built on top of jemalloc"
-HOMEPAGE="https://memkind.github.io/memkind/"
-SRC_URI="https://github.com/memkind/memkind/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+daxctl debug decorators +heap-manager hwloc initial-exec-tls openmp secure test +tls"
-
-RDEPEND="
- daxctl? ( sys-block/ndctl )
- hwloc? ( sys-apps/hwloc )
- sys-process/numactl
-"
-DEPEND="
- ${RDEPEND}
- ${PYTHON_DEPS}
-"
-
-PATCHES=( "${FILESDIR}/${PN}-respect-ar.patch" )
-RESTRICT="test" # ERROR: ./test/test.sh requires a NUMA enabled system with more than one node.
-#RESTRICT="!test? ( test )"
-
-pkg_pretend() {
- linux-info_pkg_setup
- CONFIG_CHECK_MODULES=""
- if use daxctl; then
- CONFIG_CHECK_MODULES+="DEV_DAX_KMEM "
- fi
- if linux_config_exists; then
- for module in ${CONFIG_CHECK_MODULES}; do
- linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
- done
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
- cd jemalloc && eautoreconf
-}
-
-src_configure() {
- tc-export AR
- local myconf=(
- --disable-debug
- --disable-gcov
- --enable-shared
- --enable-static
- $(use_enable daxctl)
- $(use_enable decorators)
- $(use_enable debug debug-jemalloc)
- $(use_enable heap-manager)
- $(use_enable hwloc)
- $(use_enable initial-exec-tls memkind-initial-exec-tls)
- $(use_enable openmp)
- $(use_enable secure)
- $(use_enable tls)
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
- find "${ED}" -name '*.a' -delete || die
-}
-
-src_test() {
- addwrite /proc/sys/vm/nr_hugepages
- echo 3000 > /proc/sys/vm/nr_hugepages
- emake check
-}
diff --git a/dev-libs/memkind/memkind-1.13.0.ebuild b/dev-libs/memkind/memkind-1.13.0.ebuild
index a7059c9f00..181be56bb0 100644
--- a/dev-libs/memkind/memkind-1.13.0.ebuild
+++ b/dev-libs/memkind/memkind-1.13.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit autotools linux-info python-any-r1 toolchain-funcs
diff --git a/dev-libs/nativefiledialog-extended/Manifest b/dev-libs/nativefiledialog-extended/Manifest
index f151faaa8a..9c30db8404 100644
--- a/dev-libs/nativefiledialog-extended/Manifest
+++ b/dev-libs/nativefiledialog-extended/Manifest
@@ -1 +1 @@
-DIST nativefiledialog-extended-0_pre20210430.tar.gz 400551 BLAKE2B 3242bac8a8ec054853f9eac3cbbd09fd2389c1afa1c8bd314452b2d7b66b899c8fadd60f835e97bd7769457bed43bd3b684fdcb5b7480a3ca5ef6e5071fc9fd0 SHA512 049a19d39707476a609a6e22f70146df9e1533c5e93b349437d762673d6a1410777181fedff14ca6cf64e2c1e707c85f13d9101370aadbc79afd3795fac792a8
+DIST nativefiledialog-extended-0_pre20210430.gh.tar.gz 400551 BLAKE2B 3242bac8a8ec054853f9eac3cbbd09fd2389c1afa1c8bd314452b2d7b66b899c8fadd60f835e97bd7769457bed43bd3b684fdcb5b7480a3ca5ef6e5071fc9fd0 SHA512 049a19d39707476a609a6e22f70146df9e1533c5e93b349437d762673d6a1410777181fedff14ca6cf64e2c1e707c85f13d9101370aadbc79afd3795fac792a8
diff --git a/dev-libs/nativefiledialog-extended/nativefiledialog-extended-0_pre20210430.ebuild b/dev-libs/nativefiledialog-extended/nativefiledialog-extended-0_pre20210430-r1.ebuild
similarity index 88%
rename from dev-libs/nativefiledialog-extended/nativefiledialog-extended-0_pre20210430.ebuild
rename to dev-libs/nativefiledialog-extended/nativefiledialog-extended-0_pre20210430-r1.ebuild
index 1d195ef380..d287894b66 100644
--- a/dev-libs/nativefiledialog-extended/nativefiledialog-extended-0_pre20210430.ebuild
+++ b/dev-libs/nativefiledialog-extended/nativefiledialog-extended-0_pre20210430-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
COMMIT="322d1bc2a98c7b8236195d458643ac8e76391011"
@@ -9,11 +9,11 @@ inherit cmake
DESCRIPTION="File dialog library with C and C++ bindings, based on nativefiledialog"
HOMEPAGE="https://github.com/btzy/nativefiledialog-extended"
-SRC_URI="https://github.com/btzy/nativefiledialog-extended/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/btzy/nativefiledialog-extended/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="ZLIB"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
RDEPEND="x11-libs/gtk+:3"
diff --git a/dev-libs/protothreads/protothreads-1.4-r1.ebuild b/dev-libs/protothreads/protothreads-1.4-r2.ebuild
similarity index 98%
rename from dev-libs/protothreads/protothreads-1.4-r1.ebuild
rename to dev-libs/protothreads/protothreads-1.4-r2.ebuild
index c312adc83d..f117992e83 100644
--- a/dev-libs/protothreads/protothreads-1.4-r1.ebuild
+++ b/dev-libs/protothreads/protothreads-1.4-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
S="${WORKDIR}/pt-${PV}"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="doc examples"
diff --git a/dev-libs/zfp/Manifest b/dev-libs/zfp/Manifest
index dc662e908d..aab6009839 100644
--- a/dev-libs/zfp/Manifest
+++ b/dev-libs/zfp/Manifest
@@ -1 +1 @@
-DIST zfp-0.5.5.tar.gz 127482 BLAKE2B 2a3bfca4280c15c8679d1af23ff1b5e09de07060ecb120ce399a56bf598c7a934dbf8053ffd9b6bd26c81641d2f46557d5ad71c3abffefa475eaaaaaf28c8286 SHA512 c043cee73f6e972e047452552ab2ceb9247a6747fdb7e5f863aeab3a05208737c0bcabbe29f3c10e5c1aba961ec47aa6a0abdb395486fa0d5fb16a4ad45733c4
+DIST zfp-0.5.5.gh.tar.gz 127482 BLAKE2B 2a3bfca4280c15c8679d1af23ff1b5e09de07060ecb120ce399a56bf598c7a934dbf8053ffd9b6bd26c81641d2f46557d5ad71c3abffefa475eaaaaaf28c8286 SHA512 c043cee73f6e972e047452552ab2ceb9247a6747fdb7e5f863aeab3a05208737c0bcabbe29f3c10e5c1aba961ec47aa6a0abdb395486fa0d5fb16a4ad45733c4
diff --git a/dev-libs/zfp/zfp-0.5.5.ebuild b/dev-libs/zfp/zfp-0.5.5-r1.ebuild
similarity index 95%
rename from dev-libs/zfp/zfp-0.5.5.ebuild
rename to dev-libs/zfp/zfp-0.5.5-r1.ebuild
index 5b762715a8..85a472b7e0 100644
--- a/dev-libs/zfp/zfp-0.5.5.ebuild
+++ b/dev-libs/zfp/zfp-0.5.5-r1.ebuild
@@ -1,16 +1,16 @@
-# 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
#DOCS_BUILDER="sphinx"
#DOCS_DIR="docs/source"
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit cmake fortran-2 python-single-r1 #docs
DESCRIPTION="Compressed numerical arrays that support high-speed random access"
-SRC_URI="https://github.com/LLNL/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/LLNL/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
HOMEPAGE="
https://computing.llnl.gov/projects/zfp
https://zfp.io
diff --git a/dev-ml/gapi-ocaml/gapi-ocaml-0.4.2.ebuild b/dev-ml/gapi-ocaml/gapi-ocaml-0.4.2-r1.ebuild
similarity index 97%
rename from dev-ml/gapi-ocaml/gapi-ocaml-0.4.2.ebuild
rename to dev-ml/gapi-ocaml/gapi-ocaml-0.4.2-r1.ebuild
index 3380c8279d..4abebaa300 100644
--- a/dev-ml/gapi-ocaml/gapi-ocaml-0.4.2.ebuild
+++ b/dev-ml/gapi-ocaml/gapi-ocaml-0.4.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
SRC_URI="https://github.com/astrada/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="ocamlopt test"
diff --git a/dev-ml/ocamlfuse/Manifest b/dev-ml/ocamlfuse/Manifest
index f94f2f6667..3a0975208f 100644
--- a/dev-ml/ocamlfuse/Manifest
+++ b/dev-ml/ocamlfuse/Manifest
@@ -1 +1 @@
-DIST ocamlfuse-2.7.1_p7.tar.gz 21469 BLAKE2B fa587d19124c2e2d320091bb42b098644d3112e39652dbf621c88f701effdab0ce15372b6f2461709eb3afe628e2888db3a7a0c9abeab8b8a136d09c69c84ac4 SHA512 342a6ce8a81ac05d47d4458ef6e9aa750e4e7643a89d28705664852f0549e1932643e8db5d93225ba496611654b3f11fef6aca1e6e40e8d4b30064fc9c65f7fd
+DIST ocamlfuse-2.7.1_p7-r1.tar.gz 21469 BLAKE2B fa587d19124c2e2d320091bb42b098644d3112e39652dbf621c88f701effdab0ce15372b6f2461709eb3afe628e2888db3a7a0c9abeab8b8a136d09c69c84ac4 SHA512 342a6ce8a81ac05d47d4458ef6e9aa750e4e7643a89d28705664852f0549e1932643e8db5d93225ba496611654b3f11fef6aca1e6e40e8d4b30064fc9c65f7fd
diff --git a/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7.ebuild b/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild
similarity index 97%
rename from dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7.ebuild
rename to dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild
index c66afc07a8..fdf08ccbc3 100644
--- a/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7.ebuild
+++ b/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/astrada/${PN}/archive/v${MYPV}.tar.gz -> ${PF}.tar.g
S="${WORKDIR}/${PN}-${MYPV}"
LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="ocamlopt"
diff --git a/dev-octave/control/metadata.xml b/dev-octave/control/metadata.xml
index 4e993b7c8b..1257de9dc3 100644
--- a/dev-octave/control/metadata.xml
+++ b/dev-octave/control/metadata.xml
@@ -20,7 +20,7 @@
lukas.reichlin@gmail.com
Lukas Reichlin
- octave/control
+ octave
Computer-Aided Control System Design (CACSD) Tools for GNU Octave, based on the proven SLICOT Library
diff --git a/dev-octave/dataframe/metadata.xml b/dev-octave/dataframe/metadata.xml
index cbb8ac9cca..a158852434 100644
--- a/dev-octave/dataframe/metadata.xml
+++ b/dev-octave/dataframe/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/dataframe/NEWS.html
https://octave.sourceforge.io/dataframe/overview.html
- octave/dataframe
+ octave
diff --git a/dev-octave/fuzzy-logic-toolkit/metadata.xml b/dev-octave/fuzzy-logic-toolkit/metadata.xml
index 0252ac92b7..5d1e0e5dbf 100644
--- a/dev-octave/fuzzy-logic-toolkit/metadata.xml
+++ b/dev-octave/fuzzy-logic-toolkit/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/fuzzy-logic-toolkit/NEWS.html
https://octave.sourceforge.io/fuzzy-logic-toolkit/overview.html
- octave/fuzzy-logic-toolkit
+ octave
diff --git a/dev-octave/ga/metadata.xml b/dev-octave/ga/metadata.xml
index 1f7c55d809..d8f6dd62f7 100644
--- a/dev-octave/ga/metadata.xml
+++ b/dev-octave/ga/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/ga/NEWS.html
https://octave.sourceforge.io/ga/overview.html
- octave/ga
+ octave
diff --git a/dev-octave/instrument-control/metadata.xml b/dev-octave/instrument-control/metadata.xml
index 6b3d4add3d..ac12e1825a 100644
--- a/dev-octave/instrument-control/metadata.xml
+++ b/dev-octave/instrument-control/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/instrument-control/NEWS.html
https://octave.sourceforge.io/instrument-control/overview.html
- octave/instrument-control
+ octave
diff --git a/dev-octave/io/metadata.xml b/dev-octave/io/metadata.xml
index 6ea8c00d53..b538157ddd 100644
--- a/dev-octave/io/metadata.xml
+++ b/dev-octave/io/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/io/NEWS.html
https://octave.sourceforge.io/io/overview.html
- octave/io
+ octave
diff --git a/dev-octave/linear-algebra/metadata.xml b/dev-octave/linear-algebra/metadata.xml
index a60f6e2db0..a9abc069f5 100644
--- a/dev-octave/linear-algebra/metadata.xml
+++ b/dev-octave/linear-algebra/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/linear-algebra/NEWS.html
https://octave.sourceforge.io/linear-algebra/overview.html
- octave/linear-algebra
+ octave
diff --git a/dev-octave/miscellaneous/metadata.xml b/dev-octave/miscellaneous/metadata.xml
index c2336228aa..5741f72c56 100644
--- a/dev-octave/miscellaneous/metadata.xml
+++ b/dev-octave/miscellaneous/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/miscellaneous/NEWS.html
https://octave.sourceforge.io/miscellaneous/overview.html
- octave/miscellaneous
+ octave
diff --git a/dev-octave/ocl/metadata.xml b/dev-octave/ocl/metadata.xml
index a29103c3d4..4a0e846760 100644
--- a/dev-octave/ocl/metadata.xml
+++ b/dev-octave/ocl/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/ocl/NEWS.html
https://octave.sourceforge.io/ocl/overview.html
- octave/ocl
+ octave
diff --git a/dev-octave/optim/metadata.xml b/dev-octave/optim/metadata.xml
index 194fef8a0c..b54b7c1338 100644
--- a/dev-octave/optim/metadata.xml
+++ b/dev-octave/optim/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/optim/NEWS.html
https://octave.sourceforge.io/optim/overview.html
- octave/optim
+ octave
diff --git a/dev-octave/optiminterp/metadata.xml b/dev-octave/optiminterp/metadata.xml
index b061e601f2..8895543b69 100644
--- a/dev-octave/optiminterp/metadata.xml
+++ b/dev-octave/optiminterp/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/optiminterp/NEWS.html
https://octave.sourceforge.io/optiminterp/overview.html
- octave/optiminterp
+ octave
diff --git a/dev-octave/quaternion/metadata.xml b/dev-octave/quaternion/metadata.xml
index d759280613..61c0272e84 100644
--- a/dev-octave/quaternion/metadata.xml
+++ b/dev-octave/quaternion/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/quaternion/NEWS.html
https://octave.sourceforge.io/quaternion/overview.html
- octave/quaternion
+ octave
diff --git a/dev-octave/splines/metadata.xml b/dev-octave/splines/metadata.xml
index ff572fbfd0..ad0f5b2daf 100644
--- a/dev-octave/splines/metadata.xml
+++ b/dev-octave/splines/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/splines/NEWS.html
https://octave.sourceforge.io/splines/overview.html
- octave/splines
+ octave
diff --git a/dev-octave/statistics/metadata.xml b/dev-octave/statistics/metadata.xml
index ccc943d0d1..0b9f78931d 100644
--- a/dev-octave/statistics/metadata.xml
+++ b/dev-octave/statistics/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/statistics/NEWS.html
https://octave.sourceforge.io/statistics/overview.html
- octave/statistics
+ octave
diff --git a/dev-octave/strings/files/strings-1.2.0-156.patch b/dev-octave/strings/files/strings-1.2.0-156.patch
new file mode 100644
index 0000000000..a72fd5ce84
--- /dev/null
+++ b/dev-octave/strings/files/strings-1.2.0-156.patch
@@ -0,0 +1,224 @@
+changeset: 156:db1ee7036df0
+user: Oliver Heimlich
+date: Tue Jul 07 22:46:46 2015 +0200
+summary: base64decode.m: Cleanup of function code and fix of bug #38974
+
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,11 @@
++Summary of important user-visible changes for strings 1.2.1:
++-------------------------------------------------------------------
++
++ ** The function base64decode has been almost rewritten and no longer returns
++ trailing zeros which have been introduced by padding (bug #38974), returns
++ uint8 vectors instead of binary64 vectors, and should perform faster.
++
++
+ Summary of important user-visible changes for strings 1.2.0:
+ -------------------------------------------------------------------
+
+--- a/inst/base64decode.m
++++ b/inst/base64decode.m
+@@ -1,4 +1,5 @@
+ ## Copyright (C) 2007 Muthiah Annamalai
++## Copyright (C) 2015 Oliver Heimlich
+ ##
+ ## This program is free software; you can redistribute it and/or modify it under
+ ## the terms of the GNU General Public License as published by the Free Software
+@@ -18,7 +19,8 @@
+ ## @deftypefnx {Function File} {@var{rval} =} base64decode (@var{code}, @var{as_string})
+ ## Convert a base64 @var{code} (a string of printable characters according to RFC 2045)
+ ## into the original ASCII data set of range 0-255. If option @var{as_string} is
+-## passed, the return value is converted into a string.
++## passed, the return value is converted into a string. Otherwise, the return
++## value is a uint8 row vector.
+ ##
+ ## @example
+ ## @group
+@@ -32,125 +34,84 @@
+ ## @seealso {base64encode}
+ ## @end deftypefn
+
+-function z = base64decode (X, as_string)
+- if (nargin < 1 )
++function Z = base64decode (X, as_string)
++ if (nargin < 1 || nargin > 2)
+ print_usage;
+- elseif nargin == 1
+- as_string=false;
++ elseif (nargin == 1)
++ as_string = false;
+ endif
+
+- if ( any(X(:) < 0) || any(X(:) > 255))
+- error("base64decode is expecting integers in the range 0 .. 255");
++ ## strip white space
++ X((X == ' ') | (X == "\n") | (X == "\r")) = [];
++
++ if (any (X(:) < 0) || any(X(:) > 255))
++ error ("base64decode is expecting integers in the range 0 .. 255");
+ endif
+
+- ## decompose strings into the 4xN matrices
+- ## formatting issues.
+- if( rows(X) == 1 )
+- Y=[];
+- L=length(X);
+- for z=4:4:L
+- Y=[Y X(z-3:z)']; #keep adding columns
+- end
+- if min(size(Y))==1
+- Y=reshape(Y,[L, 1]);
+- else
+- Y=reshape(Y,[4,L/4]);
+- end
+- X=Y;
+- Y=[];
+- end
+-
+- X = toascii(X);
+- Xa= X;
+-
+- ## Work backwards. Starting at step in table,
+- ## lookup the index of the element in the table.
++ ## convert into ascii code and 8 bit integers to save memory
++ X = uint8 (X);
+
+- ## 6-bit encoding table, plus 1 for padding
+- ## 26*2 + 10 + 2 + 1 = 64 + 1, '=' is EOF stop mark.
+- table = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+-
+- S=size(X);
+- SRows=S(1);
+- SCols=S(2);
+- Y=zeros(S);
+-
+- ## decode the incoming matrix &
++ ## decompose into the 4xN matrices - separation of encoded 3 byte blocks
++ if (rows (X) ~= 4)
++ if (rem (numel (X), 4) ~= 0)
++ error ("base64decode is expecting blocks of 4 characters to decode");
++ endif
++ X = reshape (X, [4, numel(X)./4]);
++ endif
++
++ ## decode 6-bit values from the incoming matrix &
+ ## write the values into Va matrix.
+- Va = -1*ones(size(Xa));
++ Va = ones (size(X), 'uint8') .* 65;
+
+- iAZ = (Xa >= 'A').*(Xa <= 'Z') > 0;
+- Va(iAZ)=Xa(iAZ)-'A';
+-
+- iaz = (Xa >= 'a').*(Xa <= 'z') > 0;
+- Va(iaz)=Xa(iaz)-'a'+26;
++ iAZ = ((X >= 'A') & (X <= 'Z'));
++ Va(iAZ) = X(iAZ) - 'A';
+
+- i09 = (Xa >= '0').*(Xa <= '9') > 0;
+- Va(i09)=Xa(i09)-'0'+52;
++ iaz = ((X >= 'a') & (X <= 'z'));
++ Va(iaz) = X(iaz) - 'a' + 26;
+
+- is = (Xa == '/') ; Va(is) = 63;
+- ip = (Xa == '+') ; Va(ip) = 62;
+- ieq = (Xa == '=') ; Va(ieq) = 0;
+- clear is; clear ieq; clear ip; clear i09;
+- clear iaz; clear iAZ; clear Xa; clear X;
++ i09 = ((X >= '0') & (X <= '9'));
++ Va(i09) = X(i09) - '0' + 52;
+
+- Y=Va; clear Va;
+- Y1=Y(1,:);
+- if (SRows > 1)
+- Y2=Y(2,:);
+- else
+- Y2=zeros(1,SCols);
+- end;
+-
+- if (SRows > 2)
+- Y3=Y(3,:);
+- else
+- Y3=zeros(1,SCols);
+- end;
+-
+- if (SRows > 3)
+- Y4=Y(4,:);
+- else
+- Y4=zeros(1,SCols);
+- end;
++ Va(X == '+') = 62;
++ Va(X == '/') = 63;
++
++ padding = (X == '=');
++ Va(padding) = 0;
++
++ if (any (any (Va == 65)))
++ error ('base64decode is expecting valid characters A..Za..z0..9+/=');
++ endif
++
++ if (not (isempty (X)) && ...
++ (find (padding, 1) < numel (X) - 1 || ...
++ (X(end - 1) == '=' && X(end) ~= '=')))
++ error ('base64decode is expecting max two padding characters at the end');
++ endif
++
++ ## decode 4x6 bit into 3x8 bit
++ B = vertcat (...
++ Va(1, :) .* 4 + (Va(2, :) - rem (Va(2, :), 16)) ./ 16, ...
++ rem (Va(2, :), 16) .* 16 + (Va(3, :) - rem (Va(3, :), 4)) ./ 4, ...
++ rem (Va(3, :), 4) .* 64 + Va(4, :));
+
+- ## +1 not required due to ASCII subtraction
+- ## actual decoding work
+- b1 = Y1*4 + fix(Y2/16);
+- b2 = mod(Y2,16)*16+fix(Y3/4);
+- b3 = mod(Y3,4)*64 + Y4;
+-
+- ZEROS=sum(sum(Y==0));
+- L=length(b1)*3;
+- z=zeros(1,L);
+- z(1:3:end)=b1;
+- if (SRows > 1)
+- z(2:3:end)=b2;
+- else
+- z(2:3:end)=[];
+- end;
+-
+- if (SRows > 2)
+- z(3:3:end)=b3;
+- else
+- z(3:3:end)=[];
+- end
+-
+- ## FIXME
+- ## is this expected behaviour?
+- if ( as_string )
+- L=length(z);
+- while ( ( L > 0) && ( z(L)==0 ) )
+- L=L-1;
+- end
+- z=char(z(1:L));
++ ## Convert blocks into row vector
++ Z = B(:).';
++
++ ## Remove byte blocks which have been introduced by padding
++ if (not (isempty (X)))
++ Z(end - sum (padding(end - 1 : end)) + 1 : end) = [];
++ endif
++
++ if (as_string)
++ Z = char (Z);
+ end
+
+ endfunction
+
+ %!assert(base64decode(base64encode('Hakuna Matata'),true),'Hakuna Matata')
+-%!assert(base64decode(base64encode([1:255])),[1:255])
++%!assert(base64decode(base64encode([1:255])),uint8([1:255]))
+ %!assert(base64decode(base64encode('taken'),true),'taken')
+ %!assert(base64decode(base64encode('sax'),true),'sax')
+ %!assert(base64decode(base64encode('H'),true),'H')
++%!assert(base64decode(base64encode('H'),false),uint8('H'))
+ %!assert(base64decode(base64encode('Ta'),true),'Ta')
+
diff --git a/dev-octave/strings/files/strings-1.2.0-157.patch b/dev-octave/strings/files/strings-1.2.0-157.patch
new file mode 100644
index 0000000000..b323816ab9
--- /dev/null
+++ b/dev-octave/strings/files/strings-1.2.0-157.patch
@@ -0,0 +1,351 @@
+changeset: 157:e1a7916b66a9
+user: John Donoghue
+date: Thu Jan 09 16:37:00 2020 -0500
+summary: Add configure scripts to detect new octave functionality (Bug #55385)
+
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,8 @@
++Summary of important user-visible changes for strings 1.2.1+:
++-------------------------------------------------------------------
++
++ ** Update package to compile in GNU Octave 5+
++
+ Summary of important user-visible changes for strings 1.2.1:
+ -------------------------------------------------------------------
+
+@@ -5,7 +10,6 @@
+ trailing zeros which have been introduced by padding (bug #38974), returns
+ uint8 vectors instead of binary64 vectors, and should perform faster.
+
+-
+ Summary of important user-visible changes for strings 1.2.0:
+ -------------------------------------------------------------------
+
+--- a/src/Makefile
++++ /dev/null
+@@ -1,11 +0,0 @@
+-OCTAVE ?= octave
+-MKOCTFILE ?= mkoctfile -Wall
+-
+-PCRE_SWITCHES := $(shell $(OCTAVE) \
+- --no-gui --no-init-file --no-site-file --silent --no-history \
+- --eval 'disp (octave_config_info ("PCRE_LIBS"));' \
+- --eval 'disp (octave_config_info ("PCRE_CPPFLAGS"));' \
+- )
+-
+-pcregexp.oct: %.oct: %.cc
+- $(MKOCTFILE) $(PCRE_SWITCHES) -o $@ $<
+--- /dev/null
++++ b/src/Makefile.in
+@@ -0,0 +1,42 @@
++# Makefile for strings package for Octave
++#
++# Copyright (C) 2019 John Donoghue
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, see .
++
++
++# before cross building, pre-build at least $(TEXIFILE) natively,
++# e.g. with targets 'doc', 'html', or 'prebuild'
++
++PCRE_CXXFLAGS ?= @PCRE_CFLAGS@
++PCRE_LIBS ?= @PCRE_LIBS@
++
++MKOCTFILE ?= @MKOCTFILE@
++
++.PHONY: all clean distclean maintainer-clean
++
++all: pcregexp.oct
++
++%.oct: %.cc
++ $(MKOCTFILE) -o $@ $< $(PCRE_CXXFLAGS) $(PCRE_LIBS)
++
++clean:
++ $(RM) *.o octave-core *.oct *~
++
++distclean: clean
++ $(RM) config.h config.log config.status Makefile oct-alt-includes.h
++ $(RM) -r autom4te.cache
++
++maintainer-clean: distclean
++ $(RM) configure config.h.in aclocal.m4
+--- /dev/null
++++ b/src/bootstrap
+@@ -0,0 +1,7 @@
++#! /bin/sh
++
++aclocal
++
++autoconf
++
++autoheader -f
+--- /dev/null
++++ b/src/configure.ac
+@@ -0,0 +1,102 @@
++# -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++#
++### Copyright (C) 2015-2018 Olaf Till
++### Copyright (C) 2019 John Donoghue
++###
++### This program is free software; you can redistribute it and/or
++### modify it under the terms of the GNU General Public License as
++### published by the Free Software Foundation; either version 3 of the
++### License, or (at your option) any later version.
++###
++### This program is distributed in the hope that it will be useful,
++### but WITHOUT ANY WARRANTY; without even the implied warranty of
++### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++### General Public License for more details.
++###
++### You should have received a copy of the GNU General Public License
++### along with this program; if not, see
++### .
++
++AC_PREREQ([2.67])
++AC_INIT([strings], [1.2.0])
++AC_CONFIG_SRCDIR([pcregexp.cc])
++AC_CONFIG_HEADERS([config.h])
++
++# Avoid warnings for redefining AH-generated preprocessor symbols of
++# Octave.
++AH_TOP([#include "undef-ah-octave.h"])
++
++AC_CONFIG_MACRO_DIRS([m4])
++
++# Checks for programs.
++AC_CHECK_PROG(MKOCTFILE, mkoctfile, mkoctfile)
++if test -z "$MKOCTFILE"; then
++AC_MSG_ERROR([mkoctfile not found], 1);
++fi
++AC_CHECK_PROG(OCTAVE_CONFIG, octave-config, octave-config)
++if test -z "$OCTAVE_CONFIG"; then
++AC_MSG_ERROR([octave-config not found], 1);
++fi
++
++#AC_CHECK_TOOL(PKG_CONFIG, pkg-config, [])
++#if test -z "$PKG_CONFIG"; then
++# AC_MSG_ERROR([pkg-config not found], 1);
++#fi
++
++
++# The same value of CXX as Octave was compiled with is supposed to be used.
++CXX=${CXX:-`${MKOCTFILE} -p CXX`}
++AC_PROG_CXX
++
++AC_PROG_CXXCPP
++
++# Checks for typedefs, structures, and compiler characteristics.
++
++# Checks for library functions.
++PKG_CHECK_MODULES([PCRE],[libpcre],
++ [],
++ [AC_MSG_ERROR([libpcre not found])]
++)
++
++
++# Start of checks for Octave features, preparations for checks.
++OCTLIBDIR=${OCTLIBDIR:-`$OCTAVE_CONFIG -p OCTLIBDIR`}
++## We need Octaves include path both with and without '/octave'
++## appended. The path without '/octave' is needed to selectively test
++## for Octave headers, like octave/....h. The path with '/octave' is
++## needed since some Octave headers contain include directives for
++## other Octave headers with <> instead of "".
++OCTINCLUDEDIR=${OCTINCLUDEDIR:-`$MKOCTFILE -p INCFLAGS`}
++AC_LANG_PUSH([C++])
++TCXXFLAGS=$CXXFLAGS
++TLDFLAGS=$LDFLAGS
++TLIBS=$LIBS
++TCPPFLAGS=$CPPFLAGS
++LDFLAGS="-L$OCTLIBDIR $LDFLAGS"
++LIBS="-loctinterp $LIBS"
++# CXXFLAGS=
++CPPFLAGS="$OCTINCLUDEDIR $CPPFLAGS"
++
++## Simple symbol alternatives of different Octave versions.
++OF_OCTAVE_LIST_ALT_SYMS([
++[dnl
++ [gripe_wrong_type_arg],
++ [err_wrong_type_arg],
++ [[err_wrong_type_arg("test");]],
++ [OCTAVE__WRONG_TYPE_ARG],
++ [],
++ []
++]
++],
++ [oct-alt-includes.h])
++
++LIBS=$TLIBS
++LDFLAGS=$TLDFLAGS
++CXXFLAGS=$TCXXFLAGS
++CPPFLAGS=$TCPPFLAGS
++AC_LANG_POP([C++])
++# End of checks for Octave features.
++
++AC_CONFIG_FILES([Makefile])
++AC_OUTPUT
+--- /dev/null
++++ b/src/m4/octave-forge.m4
+@@ -0,0 +1,93 @@
++# Copyright (C) 2017-2018 Olaf Till
++# Modifications to print what is searching for by JohnD
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, see .
++
++# arguments of OF_OCTAVE_ALT_SYMS (see also description of
++# OF_OCTAVE_LIST_ALT_SYMS below):
++#
++# $1: symbol version 1
++# $2: symbol version 2
++# $3: test for symbol version 2
++# $4: macro name to access alternative symbols
++# $5: include directives for symbol version 1
++# $6: include directives for symbol version 2
++# (a list of lists of args 1--6 is $1 of OF_OCTAVE_LIST_ALT_SYMS)
++# $7: name of generated include file with alternatives of Octave headers
++# (arg7 is $2 of OF_OCTAVE_LIST_ALT_SYMS)
++AC_DEFUN([OF_OCTAVE_ALT_SYMS], [
++AC_MSG_CHECKING([$1 or $2])
++ AC_COMPILE_IFELSE(
++ [AC_LANG_PROGRAM([[#include ]
++ $6],
++ [$3])],
++ [AC_DEFINE($4,
++ [[$2]],
++ [macro for alternative Octave symbols])
++ AC_MSG_RESULT([$2])
++ echo '$6' >> $7],
++ [AC_DEFINE($4,
++ [[$1]],
++ [macro for alternative Octave symbols])
++ AC_MSG_RESULT([$1])
++ echo '$5' >> $7]
++)
++])
++
++
++# OF_OCTAVE_LIST_ALT_SYMS is called in the following way:
++#
++# OF_OCTAVE_LIST_ALT_SYMS([
++# [dnl
++# [old_octave_symbol],
++# [new_octave_symbol],
++# [[compilation test]
++# [for new_octave_symbol]],
++# [NAME_OF_GENERATED_MACRO____WILL_EXPAND_TO_OLD_OR_NEW_SYMBOL],
++# [[include directives]
++# [except #include ]
++# [necessary to compile with old_octave_symbol]],
++# [[include directives]
++# [except #include ]
++# [nessary to compile with new_octave_symbol]
++# [and to compile the test]]
++# ],
++#
++# ... further such lists as the above
++#
++# ],
++#
++# [name-of-header-file-for-alternative-octave-iclude-directives.h])
++#
++#
++# This file should be put into src/m4/, and the line
++#
++# AC_CONFIG_MACRO_DIRS([m4])
++#
++# should be put into src/configure.ac. The package should use
++# autoheader to generate config.h.in (src/bootstrap should contain the
++# lines 'aclocal', 'autoconf', and 'autoheader -f'). Package code
++# should include config.h and use the generated macros to access the
++# alternative symbols of Octave. An example of a call to
++# OF_OCTAVE_LIST_ALT_SYMS in src/configure.ac is available together
++# with this file.
++AC_DEFUN([OF_OCTAVE_LIST_ALT_SYMS], [
++
++echo '/* generated by configure */' > $2
++
++m4_foreach([it], [$1], [m4_apply([OF_OCTAVE_ALT_SYMS], [it, $2])])
++
++AH_BOTTOM([#include "$2"])
++
++])
+--- a/src/pcregexp.cc
++++ b/src/pcregexp.cc
+@@ -1,4 +1,4 @@
+-// Copyright (C) 2004 Stefan van der Walt
++// Copyright (C) 2004-2019 Stefan van der Walt
+ // All rights reserved.
+ //
+ // Redistribution and use in source and binary forms, with or without
+@@ -26,6 +26,8 @@
+ #include
+ #include
+
++#include "config.h"
++
+ //FIXME This function needs some documentation
+ DEFUN_DLD(pcregexp, args, nargout, "\
+ -*- texinfo -*-\n\
+@@ -49,7 +51,7 @@
+ std::string pattern = args(0).string_value();
+ std::string input = args(1).string_value();
+ if (error_state) {
+- gripe_wrong_type_arg("pcregexp", args(0));
++ OCTAVE__WRONG_TYPE_ARG("pcregexp", args(0));
+ return retval;
+ }
+
+--- /dev/null
++++ b/src/undef-ah-octave.h
+@@ -0,0 +1,27 @@
++/* To be included at the top of config.h (by autoheader). Avoid
++ warnings for redefining AH-generated preprocessor symbols of
++ Octave. */
++
++#ifdef PACKAGE_BUGREPORT
++#undef PACKAGE_BUGREPORT
++#endif
++
++#ifdef PACKAGE_NAME
++#undef PACKAGE_NAME
++#endif
++
++#ifdef PACKAGE_STRING
++#undef PACKAGE_STRING
++#endif
++
++#ifdef PACKAGE_TARNAME
++#undef PACKAGE_TARNAME
++#endif
++
++#ifdef PACKAGE_URL
++#undef PACKAGE_URL
++#endif
++
++#ifdef PACKAGE_VERSION
++#undef PACKAGE_VERSION
++#endif
+
diff --git a/dev-octave/strings/files/strings-1.2.0-158.patch b/dev-octave/strings/files/strings-1.2.0-158.patch
new file mode 100644
index 0000000000..47b30834b9
--- /dev/null
+++ b/dev-octave/strings/files/strings-1.2.0-158.patch
@@ -0,0 +1,17 @@
+changeset: 158:2db1dbb75557
+user: John Donoghue
+date: Thu Jan 09 16:38:52 2020 -0500
+summary: * inst/base64encode.m: dont use depreciated toascii
+
+--- a/inst/base64encode.m
++++ b/inst/base64encode.m
+@@ -46,7 +46,7 @@
+ endif
+
+ if (ischar (X))
+- X = toascii (X);
++ X = double (X);
+ endif
+
+ if (any (X != fix (X)) || any (X < 0 | X > 255))
+
diff --git a/dev-octave/strings/files/strings-1.2.0-160.patch b/dev-octave/strings/files/strings-1.2.0-160.patch
new file mode 100644
index 0000000000..35c4917c65
--- /dev/null
+++ b/dev-octave/strings/files/strings-1.2.0-160.patch
@@ -0,0 +1,20 @@
+changeset: 160:98fa88db1ba8
+tag: tip
+user: Markus Mützel
+date: Sun Nov 28 22:02:20 2021 +0100
+summary: Fix compilation with Octave 8 (bug #61578).
+
+--- a/src/pcregexp.cc
++++ b/src/pcregexp.cc
+@@ -50,10 +50,6 @@
+
+ std::string pattern = args(0).string_value();
+ std::string input = args(1).string_value();
+- if (error_state) {
+- OCTAVE__WRONG_TYPE_ARG("pcregexp", args(0));
+- return retval;
+- }
+
+ // Compile expression
+ pcre *re;
+
diff --git a/dev-octave/strings/files/strings-1.2.0-build-against-octave-6.patch b/dev-octave/strings/files/strings-1.2.0-build-against-octave-6.patch
deleted file mode 100644
index 1390153b4c..0000000000
--- a/dev-octave/strings/files/strings-1.2.0-build-against-octave-6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Build against Octave 6.1
- Replace the calls to the deprecated function toascii by double.
-Author: Rafael Laboissière
-Origin: upstream, https://sourceforge.net/p/octave/strings/ci/2db1dbb75557eef94605cb4ac682783ab78ac8d8/
-Bug-Debian: https://bugs.debian.org/976200
-Forwarded: not-needed
-Last-Update: 2020-12-01
-
---- octave-strings-1.2.0.orig/inst/base64encode.m
-+++ octave-strings-1.2.0/inst/base64encode.m
-@@ -46,7 +46,7 @@ function Y = base64encode (X, row_vector
- endif
-
- if (ischar (X))
-- X = toascii (X);
-+ X = double (X);
- endif
-
- if (any (X != fix (X)) || any (X < 0 | X > 255))
---- octave-strings-1.2.0.orig/inst/base64decode.m
-+++ octave-strings-1.2.0/inst/base64decode.m
-@@ -60,7 +60,7 @@ function z = base64decode (X, as_string)
- Y=[];
- end
-
-- X = toascii(X);
-+ X = double(X);
- Xa= X;
-
- ## Work backwards. Starting at step in table,
diff --git a/dev-octave/strings/files/strings-1.2.0-err-instead-of-gripes.patch b/dev-octave/strings/files/strings-1.2.0-err-instead-of-gripes.patch
deleted file mode 100644
index 9b9017cade..0000000000
--- a/dev-octave/strings/files/strings-1.2.0-err-instead-of-gripes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Use err_* functions instead of the deprecated gripes_*
-Author: Rafael Laboissiere
-Forwarded: https://savannah.gnu.org/bugs/index.php?57000
-Last-Update: 2019-10-05
-
---- octave-strings-1.2.0.orig/src/pcregexp.cc
-+++ octave-strings-1.2.0/src/pcregexp.cc
-@@ -49,7 +49,7 @@ Check your system's @code{pcre} man page
- std::string pattern = args(0).string_value();
- std::string input = args(1).string_value();
- if (error_state) {
-- gripe_wrong_type_arg("pcregexp", args(0));
-+ err_wrong_type_arg("pcregexp", args(0));
- return retval;
- }
-
diff --git a/dev-octave/strings/metadata.xml b/dev-octave/strings/metadata.xml
index f4d9598ece..e8cd102b2c 100644
--- a/dev-octave/strings/metadata.xml
+++ b/dev-octave/strings/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/strings/NEWS.html
https://octave.sourceforge.io/strings/overview.html
- octave/strings
+ octave
diff --git a/dev-octave/strings/strings-1.2.0.ebuild b/dev-octave/strings/strings-1.2.0_p20211128.ebuild
similarity index 60%
rename from dev-octave/strings/strings-1.2.0.ebuild
rename to dev-octave/strings/strings-1.2.0_p20211128.ebuild
index 4096b09d40..3a96a84df4 100644
--- a/dev-octave/strings/strings-1.2.0.ebuild
+++ b/dev-octave/strings/strings-1.2.0_p20211128.ebuild
@@ -3,10 +3,15 @@
EAPI=8
+MYPV="$(ver_cut 1-3)"
+MYP="${PN}-${MYPV}"
+
inherit octaveforge
DESCRIPTION="Additional functions for manipulation and analysis of strings"
HOMEPAGE="https://octave.sourceforge.io/strings/index.html"
+SRC_URI="mirror://sourceforge/octave/${MYP}.tar.gz"
+S="${WORKDIR}/${MYP}"
LICENSE="GPL-3+ BSD-2"
SLOT="0"
@@ -19,6 +24,12 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${P}-build-against-octave-6.patch"
- "${FILESDIR}/${P}-err-instead-of-gripes.patch"
+ "${FILESDIR}/${MYP}-156.patch"
+ "${FILESDIR}/${MYP}-157.patch"
+ "${FILESDIR}/${MYP}-158.patch"
+ "${FILESDIR}/${MYP}-160.patch"
)
+
+src_unpack() {
+ default
+}
diff --git a/dev-octave/struct/metadata.xml b/dev-octave/struct/metadata.xml
index 774df48eef..3a08ec04b6 100644
--- a/dev-octave/struct/metadata.xml
+++ b/dev-octave/struct/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/struct/NEWS.html
https://octave.sourceforge.io/struct/overview.html
- octave/struct
+ octave
diff --git a/dev-octave/symbolic/metadata.xml b/dev-octave/symbolic/metadata.xml
index 3799cad0c5..79852d2838 100644
--- a/dev-octave/symbolic/metadata.xml
+++ b/dev-octave/symbolic/metadata.xml
@@ -9,6 +9,6 @@
https://octave.sourceforge.io/symbolic/NEWS.html
https://octave.sourceforge.io/symbolic/overview.html
- octave/symbolic
+ octave
diff --git a/dev-python/MutatorMath/MutatorMath-3.0.1.ebuild b/dev-python/MutatorMath/MutatorMath-3.0.1.ebuild
index e6face0569..3374386526 100644
--- a/dev-python/MutatorMath/MutatorMath-3.0.1.ebuild
+++ b/dev-python/MutatorMath/MutatorMath-3.0.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
SRC_URI="https://github.com/LettError/MutatorMath/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
DESCRIPTION="A library for piecewise linear interpolation in multiple dimensions"
HOMEPAGE="https://github.com/LettError/MutatorMath"
LICENSE="BSD"
diff --git a/dev-python/WSME/WSME-0.11.0.ebuild b/dev-python/WSME/WSME-0.11.0.ebuild
index 5ac6ded6dd..0e62785a0e 100644
--- a/dev-python/WSME/WSME-0.11.0.ebuild
+++ b/dev-python/WSME/WSME-0.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/automaton/automaton-2.5.0.ebuild b/dev-python/automaton/automaton-2.5.0.ebuild
index a801cb94a2..ab764725d6 100644
--- a/dev-python/automaton/automaton-2.5.0.ebuild
+++ b/dev-python/automaton/automaton-2.5.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/axisregistry/axisregistry-0.2.0.ebuild b/dev-python/axisregistry/axisregistry-0.2.0.ebuild
index e059df912e..bec7cc8faf 100644
--- a/dev-python/axisregistry/axisregistry-0.2.0.ebuild
+++ b/dev-python/axisregistry/axisregistry-0.2.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/beziers/beziers-0.4.0.ebuild b/dev-python/beziers/beziers-0.4.0.ebuild
index fe142a606f..1913de28ec 100644
--- a/dev-python/beziers/beziers-0.4.0.ebuild
+++ b/dev-python/beziers/beziers-0.4.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/castellan/castellan-3.11.0.ebuild b/dev-python/castellan/castellan-3.11.0.ebuild
index b9cbd7e973..32157960ce 100644
--- a/dev-python/castellan/castellan-3.11.0.ebuild
+++ b/dev-python/castellan/castellan-3.11.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
EPYTEST_DESELECT=( castellan/tests/unit/test_utils.py::TestUtils::test_oslo_context_to_keystone_token )
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/cotyledon/cotyledon-1.7.3.ebuild b/dev-python/cotyledon/cotyledon-1.7.3.ebuild
index b79d7bba78..13a4332328 100644
--- a/dev-python/cotyledon/cotyledon-1.7.3.ebuild
+++ b/dev-python/cotyledon/cotyledon-1.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/cursive/cursive-0.2.2-r2.ebuild b/dev-python/cursive/cursive-0.2.2-r2.ebuild
index bf98a12355..f1b4a0a000 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..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/dotmap/dotmap-1.3.30.ebuild b/dev-python/dotmap/dotmap-1.3.30.ebuild
index fb4d14f7a2..51f2e9c33b 100644
--- a/dev-python/dotmap/dotmap-1.3.30.ebuild
+++ b/dev-python/dotmap/dotmap-1.3.30.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-#don't bump to python 3.10 until https://github.com/drgrib/dotmap/issues/76 is resolved
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit distutils-r1
diff --git a/dev-python/etcd3/etcd3-0.12.0.ebuild b/dev-python/etcd3/etcd3-0.12.0.ebuild
index a67dc504b1..45bf1d44c6 100644
--- a/dev-python/etcd3/etcd3-0.12.0.ebuild
+++ b/dev-python/etcd3/etcd3-0.12.0.ebuild
@@ -9,7 +9,7 @@ EPYTEST_DESELECT=(
tests/test_etcd3.py::TestEtcd3
tests/test_etcd3.py::TestAlarms
)
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/etcd3gw/etcd3gw-1.0.2.ebuild b/dev-python/etcd3gw/etcd3gw-1.0.2.ebuild
index 87c263b767..e6fe08e368 100644
--- a/dev-python/etcd3gw/etcd3gw-1.0.2.ebuild
+++ b/dev-python/etcd3gw/etcd3gw-1.0.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/factory_boy/factory_boy-3.2.1.ebuild b/dev-python/factory_boy/factory_boy-3.2.1.ebuild
index a4a2b93900..8d795eb62e 100644
--- a/dev-python/factory_boy/factory_boy-3.2.1.ebuild
+++ b/dev-python/factory_boy/factory_boy-3.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/font-v/font-v-2.1.0.ebuild b/dev-python/font-v/font-v-2.1.0.ebuild
index 5d0df47918..c53a816efb 100644
--- a/dev-python/font-v/font-v-2.1.0.ebuild
+++ b/dev-python/font-v/font-v-2.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/fontMath/fontMath-0.9.2.ebuild b/dev-python/fontMath/fontMath-0.9.2.ebuild
index 91ba2a17a9..63c1c22e43 100644
--- a/dev-python/fontMath/fontMath-0.9.2.ebuild
+++ b/dev-python/fontMath/fontMath-0.9.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/fontParts/fontParts-0.10.5.ebuild b/dev-python/fontParts/fontParts-0.10.5.ebuild
index 3a830bddee..aa83179012 100644
--- a/dev-python/fontParts/fontParts-0.10.5.ebuild
+++ b/dev-python/fontParts/fontParts-0.10.5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/fontPens/fontPens-0.2.4.ebuild b/dev-python/fontPens/fontPens-0.2.4.ebuild
index a2220b8c3c..8cfbdf81eb 100644
--- a/dev-python/fontPens/fontPens-0.2.4.ebuild
+++ b/dev-python/fontPens/fontPens-0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/futurist/futurist-2.3.0-r1.ebuild b/dev-python/futurist/futurist-2.3.0-r1.ebuild
index f69a66d83b..49c4fdf09c 100644
--- a/dev-python/futurist/futurist-2.3.0-r1.ebuild
+++ b/dev-python/futurist/futurist-2.3.0-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/gflanguages/gflanguages-0.4.0.ebuild b/dev-python/gflanguages/gflanguages-0.4.0.ebuild
index 3f769b2628..08258687bd 100644
--- a/dev-python/gflanguages/gflanguages-0.4.0.ebuild
+++ b/dev-python/gflanguages/gflanguages-0.4.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/github-sublee-glicko2/github-sublee-glicko2-0_pre20191010-r1.ebuild b/dev-python/github-sublee-glicko2/github-sublee-glicko2-0_pre20191010-r1.ebuild
index d32a6b4283..d303c9196c 100644
--- a/dev-python/github-sublee-glicko2/github-sublee-glicko2-0_pre20191010-r1.ebuild
+++ b/dev-python/github-sublee-glicko2/github-sublee-glicko2-0_pre20191010-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1
diff --git a/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2.ebuild b/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2.ebuild
index b643b3ec44..0267963b7d 100644
--- a/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2.ebuild
+++ b/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2.ebuild
@@ -7,7 +7,7 @@ EPYTEST_DESELECT=(
jsonpath_rw_ext/tests/test_jsonpath_rw_ext.py::TestJsonpath_rw_ext::test_fields_value
jsonpath_rw_ext/tests/test_jsonpath_rw_ext.py::TestJsonpath_rw_ext::test_shortcut_functions
)
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/ldappool/ldappool-3.0.0.ebuild b/dev-python/ldappool/ldappool-3.0.0.ebuild
index 4396436bfb..65740a6160 100644
--- a/dev-python/ldappool/ldappool-3.0.0.ebuild
+++ b/dev-python/ldappool/ldappool-3.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/monotonic/monotonic-1.6.ebuild b/dev-python/monotonic/monotonic-1.6.ebuild
index b18f9edfef..5275cbf4dd 100644
--- a/dev-python/monotonic/monotonic-1.6.ebuild
+++ b/dev-python/monotonic/monotonic-1.6.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/nosehtmloutput/nosehtmloutput-0.0.7.ebuild b/dev-python/nosehtmloutput/nosehtmloutput-0.0.7.ebuild
index 715e684c93..971d33c6b6 100644
--- a/dev-python/nosehtmloutput/nosehtmloutput-0.0.7.ebuild
+++ b/dev-python/nosehtmloutput/nosehtmloutput-0.0.7.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/nosexcover/nosexcover-1.0.11.ebuild b/dev-python/nosexcover/nosexcover-1.0.11.ebuild
index 9926dc716f..f4322cb5c3 100644
--- a/dev-python/nosexcover/nosexcover-1.0.11.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.11.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/oslo-policy/oslo-policy-3.10.1.ebuild b/dev-python/oslo-policy/oslo-policy-3.10.1.ebuild
index 08a4d21171..4f1261aec4 100644
--- a/dev-python/oslo-policy/oslo-policy-3.10.1.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-3.10.1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/osprofiler/osprofiler-3.4.3.ebuild b/dev-python/osprofiler/osprofiler-3.4.3.ebuild
index 5205073353..a599facb19 100644
--- a/dev-python/osprofiler/osprofiler-3.4.3.ebuild
+++ b/dev-python/osprofiler/osprofiler-3.4.3.ebuild
@@ -12,7 +12,7 @@ EPYTEST_DESELECT=(
osprofiler/tests/unit/test_profiler.py::test_fn_exc
)
EPYTEST_IGNORE=( osprofiler/tests/unit/drivers/test_jaeger.py )
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/ots-python/ots-python-8.2.1.ebuild b/dev-python/ots-python/ots-python-8.2.1.ebuild
index daac0b3bbe..10f03b4ae3 100644
--- a/dev-python/ots-python/ots-python-8.2.1.ebuild
+++ b/dev-python/ots-python/ots-python-8.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit distutils-r1
diff --git a/dev-python/ovsdbapp/ovsdbapp-1.16.1.ebuild b/dev-python/ovsdbapp/ovsdbapp-1.16.1.ebuild
index d4d223f792..44b7ed85cb 100644
--- a/dev-python/ovsdbapp/ovsdbapp-1.16.1.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-1.16.1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
EPYTEST_IGNORE=( ovsdbapp/tests/functional )
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/pycadf/pycadf-3.1.1-r1.ebuild b/dev-python/pycadf/pycadf-3.1.1-r1.ebuild
index f389effba0..7c4c0a8fca 100644
--- a/dev-python/pycadf/pycadf-3.1.1-r1.ebuild
+++ b/dev-python/pycadf/pycadf-3.1.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild b/dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild
index 15bc5f92d5..26f2f90a49 100644
--- a/dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild
+++ b/dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-5.3.0.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-5.3.0.ebuild
index 88e8601ec8..d696cbac68 100644
--- a/dev-python/python-barbicanclient/python-barbicanclient-5.3.0.ebuild
+++ b/dev-python/python-barbicanclient/python-barbicanclient-5.3.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/python-heatclient/python-heatclient-2.5.1.ebuild b/dev-python/python-heatclient/python-heatclient-2.5.1.ebuild
index e503be8499..e6c736ef02 100644
--- a/dev-python/python-heatclient/python-heatclient-2.5.1.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-2.5.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/python-magnumclient/python-magnumclient-3.6.0.ebuild b/dev-python/python-magnumclient/python-magnumclient-3.6.0.ebuild
index 4b2ee3668a..83e5c37405 100644
--- a/dev-python/python-magnumclient/python-magnumclient-3.6.0.ebuild
+++ b/dev-python/python-magnumclient/python-magnumclient-3.6.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/python-manilaclient/Manifest b/dev-python/python-manilaclient/Manifest
index a69d39bef2..095d44be69 100644
--- a/dev-python/python-manilaclient/Manifest
+++ b/dev-python/python-manilaclient/Manifest
@@ -1,2 +1 @@
-DIST python-manilaclient-3.3.0.tar.gz 320475 BLAKE2B e83e30593d26e9ba26f9f487507f6c9a9b38be69b59af69dcdb85242abb81879e689efb70c937bb8afef74841adf54e5e7724f2173a6bc9c7d76c90535bf1b4c SHA512 084293115370a174678dd8bde3f144213f10ce4a3addf7058365b0bbde31b2a56643b0417ec97ced297bf99e141a1fd96503aea96795c36862548268d6f7ae31
DIST python-manilaclient-3.4.0.tar.gz 320304 BLAKE2B 4bb9fc47816c1cf8dcc163bd3119932b14f6af6796486053175e91efd94434d485281e6ec74f79c9d054309a486c4590d379817015f78e0c29f5036f7583b8d9 SHA512 0b4852a2df90b1a1f0deaacc235aec47e9f4e95f0d3b75a0fbad7ef90569f438723e4b9df02e6a9dc9752ff77a0b2425f09add8f95d41c1db12c50fbfa3022b0
diff --git a/dev-python/python-manilaclient/python-manilaclient-3.3.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-3.3.0.ebuild
deleted file mode 100644
index a0c603b3a9..0000000000
--- a/dev-python/python-manilaclient/python-manilaclient-3.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EPYTEST_IGNORE=( manilaclient/tests/functional )
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Manila API"
-HOMEPAGE="
- https://opendev.org/openstack/python-manilaclient
- https://github.com/openstack/python-manilaclient
- https://pypi.org/project/python-manilaclient/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
- >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
- >=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
- >=dev-python/osc-lib-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- test? (
- >=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
- >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-manilaclient/python-manilaclient-3.4.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-3.4.0.ebuild
index a0c603b3a9..123123a8b6 100644
--- a/dev-python/python-manilaclient/python-manilaclient-3.4.0.ebuild
+++ b/dev-python/python-manilaclient/python-manilaclient-3.4.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
EPYTEST_IGNORE=( manilaclient/tests/functional )
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/rchitect/rchitect-0.3.36.ebuild b/dev-python/rchitect/rchitect-0.3.36.ebuild
index 4eb5420018..9696b41a66 100644
--- a/dev-python/rchitect/rchitect-0.3.36.ebuild
+++ b/dev-python/rchitect/rchitect-0.3.36.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1
diff --git a/dev-python/skia-pathops/skia-pathops-0.6.0_p2.ebuild b/dev-python/skia-pathops/skia-pathops-0.6.0_p2.ebuild
index 40e47553f4..cb62b29fec 100644
--- a/dev-python/skia-pathops/skia-pathops-0.6.0_p2.ebuild
+++ b/dev-python/skia-pathops/skia-pathops-0.6.0_p2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
MYP="${P/_p/.post}"
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/strictyaml/Manifest b/dev-python/strictyaml/Manifest
index 35870dfa15..a98c1cbc4a 100644
--- a/dev-python/strictyaml/Manifest
+++ b/dev-python/strictyaml/Manifest
@@ -1,2 +1 @@
-DIST strictyaml-1.5.0.tar.gz 201594 BLAKE2B 39217a6189cfedde8c4ddf54097db3af558d098d016ef3bef64915e4f652f9780bf7544db7513dfea56acc0b34c41c396533ec6af22e9c204c70706554dd20d5 SHA512 708f82356a081bd0b53b9e1f59d669897be8262d57d3d8bb6d75af2225f68eb9c16791cdf2bc7148dfd5b94f54a2d214bbe166f5dd513dbb7987cc472e6e7b4d
DIST strictyaml-1.6.1.tar.gz 287908 BLAKE2B ab59addc5a86624c242339ec371403dd0ebb509c0bcf6d9484e71c26ee2670df897458bc7613367eaabe1493068ecaff37cd0b5e2cf08dc97e10107b9f3061f2 SHA512 8492432b599a6af283bd4d9adeac7fba0fc5dd3e081fb5055526799475e62987de30527ca94eecfebf568673d9bd18ffa9a70bb298c88a49e81683e4eea11349
diff --git a/dev-python/strictyaml/strictyaml-1.5.0.ebuild b/dev-python/strictyaml/strictyaml-1.5.0.ebuild
deleted file mode 100644
index b662784d10..0000000000
--- a/dev-python/strictyaml/strictyaml-1.5.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A type-safe YAML parser built atop ruamel.yaml"
-HOMEPAGE="https://github.com/crdoconnor/strictyaml"
-SRC_URI="https://github.com/crdoconnor/strictyaml/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
- dev-python/ruamel-yaml[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/sysv_ipc/sysv_ipc-1.1.0.ebuild b/dev-python/sysv_ipc/sysv_ipc-1.1.0.ebuild
index 470145bd88..472508fb9a 100644
--- a/dev-python/sysv_ipc/sysv_ipc-1.1.0.ebuild
+++ b/dev-python/sysv_ipc/sysv_ipc-1.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit distutils-r1
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index 023b35f152..d4c6ec3411 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,2 +1 @@
-DIST tooz-2.11.0.tar.gz 95997 BLAKE2B a61199586e58ec6bb63133137c91445df9c284a65b91125fa73e8c19efa37a5b5da039be94bc73b983f7a83dfa2b34d4d6cd7eb702823fa5eaca9429984fc323 SHA512 feb9217908bb986aeeffe92ae765b948edb1c1311eeb011b19b7bfdccb9b94dec82139e6056bbdbbffa79b208fc9ef22d1e100f75d6e9c61f7352dee3523ab8f
DIST tooz-2.11.1.tar.gz 96028 BLAKE2B 638bddc4b06afc601b750f0da41fec9efde71ed6a36e7eb75a1d4e1d47efafa4d84975b686babb4f4bbe5e2bc3304c7db267b72fb1b16c41fcaf573bfc7e3039 SHA512 865a6bd944c949a3af63cd8f91641414c24e875bef89d8bacc3a4207109e605f3b1471ebc3192f2224c264773ea8e6d6229e5ce7a40b3c1ad2fc25a61ba14270
diff --git a/dev-python/tooz/tooz-2.11.0.ebuild b/dev-python/tooz/tooz-2.11.0.ebuild
deleted file mode 100644
index 1c1b420b04..0000000000
--- a/dev-python/tooz/tooz-2.11.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library centralizing the most common distributed primitives"
-HOMEPAGE="
- https://opendev.org/openstack/tooz
- https://pypi.org/project/tooz/
- https://launchpad.net/python-tooz
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- >=dev-python/pbr-1.6.1[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
- >=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
- >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
- >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- test? (
- >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/pifpaf-0.10.0[${PYTHON_USEDEP}]
- >=dev-python/ddt-1.2.1[${PYTHON_USEDEP}]
- >=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-
- dev-python/etcd3[${PYTHON_USEDEP}]
- dev-python/etcd3gw[${PYTHON_USEDEP}]
- dev-python/pymemcache[${PYTHON_USEDEP}]
- dev-python/pymysql[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/sysv_ipc[${PYTHON_USEDEP}]
- dev-python/zake[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
- # allow usage of renamed msgpack
- sed -i '/^msgpack/d' requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- nosetests \
- -e tooz.tests.test_coordination.TestAPI \
- -e tooz.tests.test_memcache.TestMemcacheDriverFailures.test_client_failure_join \
- -e tooz.tests.test_memcache.TestMemcacheDriverFailures.test_client_failure_leave \
- -e tooz.tests.test_partitioner \
- || die
-}
diff --git a/dev-python/tooz/tooz-2.11.1.ebuild b/dev-python/tooz/tooz-2.11.1.ebuild
index aa660bffb8..01defedffa 100644
--- a/dev-python/tooz/tooz-2.11.1.ebuild
+++ b/dev-python/tooz/tooz-2.11.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild b/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild
index db9872861c..db0e38d262 100644
--- a/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild
+++ b/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
COMMIT="91c29b1ab6cd86d6d68fc983fd7ceba3a88ad544"
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/ttfautohint-py/Manifest b/dev-python/ttfautohint-py/Manifest
index c6483b5826..6b0d595023 100644
--- a/dev-python/ttfautohint-py/Manifest
+++ b/dev-python/ttfautohint-py/Manifest
@@ -1,2 +1 @@
-DIST ttfautohint-py-0.4.3.tar.gz 186488 BLAKE2B cc5de63faf4a5d213a14eda9b092c48e2e67c59b04ad1580d680e22bf691d915a74f7a465cc37cd0ce907874f3fdb0312224e647bb8e18e5741f886e69e7d075 SHA512 2f21af2a4ffffb59c9e83e4c5aa77ce15d97d4391894537e87727fd05f47b8f007e3ddf1fcf98d195a880b2a4e22586ce9faab4d8dc33f6c6eaa1623dcfd3aab
DIST ttfautohint-py-0.5.1.tar.gz 186884 BLAKE2B ab09325f262e631639433852a9709b52c23a08e2a179fb9f2bce46d851a5523205076ef2698de5c2af10828fc8290d905d5cfe58c44fbfecce4474d504c2d84c SHA512 0673daa17666af7df4fdd9836c978bb6e1620193524a9043d31900047191ef29dd75783afaf5929cb3a7b74137ec9b4e9b5c15793f811824ab6dc2a0780fd798
diff --git a/dev-python/ttfautohint-py/files/ttfautohint-py-0.4.3-no-ext_modules.patch b/dev-python/ttfautohint-py/files/ttfautohint-py-0.4.3-no-ext_modules.patch
deleted file mode 100644
index 84dee04cc3..0000000000
--- a/dev-python/ttfautohint-py/files/ttfautohint-py-0.4.3-no-ext_modules.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -120,7 +120,6 @@
- platforms=["posix", "nt"],
- package_dir={"": "src/python"},
- packages=find_packages("src/python"),
-- ext_modules=[libttfautohint],
- zip_safe=False,
- cmdclass=cmdclass,
- setup_requires=['setuptools_scm'],
diff --git a/dev-python/ttfautohint-py/ttfautohint-py-0.4.3.ebuild b/dev-python/ttfautohint-py/ttfautohint-py-0.4.3.ebuild
deleted file mode 100644
index 31466327d1..0000000000
--- a/dev-python/ttfautohint-py/ttfautohint-py-0.4.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-SRC_URI="https://github.com/fonttools/ttfautohint-py/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-DESCRIPTION="A Python wrapper for ttfautohint"
-HOMEPAGE="https://github.com/fonttools/ttfautohint-py"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="media-gfx/ttfautohint"
-DEPEND="
- test? (
- dev-python/fonttools[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=( "${FILESDIR}/${P}-no-ext_modules.patch" )
-
-distutils_enable_tests pytest
-
-src_prepare() {
- rm -r src/c || die
- export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
- default
-}
diff --git a/dev-python/ttfautohint-py/ttfautohint-py-0.5.1.ebuild b/dev-python/ttfautohint-py/ttfautohint-py-0.5.1.ebuild
index e444501fef..0c39ba3a2d 100644
--- a/dev-python/ttfautohint-py/ttfautohint-py-0.5.1.ebuild
+++ b/dev-python/ttfautohint-py/ttfautohint-py-0.5.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/types-paramiko/Manifest b/dev-python/types-paramiko/Manifest
index f4a028a004..c585fdf3db 100644
--- a/dev-python/types-paramiko/Manifest
+++ b/dev-python/types-paramiko/Manifest
@@ -1,2 +1 @@
DIST types-paramiko-2.10.0.tar.gz 20325 BLAKE2B c918598110ada99b739579d9fd0b968b272e7cb654df2fd24f3fbfa96b9730fab27c6575220b62d2a6680c4cd5c6122594e1d710afcb5cdde2444fcfeb7a77ea SHA512 e376f8fd060f6667c610c53cf42b7dbb38ab19cbc3e8ad68f9a68f982b7498c7e06201e4ff35b662fb0d7a17b24d12a245cdc8f5731cf21cf5c0a14085853fb0
-DIST types-paramiko-2.8.21.tar.gz 20252 BLAKE2B 838563473a9a7e4277b373f6941d1b806f72715d2d6dc5a3da729d45e189837de0ed9a23181ae0b95c32b4682b9c83c93db4b8dc8a278d1ae85bfd79a4a99475 SHA512 5be63f293e5813b77696640e74275dab0d9d4c7de1e9adf13c5c2effb5b026ecae045937d09994ae3a096d75bcedc09fbdb9206cac86eef2d8c65d70e82974cf
diff --git a/dev-python/types-paramiko/types-paramiko-2.10.0.ebuild b/dev-python/types-paramiko/types-paramiko-2.10.0.ebuild
index e2a0b2317f..8b3f480950 100644
--- a/dev-python/types-paramiko/types-paramiko-2.10.0.ebuild
+++ b/dev-python/types-paramiko/types-paramiko-2.10.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit distutils-r1
diff --git a/dev-python/types-paramiko/types-paramiko-2.8.21.ebuild b/dev-python/types-paramiko/types-paramiko-2.8.21.ebuild
deleted file mode 100644
index e2a0b2317f..0000000000
--- a/dev-python/types-paramiko/types-paramiko-2.8.21.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Typing stubs for paramiko"
-HOMEPAGE="
- https://pypi.org/project/types-paramiko/
- https://github.com/python/typeshed/tree/master/stubs/paramiko
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/cryptography-3.4.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/types-python-dateutil/Manifest b/dev-python/types-python-dateutil/Manifest
index a77e1cf0bc..cc0f4f8398 100644
--- a/dev-python/types-python-dateutil/Manifest
+++ b/dev-python/types-python-dateutil/Manifest
@@ -1,2 +1 @@
-DIST types-python-dateutil-2.8.15.tar.gz 6923 BLAKE2B 53bfdff4ebb585d4b0d9c9a22c8e70aae87ce2b154748f54823713e68f8faa21ae3eb7165359e6763b2b0027e5128fedba4d66e6bd70232bd6650cf9bfe425dd SHA512 e2efd88dfc27b5a7ace8147b9a4d924dd32471fe59d65c7ff8bc9576d1d8b5b6bdc83e808cabb35c9a866614debd8fafdd779166efa2b51069056ae9330f9fcc
DIST types-python-dateutil-2.8.16.tar.gz 6973 BLAKE2B 2e883f73af0e79faf57f8469733ec742b9881e974a253ddd40e80628302ea29a9046a319088d75b9bc47792b0e225fe2c2f376ea4a5d794d710cf7aea7af7af3 SHA512 1d2927c6bd85fa8222c7519d3ac8ae6179da746ebb29ca4e9002ca410131e10445b8ebc2b70bb6df1b3e8ed90098827884bf5f928039d1627ca760c86cdcc113
diff --git a/dev-python/types-python-dateutil/types-python-dateutil-2.8.15.ebuild b/dev-python/types-python-dateutil/types-python-dateutil-2.8.15.ebuild
deleted file mode 100644
index adcbd91977..0000000000
--- a/dev-python/types-python-dateutil/types-python-dateutil-2.8.15.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Typing stubs for python-dateutil"
-HOMEPAGE="
- https://pypi.org/project/types-python-dateutil/
- https://github.com/python/typeshed/tree/master/stubs/python-dateutil
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
diff --git a/dev-python/types-python-dateutil/types-python-dateutil-2.8.16.ebuild b/dev-python/types-python-dateutil/types-python-dateutil-2.8.16.ebuild
index adcbd91977..5c6215e010 100644
--- a/dev-python/types-python-dateutil/types-python-dateutil-2.8.16.ebuild
+++ b/dev-python/types-python-dateutil/types-python-dateutil-2.8.16.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit distutils-r1
diff --git a/dev-python/types-pytz/Manifest b/dev-python/types-pytz/Manifest
index 3d4131f706..580204ad72 100644
--- a/dev-python/types-pytz/Manifest
+++ b/dev-python/types-pytz/Manifest
@@ -1,2 +1 @@
-DIST types-pytz-2021.3.7.tar.gz 3179 BLAKE2B d5adca00fbe3c9b97f2cd8292de05016e3f26286403353eed1f177db30578787b29fed93d46d96766aa98e9ae9ae3eb484547a7b335f885d4b48581025f0e116 SHA512 90cefe450b1c866095927588625a595c2a45345af6784b7cef6bc93c7feaf351bea1c4cf37ad938db792e8ad9a74cb9695e8eb3646f7ad96d0bcc7ecef91ac00
DIST types-pytz-2021.3.8.tar.gz 3253 BLAKE2B 873f8126ecaf5055bcd9aa87f8632cee8cf92f7bfe51f0d0df7217af51053f40fe98f18f511db42eefc2d904cf3f1f11b228cf8c6fa15f5afcbc2e8e91f539fe SHA512 5b7dcf5279be55225ec66f9f9cc657cb3ae21acdcd41322a194a8cc6ccd79e60052191cb664378f414172d9f5d92573ab1f3322e9909ecd1e4ed95b36c7630ba
diff --git a/dev-python/types-pytz/types-pytz-2021.3.7.ebuild b/dev-python/types-pytz/types-pytz-2021.3.7.ebuild
deleted file mode 100644
index 47dfcb9615..0000000000
--- a/dev-python/types-pytz/types-pytz-2021.3.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Typing stubs for pytz"
-HOMEPAGE="
- https://pypi.org/project/types-pytz/
- https://github.com/python/typeshed/tree/master/stubs/pytz
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
diff --git a/dev-python/types-pytz/types-pytz-2021.3.8.ebuild b/dev-python/types-pytz/types-pytz-2021.3.8.ebuild
index 47dfcb9615..611ea0a5c5 100644
--- a/dev-python/types-pytz/types-pytz-2021.3.8.ebuild
+++ b/dev-python/types-pytz/types-pytz-2021.3.8.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit distutils-r1
diff --git a/dev-python/types-requests/Manifest b/dev-python/types-requests/Manifest
index 1713a86e7c..2799c749d0 100644
--- a/dev-python/types-requests/Manifest
+++ b/dev-python/types-requests/Manifest
@@ -1,2 +1 @@
-DIST types-requests-2.27.25.tar.gz 11029 BLAKE2B 23d1c003dd556deaa8b5b747bf5fde3d494a7a7d355aca90856ade0985542ba4da2f5f952c08812e4a7136219deec8a3baeffb6cf43f6cbb609f826efd198668 SHA512 e4fcfc94254b5ef0bba89b6dee469cf2d32bcef3671f8bc3666dd1348615e100a1f0f4769f9f7625b18ba97d1d07757dc7dc223ba412bfdaad10d010cf48111e
DIST types-requests-2.27.27.tar.gz 11345 BLAKE2B 41239c8c64af3cae256f28b518f5ef89b1b3743730d382a3de5f0aa0b332358b3cee6e2acc3db0ecd2f52412ea4fbc0f648cbd1d856bf2d524a747c9d57fc8b8 SHA512 68bd04b7c7c0a712dbadb3f92f28547a95ddf3b03c372f4dff0f7ce45bfabe0f3f896cad65694adec13f6bbb20a5104eef98939ba0a5f8141812a5c16eda3347
diff --git a/dev-python/types-requests/types-requests-2.27.25.ebuild b/dev-python/types-requests/types-requests-2.27.25.ebuild
deleted file mode 100644
index 904df09ef6..0000000000
--- a/dev-python/types-requests/types-requests-2.27.25.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Typing stubs for requests"
-HOMEPAGE="
- https://pypi.org/project/types-requests/
- https://github.com/python/typeshed/tree/master/stubs/requests
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-
-RDEPEND="=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
- >=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${RDEPEND}
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- )
-"
-BDEPEND="app-arch/unzip"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- sed -e '/\/d' -i setup.cfg || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild b/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
index 4a180a3b5e..75b1f106d6 100644
--- a/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
+++ b/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
@@ -10,7 +10,7 @@ DOCS_DEPEND="
"
DOCS_DIR="${S}/docs/source"
DOCS_BUILDER="sphinx"
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 docs
diff --git a/dev-python/ufoNormalizer/Manifest b/dev-python/ufoNormalizer/Manifest
index 22d2f41120..0308dccf99 100644
--- a/dev-python/ufoNormalizer/Manifest
+++ b/dev-python/ufoNormalizer/Manifest
@@ -1,2 +1 @@
-DIST ufonormalizer-0.5.4.zip 38121 BLAKE2B b88763f9904633b99bfcd8226281b2c8e7172a46d8a6ebed1360d8af6b67944030f008176b55dfb9cb85580419997853b5203867587da87f7910608621ff213f SHA512 f9bc37c6d7c366d34e9fa4cbfbcbb6f8a654955fd61afedfbe6376e70e4145d29c6fe30d48c28dca9f18e476002c1cda773172379be2fae4bd30b466ce1899ba
DIST ufonormalizer-0.6.1.zip 37360 BLAKE2B b2270b9bd40c5c67e2854049f285eac0a7c202bd4a2245837a99259140e3dd352adcd1c74a9cfd40670fd4c7ee801dacddfd092582abb96459fc4a475c65fd43 SHA512 301bef368a7d42333d885437322991d075e5ebb7169e3397e1d2a486ae18d4efba4db625bad1f9452f512e0a452ec8a9fd0b5c716c8571eb45f9d4d2718f37a7
diff --git a/dev-python/ufoNormalizer/ufoNormalizer-0.5.4.ebuild b/dev-python/ufoNormalizer/ufoNormalizer-0.5.4.ebuild
deleted file mode 100644
index 18da06d4c2..0000000000
--- a/dev-python/ufoNormalizer/ufoNormalizer-0.5.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8,9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-MYPN="${PN,,}"
-MYP="${MYPN}-${PV}"
-inherit distutils-r1
-
-DESCRIPTION="A tool that will normalize the XML and other data inside of a UFO."
-HOMEPAGE="https://github.com/unified-font-object/ufoNormalizer"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.zip"
-S="${WORKDIR}/${MYP}"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild b/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild
index 85f6103c92..1f0a293184 100644
--- a/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild
+++ b/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
MY_PN="${PN,,}"
MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit distutils-r1
diff --git a/dev-python/ufoProcessor/ufoProcessor-1.9.0.ebuild b/dev-python/ufoProcessor/ufoProcessor-1.9.0.ebuild
index 41fc476770..0b3c652fe8 100644
--- a/dev-python/ufoProcessor/ufoProcessor-1.9.0.ebuild
+++ b/dev-python/ufoProcessor/ufoProcessor-1.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/LettError/ufoProcessor/archive/refs/tags/${PV}.tar.g
LICENSE="MIT"
SLOT="0"
IUSE="test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
RESTRICT="!test? ( test )"
RDEPEND="
diff --git a/dev-python/uharfbuzz/Manifest b/dev-python/uharfbuzz/Manifest
index 2b97b51472..b7b76860ef 100644
--- a/dev-python/uharfbuzz/Manifest
+++ b/dev-python/uharfbuzz/Manifest
@@ -1,2 +1 @@
-DIST uharfbuzz-0.25.0.tar.gz 36602 BLAKE2B b359f5921f6fef9440d3640af235924d81f661d7582673cc54457f3da16fe2f7973aabe60375a341ee608a01f831971a87ffa5116680c90aaeaa24c75a008a7f SHA512 d57daff4eee023392fd444d1c2be199863422dd6b1097e974a816ddda47bf9fbf1d15509d314230b8abd61dde0b6b9078430a5572fac5e73aa3103675c100cc2
DIST uharfbuzz-0.26.0.tar.gz 36596 BLAKE2B b57782f5de371e2062d6a764fde9d20ca4a47a388b22ac3d169cead66103d30af12888e9d8f0af0aea7c7dbb4a3b7e0f4411e049417efaf1d2e7562ef5a34875 SHA512 0b356ceaf1cc40c2318e495939d51db454852043ebac60cb7b2a7481c4de6540e66d7ccf47a9fe6c1d819bf8a54e572bdb5a0799c7818f61730b820bb210ac83
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.25.0.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.25.0.ebuild
deleted file mode 100644
index e7a26c3ba1..0000000000
--- a/dev-python/uharfbuzz/uharfbuzz-0.25.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Streamlined Cython bindings for the HarfBuzz shaping engine"
-HOMEPAGE="https://github.com/harfbuzz/uharfbuzz"
-SRC_URI="https://github.com/harfbuzz/uharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=media-libs/harfbuzz-4.2.1[experimental(-)]"
-DEPEND="
- ${RDEPEND}
- >=dev-python/cython-0.28.1[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-2.1[${PYTHON_USEDEP}]
- >=dev-python/wheel-0.31[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.23.0-system-harfbuzz.patch" )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
- export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
- export USE_SYSTEM_HARFBUZZ=1
-}
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.26.0.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.26.0.ebuild
index 608f845a44..6bd64ecba5 100644
--- a/dev-python/uharfbuzz/uharfbuzz-0.26.0.ebuild
+++ b/dev-python/uharfbuzz/uharfbuzz-0.26.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit distutils-r1
diff --git a/dev-python/ukpostcodeparser/ukpostcodeparser-1.1.2.ebuild b/dev-python/ukpostcodeparser/ukpostcodeparser-1.1.2.ebuild
index 76dcf3bbc9..c98f4b316c 100644
--- a/dev-python/ukpostcodeparser/ukpostcodeparser-1.1.2.ebuild
+++ b/dev-python/ukpostcodeparser/ukpostcodeparser-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# 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=( pypy3 python3_{8,9} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
inherit distutils-r1
diff --git a/dev-python/unicodedata2/Manifest b/dev-python/unicodedata2/Manifest
index 9fa962410f..e08fc3421d 100644
--- a/dev-python/unicodedata2/Manifest
+++ b/dev-python/unicodedata2/Manifest
@@ -1,2 +1 @@
-DIST unicodedata2-13.0.0.2.tar.gz 1202880 BLAKE2B 237a1be7a22a9aaaa3e417a14687e7169630632a3fed90dbda963c5ef6994cbac45e67c7930529362c438a8a20251c64979b3baeaa963dd40e70bd453d2ceb77 SHA512 451a49a9e29935c59932804d8a821562f07ea22658fe57a472eed9a5eacfc9c7c497f25c084451c90cf0992638956ac51572f0c52e74452ece7d66c052d82641
DIST unicodedata2-14.0.0.tar.gz 624067 BLAKE2B 0394af31670dbc3e89f616144f88081a69e1e4d9404d432a3f70c8973e967f28b914413219e0b22f089ccaa898193a45f4a2ce41bfe1f889622c69bd9b56735e SHA512 bb0b1e3834a892d23bda0d51443655b244e0f24cbb9ed51065afac3fdd2ed01a6382d4015ea0dcfaddc99c7858e19e3e3e86a9024a5600cb67cef219ebc719ba
diff --git a/dev-python/unicodedata2/unicodedata2-13.0.0.2.ebuild b/dev-python/unicodedata2/unicodedata2-13.0.0.2.ebuild
deleted file mode 100644
index 09f2721ee0..0000000000
--- a/dev-python/unicodedata2/unicodedata2-13.0.0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MYPV="$(ver_rs 3 -)"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-SRC_URI="https://github.com/mikekap/unicodedata2/archive/refs/tags/${MYPV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MYPV}"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Unicodedata backport for python 2/3 updated to the latest unicode version"
-HOMEPAGE="https://github.com/mikekap/unicodedata2"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-distutils_enable_tests pytest
diff --git a/dev-python/unicodedata2/unicodedata2-14.0.0.ebuild b/dev-python/unicodedata2/unicodedata2-14.0.0.ebuild
index 6c1fa4d532..e6c655743c 100644
--- a/dev-python/unicodedata2/unicodedata2-14.0.0.ebuild
+++ b/dev-python/unicodedata2/unicodedata2-14.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
MYPV="$(ver_rs 3 -)"
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/wsgi_intercept/Manifest b/dev-python/wsgi_intercept/Manifest
index 9a143bba9f..d305be8361 100644
--- a/dev-python/wsgi_intercept/Manifest
+++ b/dev-python/wsgi_intercept/Manifest
@@ -1,2 +1 @@
DIST wsgi_intercept-1.10.0.tar.gz 30252 BLAKE2B 43c2e9dcd98616132801721392b0150b49fe5e851f343f53d8eb42c2f7f8b84f5eb9bb41edec7b830908f122a80458752e1c97f6a68006088221bb3233e90951 SHA512 27848e52e77f1d7ca7a079eb24025bb38d31f4c6b0b82c2717c543a5ffa83a95fe0dd893c326135b29c465a89ffe149da6d5d9c8bfe9f181546862e4f42a3832
-DIST wsgi_intercept-1.9.3.tar.gz 30002 BLAKE2B 65b7b39543dc486d8ea394b093a3892bdbd7b8e8314a3b839af13ca7abc79f0397092b0d908a873821b1d42d713f5fdd64d2cd815498c7e4f77300725b8ab30c SHA512 b23cbbe20299dad413db0130bf9b055b58ad0a8349d18d9a3eb22cec4db6c9c570785c2ba29245ac52fa1c340a80cb7eb18c04b7bd75dd57961ae8c5142eabdc
diff --git a/dev-python/wsgi_intercept/wsgi_intercept-1.10.0.ebuild b/dev-python/wsgi_intercept/wsgi_intercept-1.10.0.ebuild
index fe2323fdba..2ca6765d0b 100644
--- a/dev-python/wsgi_intercept/wsgi_intercept-1.10.0.ebuild
+++ b/dev-python/wsgi_intercept/wsgi_intercept-1.10.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit distutils-r1
diff --git a/dev-python/wsgi_intercept/wsgi_intercept-1.9.3.ebuild b/dev-python/wsgi_intercept/wsgi_intercept-1.9.3.ebuild
deleted file mode 100644
index fe2323fdba..0000000000
--- a/dev-python/wsgi_intercept/wsgi_intercept-1.9.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="wsgi_intercept installs a WSGI application in place of a real URI for testing"
-HOMEPAGE="
- https://pypi.org/project/wsgi-intercept/
- https://github.com/cdent/wsgi-intercept
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${RDEPEND}
- test? (
- dev-python/httplib2[${PYTHON_USEDEP}]
- >=dev-python/requests-2.0.1[${PYTHON_USEDEP}]
- >=dev-python/urllib3-1.11.0[${PYTHON_USEDEP}]
- )
-"
-
-RESTRICT="test"
-PROPERTIES="test_network"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xattr/Manifest b/dev-python/xattr/Manifest
index 8086105a85..8ebc881b43 100644
--- a/dev-python/xattr/Manifest
+++ b/dev-python/xattr/Manifest
@@ -1,2 +1 @@
-DIST xattr-0.9.7.tar.gz 13389 BLAKE2B cae6adafe873555058b09c06ee7132726f70642672abce3d2e8ab4844bfadaf6c88ec49d82e51d30c1167e6b362adddec9ef466c9c9cf0d70080c84a741a3f07 SHA512 98473ad4ac270b747416e448f426eb55888ed1a641027f27fc9ced58eff29c6866de6b1d914628e9be1785a93dc857977d172e6bcbe5233e6449447dd08d9bd0
DIST xattr-0.9.9.tar.gz 15508 BLAKE2B e56c262ca1f390365ed95d746a57a95a39c118ad0c50c7ece556e006d666879d5d318c1e53686b588cb6d8deb9d7f699f3962b15b2440e327b93d840f8765e4b SHA512 1c4c15d77757850290e4434f50d0fae243a9dfe2d190e68310ba35e675e1499a21cd0cd156c4b9f5325b6c2834485527fcf41ec0b255b0bbf2fde4c303f2e325
diff --git a/dev-python/xattr/xattr-0.9.7.ebuild b/dev-python/xattr/xattr-0.9.7.ebuild
deleted file mode 100644
index 02f6769acf..0000000000
--- a/dev-python/xattr/xattr-0.9.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for extended filesystem attributes"
-HOMEPAGE="https://github.com/xattr/xattr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/cffi-1.0.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/xattr/xattr-0.9.9.ebuild b/dev-python/xattr/xattr-0.9.9.ebuild
index bea1575cbd..28a59ed16b 100644
--- a/dev-python/xattr/xattr-0.9.9.ebuild
+++ b/dev-python/xattr/xattr-0.9.9.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1
diff --git a/dev-python/yaql/yaql-2.0.0.ebuild b/dev-python/yaql/yaql-2.0.0.ebuild
index ba27f89d41..fe3b8be3f5 100644
--- a/dev-python/yaql/yaql-2.0.0.ebuild
+++ b/dev-python/yaql/yaql-2.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/youseedee/youseedee-0.3.0.ebuild b/dev-python/youseedee/youseedee-0.3.0.ebuild
index b05f114ac1..1ea6e552f4 100644
--- a/dev-python/youseedee/youseedee-0.3.0.ebuild
+++ b/dev-python/youseedee/youseedee-0.3.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1
diff --git a/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1-r1.ebuild b/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1-r1.ebuild
index 235ba17c26..6c804f5e83 100644
--- a/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1-r1.ebuild
+++ b/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-python/zake/zake-0.2.2.ebuild b/dev-python/zake/zake-0.2.2.ebuild
index 5838c8b444..5c7e1f331b 100644
--- a/dev-python/zake/zake-0.2.2.ebuild
+++ b/dev-python/zake/zake-0.2.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/dev-util/shfmt/shfmt-3.5.0.ebuild b/dev-util/shfmt/shfmt-3.5.0.ebuild
index eacbfc8404..96a20587ac 100644
--- a/dev-util/shfmt/shfmt-3.5.0.ebuild
+++ b/dev-util/shfmt/shfmt-3.5.0.ebuild
@@ -26,16 +26,13 @@ IUSE="+man"
BDEPEND="man? ( app-text/scdoc )"
src_unpack() {
+ default
if [[ ${PV} == *9999 ]]; then
- git-r3_fetch
- git-r3_checkout
- pushd ${P}/cmd/shfmt || die "location change for module building failed"
- ego get
- popd || die "location reset from module building failed"
+ git-r3_src_unpack
+ go-module_live_vendor
else
go-module_src_unpack
fi
- default
}
src_compile() {
diff --git a/dev-util/shfmt/shfmt-9999.ebuild b/dev-util/shfmt/shfmt-9999.ebuild
index eacbfc8404..96a20587ac 100644
--- a/dev-util/shfmt/shfmt-9999.ebuild
+++ b/dev-util/shfmt/shfmt-9999.ebuild
@@ -26,16 +26,13 @@ IUSE="+man"
BDEPEND="man? ( app-text/scdoc )"
src_unpack() {
+ default
if [[ ${PV} == *9999 ]]; then
- git-r3_fetch
- git-r3_checkout
- pushd ${P}/cmd/shfmt || die "location change for module building failed"
- ego get
- popd || die "location reset from module building failed"
+ git-r3_src_unpack
+ go-module_live_vendor
else
go-module_src_unpack
fi
- default
}
src_compile() {
diff --git a/eclass/octaveforge.eclass b/eclass/octaveforge.eclass
index 9f0f12dda3..337d21e450 100644
--- a/eclass/octaveforge.eclass
+++ b/eclass/octaveforge.eclass
@@ -58,6 +58,8 @@ octaveforge_src_unpack() {
# @DESCRIPTION:
# function to add octaveforge specific makefile and configure and reconfigure if possible
octaveforge_src_prepare() {
+ default
+
_generate_configure
if [[ -e "${S}/src/configure.ac" ]]; then
@@ -72,7 +74,6 @@ octaveforge_src_prepare() {
if [[ -e "${S}/src/Makefile" ]]; then
sed -i 's/ -s / /g' "${S}/src/Makefile" || die 'sed failed.'
fi
- default
}
octaveforge_src_compile() {
diff --git a/media-gfx/dehinter/dehinter-4.0.0.ebuild b/media-gfx/dehinter/dehinter-4.0.0.ebuild
index f8f1a00b2b..f499a0d5b5 100644
--- a/media-gfx/dehinter/dehinter-4.0.0.ebuild
+++ b/media-gfx/dehinter/dehinter-4.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/media-gfx/ufolint/ufolint-1.2.0.ebuild b/media-gfx/ufolint/ufolint-1.2.0.ebuild
index 50cc733172..b60eadce06 100644
--- a/media-gfx/ufolint/ufolint-1.2.0.ebuild
+++ b/media-gfx/ufolint/ufolint-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/media-sound/noisetorch/Manifest b/media-sound/noisetorch/Manifest
deleted file mode 100644
index ba5af032a0..0000000000
--- a/media-sound/noisetorch/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST noisetorch-0.11.5.tar.gz 3722103 BLAKE2B cd7b38bcd3ed687030388861b25592c7e63f19e04309aea2c898246001b1e468c8fca2635217ac1d0f42ff4b72877b2d9ed20bd0e706946c9152c63e72b2f74d SHA512 3a7dff5417d18dc3dda9f6b525227f95e9adb7dcebe9f6ffd250d99f0d99b14c07dd5df445bde4a54cd4ab71abae88f6c76afc4e409e791605ff81c4359130af
diff --git a/media-sound/noisetorch/metadata.xml b/media-sound/noisetorch/metadata.xml
deleted file mode 100644
index 59bfe36918..0000000000
--- a/media-sound/noisetorch/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- Adel Kara Slimane
- adel.ks@zegrapher.com
-
-
- lawl/NoiseTorch
- https://github.com/lawl/NoiseTorch/issues
-
-
diff --git a/media-sound/noisetorch/noisetorch-0.11.5.ebuild b/media-sound/noisetorch/noisetorch-0.11.5.ebuild
deleted file mode 100644
index 40d9b9b4b3..0000000000
--- a/media-sound/noisetorch/noisetorch-0.11.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module desktop fcaps
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/lawl/NoiseTorch"
-else
- SRC_URI="https://github.com/lawl/NoiseTorch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-
- S="${WORKDIR}/NoiseTorch-${PV}"
-fi
-
-DESCRIPTION="Real-time microphone noise suppression on Linux. "
-HOMEPAGE="https://github.com/lawl/NoiseTorch"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-go-module_set_globals
-
-src_install() {
- dobin "${S}/bin/noisetorch"
- domenu "${S}/assets/noisetorch.desktop"
- doicon "${S}/assets/icon/noisetorch.png"
-}
-
-pkg_postinst() {
- fcaps CAP_SYS_RESOURCE usr/bin/noisetorch
-}
diff --git a/media-sound/noisetorch/noisetorch-9999.ebuild b/media-sound/noisetorch/noisetorch-9999.ebuild
deleted file mode 100644
index f74b75494f..0000000000
--- a/media-sound/noisetorch/noisetorch-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module desktop fcaps
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/lawl/NoiseTorch"
-else
- SRC_URI="https://github.com/lawl/NoiseTorch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-
- S="${WORKDIR}/NoiseTorch-${PV}"
-fi
-
-DESCRIPTION="Real-time microphone noise suppression on Linux. "
-HOMEPAGE="https://github.com/lawl/NoiseTorch"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-go-module_set_globals
-
-src_prepare() {
- default
- eapply "${FILESDIR}/fix-make.patch"
-}
-
-src_install() {
- dobin "${S}/bin/noisetorch"
- domenu "${S}/assets/noisetorch.desktop"
- doicon "${S}/assets/icon/noisetorch.png"
-}
-
-pkg_postinst() {
- fcaps CAP_SYS_RESOURCE usr/bin/noisetorch
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 337f08d8e3..de7eb00e29 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,12 +1,3 @@
-# Adel KARA SLIMANE
-# Mask all version of media-sound/noisetorch
-# the author reported on the likeliness of having lost control
-# of his private keys, which means there is a possibility
-# that malicious code have been added to his projects.
-# More information in https://github.com/lawl/NoiseTorch
-# (look at issues, latest release and commit messages)
-media-sound/noisetorch
-
# Andrew Ammerlaan (2021-03-29)
# James Beddek (2021-10-09)
# Per profile masking in overlays is currently not working
diff --git a/sci-libs/ButterflyPACK/ButterflyPACK-2.1.1.ebuild b/sci-libs/ButterflyPACK/ButterflyPACK-2.1.1.ebuild
index cd801deea7..fc3c26b5f2 100644
--- a/sci-libs/ButterflyPACK/ButterflyPACK-2.1.1.ebuild
+++ b/sci-libs/ButterflyPACK/ButterflyPACK-2.1.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake fortran-2
+inherit cmake fortran-2 toolchain-funcs
DESCRIPTION="Mathematical software for solving large-scale dense linear systems"
HOMEPAGE="https://github.com/liuyangzhuan/ButterflyPACK"
@@ -29,12 +29,12 @@ DOCS=( README.md CHANGELOG )
PATCHES=( "${FILESDIR}/${P}-no-examples.patch" )
src_configure() {
+ local pkgc="$(tc-getPKG_CONFIG)"
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
-
- -DTPL_ARPACK_LIBRARIES=$(usex arpack)
- -DTPL_MAGMA_LIBRARIES=$(usex magma)
)
+ use arpack && mycmakeargs+=( "-DTPL_ARPACK_LIBRARIES=$(${pkgc} --libs arpack)" )
+ use magma && mycmakeargs+=( "-DTPL_MAGMA_LIBRARIES=$(${pkgc} --libs magma)" )
cmake_src_configure
}
diff --git a/sci-libs/CoDiPack/CoDiPack-0_pre20210720.ebuild b/sci-libs/CoDiPack/CoDiPack-0_pre20210720-r1.ebuild
similarity index 98%
rename from sci-libs/CoDiPack/CoDiPack-0_pre20210720.ebuild
rename to sci-libs/CoDiPack/CoDiPack-0_pre20210720-r1.ebuild
index 1eb3adeac4..d7dd0aac5b 100644
--- a/sci-libs/CoDiPack/CoDiPack-0_pre20210720.ebuild
+++ b/sci-libs/CoDiPack/CoDiPack-0_pre20210720-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
KEYWORDS="~amd64"
LICENSE='GPL-3'
IUSE="doc tutorials" # examples mpi
-SLOT="0"
+SLOT="0/${PV}"
#DEPEND="mpi? ( sci-libs/MeDiPack )"
RDEPEND="${DEPEND}"
diff --git a/sci-libs/CoDiPack/Manifest b/sci-libs/CoDiPack/Manifest
index 3ed3bfc49b..cf29ee3984 100644
--- a/sci-libs/CoDiPack/Manifest
+++ b/sci-libs/CoDiPack/Manifest
@@ -1 +1 @@
-DIST CoDiPack-0_pre20210720.tar.gz 279783 BLAKE2B c3d44d120b59d0ef2e12b0d6de3083b0fc27ca78b38586d081354838b7542fc9feb789285670781a0fdd947ea95d2d8aab667411eea3a81631493376c7cd54dc SHA512 ed568a2b53c83ce0325aeaabb88f998cffbaae1851ecb900445ea582003fbe382b880fd0cfbbd2330c00f07c390f5769c2e02d35efab4b70642233d0ab82883f
+DIST CoDiPack-0_pre20210720-r1.tar.gz 279783 BLAKE2B c3d44d120b59d0ef2e12b0d6de3083b0fc27ca78b38586d081354838b7542fc9feb789285670781a0fdd947ea95d2d8aab667411eea3a81631493376c7cd54dc SHA512 ed568a2b53c83ce0325aeaabb88f998cffbaae1851ecb900445ea582003fbe382b880fd0cfbbd2330c00f07c390f5769c2e02d35efab4b70642233d0ab82883f
diff --git a/sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331.ebuild b/sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r1.ebuild
similarity index 96%
rename from sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331.ebuild
rename to sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r1.ebuild
index fd6d8db209..fb00664a65 100644
--- a/sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331.ebuild
+++ b/sci-libs/CombBLAS/CombBLAS-1.16.0_p20220331-r1.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}/${P}-cxx17.patch"
"${FILESDIR}/${P}-system-libs.patch"
"${FILESDIR}/${P}-GNUInstallDirs.patch"
+ "${FILESDIR}/${P}-fix-matlab-addpath.patch"
)
src_prepare() {
diff --git a/sci-libs/CombBLAS/Manifest b/sci-libs/CombBLAS/Manifest
index a6a6f70334..bb7f1cc0f7 100644
--- a/sci-libs/CombBLAS/Manifest
+++ b/sci-libs/CombBLAS/Manifest
@@ -1 +1 @@
-DIST CombBLAS-1.16.0_p20220331.tar.gz 43783582 BLAKE2B b80e871a21832b2210642bacddeef0c5447cee1e46be3aab2accaaddd393bc0fc05c6d7505a154d303dc3449ec5772d789300b6a78dd97e8119739495aba642f SHA512 5cb6156ab0d8a3fa9c13b9599d2e2bd3f6d3a1fd81f101cf2cadbe72d4b3bcd35013687835549f98fef3ea8e371e562ac55d2f4aa91720a0ef1bdf6da3a97640
+DIST CombBLAS-1.16.0_p20220331-r1.tar.gz 43783582 BLAKE2B b80e871a21832b2210642bacddeef0c5447cee1e46be3aab2accaaddd393bc0fc05c6d7505a154d303dc3449ec5772d789300b6a78dd97e8119739495aba642f SHA512 5cb6156ab0d8a3fa9c13b9599d2e2bd3f6d3a1fd81f101cf2cadbe72d4b3bcd35013687835549f98fef3ea8e371e562ac55d2f4aa91720a0ef1bdf6da3a97640
diff --git a/sci-libs/CombBLAS/files/CombBLAS-1.16.0_p20220331-fix-matlab-addpath.patch b/sci-libs/CombBLAS/files/CombBLAS-1.16.0_p20220331-fix-matlab-addpath.patch
new file mode 100644
index 0000000000..8cfacc2640
--- /dev/null
+++ b/sci-libs/CombBLAS/files/CombBLAS-1.16.0_p20220331-fix-matlab-addpath.patch
@@ -0,0 +1,21 @@
+--- a/Matlab/startup.m
++++ b/Matlab/startup.m
+@@ -1,12 +1,8 @@
+-disp('This is C:\Users\John\Documents\Gblas\Matlab\startup.m')
++disp('This is /usr/share/octave/site/m/CombBLAS/startup.m')
+
+ format compact
+
+-addpath('C:\Users\John\Documents\LincolnLabs\matlab')
+-addpath('C:\Users\John\Documents\MATLAB\meshpart')
+-addpath('C:\Users\John\Documents\MATLAB\UFget')
+-addpath('C:\Users\John\Documents\MATLAB\ncm')
+-addpath('C:\Users\John\Documents\Gblas\Matlab\utils')
+-addpath('C:\Users\John\Documents\Gblas\Matlab\spindex')
+-addpath('C:\Users\John\Documents\Gblas\Matlab\apsp')
+-addpath('C:\Users\John\Documents\Gblas\Matlab\stuff')
+\ Manca newline alla fine del file
++addpath('/usr/share/octave/site/m/CombBLAS/utils')
++addpath('/usr/share/octave/site/m/CombBLAS/spindex')
++addpath('/usr/share/octave/site/m/CombBLAS/apsp')
++addpath('/usr/share/octave/site/m/CombBLAS/stuff')
diff --git a/sci-libs/MeDiPack/Manifest b/sci-libs/MeDiPack/Manifest
index 109b67a45d..926f70c471 100644
--- a/sci-libs/MeDiPack/Manifest
+++ b/sci-libs/MeDiPack/Manifest
@@ -1 +1 @@
-DIST MeDiPack-1.2_p20220103.tar.gz 157591 BLAKE2B 3cad81f48ac88a6859ba9fa539c6e1196d4ff487a6c6426fe96c431368869bf8b89a30a16e5bd442c980faf4560909045091ff615cf433663e0d8e8c86d61443 SHA512 d588140888fd6290237fc443f6ac7c4f017cc9cfd87034bc9f6ae24e8ad360e47dddba24b52f8448df3b53b16178e49e381dd4d9361da92b8bd6f175bf609c22
+DIST MeDiPack-1.2_p20220103-r1.tar.gz 157591 BLAKE2B 3cad81f48ac88a6859ba9fa539c6e1196d4ff487a6c6426fe96c431368869bf8b89a30a16e5bd442c980faf4560909045091ff615cf433663e0d8e8c86d61443 SHA512 d588140888fd6290237fc443f6ac7c4f017cc9cfd87034bc9f6ae24e8ad360e47dddba24b52f8448df3b53b16178e49e381dd4d9361da92b8bd6f175bf609c22
diff --git a/sci-libs/MeDiPack/MeDiPack-1.2_p20220103.ebuild b/sci-libs/MeDiPack/MeDiPack-1.2_p20220103-r1.ebuild
similarity index 87%
rename from sci-libs/MeDiPack/MeDiPack-1.2_p20220103.ebuild
rename to sci-libs/MeDiPack/MeDiPack-1.2_p20220103-r1.ebuild
index 1ab0e5e810..6b28d63324 100644
--- a/sci-libs/MeDiPack/MeDiPack-1.2_p20220103.ebuild
+++ b/sci-libs/MeDiPack/MeDiPack-1.2_p20220103-r1.ebuild
@@ -15,10 +15,8 @@ S="${WORKDIR}/${PN}-${COMMIT}"
KEYWORDS="~amd64"
LICENSE='GPL-3'
-IUSE="tutorials"
-SLOT="0"
+SLOT="0/${PV}"
-DEPEND="tutorials? ( sci-libs/CoDiPack )"
RDEPEND="${DEPEND}"
BDEPEND="sys-devel/gsl"
@@ -29,7 +27,6 @@ src_prepare() {
src_compile() {
emake all
- use tutorials && emake tutorials
}
src_install() {
diff --git a/sci-libs/MeDiPack/metadata.xml b/sci-libs/MeDiPack/metadata.xml
index b8c93f60c3..ab61123350 100644
--- a/sci-libs/MeDiPack/metadata.xml
+++ b/sci-libs/MeDiPack/metadata.xml
@@ -9,7 +9,4 @@
https://github.com/SciCompKL/MeDiPack/issues
SciCompKL/MeDiPack
-
diff --git a/sci-libs/Mutationpp/Mutationpp-1.0.5.ebuild b/sci-libs/Mutationpp/Mutationpp-1.0.5-r1.ebuild
similarity index 93%
rename from sci-libs/Mutationpp/Mutationpp-1.0.5.ebuild
rename to sci-libs/Mutationpp/Mutationpp-1.0.5-r1.ebuild
index 29c4a5dc43..35030a8abd 100644
--- a/sci-libs/Mutationpp/Mutationpp-1.0.5.ebuild
+++ b/sci-libs/Mutationpp/Mutationpp-1.0.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_OPTIONAL=1
DISTUTILS_USE_PEP517=setuptools
FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 cmake flag-o-matic fortran-2
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mutationpp/${PN}/archive/refs/tags/v${PV}.tar.gz ->
KEYWORDS="~amd64"
LICENSE="LGPL-3"
-SLOT="0"
+SLOT="0/${PV}"
IUSE="doc fortran python test"
RDEPEND="
@@ -43,7 +43,10 @@ BDEPEND="
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DOCS=( {README,CHANGELOG}.md docs )
-PATCHES=( "${FILESDIR}/${P}-system-libs.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-system-libs.patch"
+ "${FILESDIR}/${P}-respect-flags.patch"
+)
distutils_enable_tests pytest
diff --git a/sci-libs/Mutationpp/files/Mutationpp-1.0.5-respect-flags.patch b/sci-libs/Mutationpp/files/Mutationpp-1.0.5-respect-flags.patch
new file mode 100644
index 0000000000..2f629ab546
--- /dev/null
+++ b/sci-libs/Mutationpp/files/Mutationpp-1.0.5-respect-flags.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,7 +131,7 @@
+
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ #set (CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wold-style-cast")
+- set (CMAKE_CXX_FLAGS "-g")
++ set (CMAKE_CXX_FLAGS "-g ${CMAKE_CXX_FLAGS}")
+ endif ()
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+@@ -152,13 +152,11 @@
+
+ if (Fortran_COMPILER_NAME STREQUAL "gfortran")
+ # gfortran
+- set (CMAKE_Fortran_FLAGS "-fdefault-real-8")
+- set (CMAKE_Fortran_FLAGS_RELEASE "-O3")
++ set (CMAKE_Fortran_FLAGS "-fdefault-real-8 ${CMAKE_Fortran_FLAGS}")
+ set (CMAKE_Fortran_FLAGS_DEBUG "-g")
+ elseif (Fortran_COMPILER_NAME STREQUAL "ifort")
+ # ifort (untested)
+ set (CMAKE_Fortran_FLAGS "-r8")
+- set (CMAKE_Fortran_FLAGS_RELEASE "-O3")
+ set (CMAKE_Fortran_FLAGS_DEBUG "-g -traceback -fpe0 -check all")
+ endif()
+ endif()
diff --git a/sci-libs/OpDiLib/OpDiLib-1.2.1.ebuild b/sci-libs/OpDiLib/OpDiLib-1.2.1-r1.ebuild
similarity index 98%
rename from sci-libs/OpDiLib/OpDiLib-1.2.1.ebuild
rename to sci-libs/OpDiLib/OpDiLib-1.2.1-r1.ebuild
index 5fc1bc3503..f166613e58 100644
--- a/sci-libs/OpDiLib/OpDiLib-1.2.1.ebuild
+++ b/sci-libs/OpDiLib/OpDiLib-1.2.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/SciCompKL/${PN}/archive/refs/tags/v${PV}.tar.gz -> $
KEYWORDS="~amd64"
LICENSE='GPL-3'
IUSE="examples"
-SLOT="0"
+SLOT="0/${PV}"
DEPEND="examples? ( sci-libs/CoDiPack )"
RDEPEND="${DEPEND}"
diff --git a/sci-libs/ensmallen/ensmallen-2.19.0.ebuild b/sci-libs/ensmallen/ensmallen-2.19.0-r1.ebuild
similarity index 98%
rename from sci-libs/ensmallen/ensmallen-2.19.0.ebuild
rename to sci-libs/ensmallen/ensmallen-2.19.0-r1.ebuild
index 3c3baedb60..7cc034d17c 100644
--- a/sci-libs/ensmallen/ensmallen-2.19.0.ebuild
+++ b/sci-libs/ensmallen/ensmallen-2.19.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mlpack/ensmallen/archive/${PV}.tar.gz -> ${P}.tar.gz
KEYWORDS="~amd64"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
IUSE="openmp test"
RESTRICT="!test? ( test )"
diff --git a/sci-libs/jdqz/jdqz-0_pre19971107-r3.ebuild b/sci-libs/jdqz/jdqz-0_pre19971107-r4.ebuild
similarity index 85%
rename from sci-libs/jdqz/jdqz-0_pre19971107-r3.ebuild
rename to sci-libs/jdqz/jdqz-0_pre19971107-r4.ebuild
index 77c5a31e2f..515cb909d2 100644
--- a/sci-libs/jdqz/jdqz-0_pre19971107-r3.ebuild
+++ b/sci-libs/jdqz/jdqz-0_pre19971107-r4.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
@@ -11,7 +11,7 @@ SRC_URI="https://www.win.tue.nl/~hochsten/jd/${PN}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}"
LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="doc test"
@@ -27,17 +27,14 @@ BDEPEND="doc? ( dev-texlive/texlive-latex )"
PATCHES=( "${FILESDIR}/makefile.patch" )
RESTRICT="!test? ( test )"
-src_prepare() {
- append-fflags "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)"
- default
-}
-
src_compile() {
+ local pkgc="$(tc-getPKG_CONFIG)"
+ append-fflags "$(${pkgc} --libs blas) $(${pkgc} --libs lapack)"
if use doc; then
pdflatex manual.tex || die
fi
- cd "jdlib" || die
+ pushd "jdlib" || die
emake
ln -s libjdqz.so.0 libjdqz.so || die
}
diff --git a/sci-libs/libpotassco/Manifest b/sci-libs/libpotassco/Manifest
index 8876d854d3..a670dbefd7 100644
--- a/sci-libs/libpotassco/Manifest
+++ b/sci-libs/libpotassco/Manifest
@@ -1 +1 @@
-DIST libpotassco-0_pre20200612-r1.tar.gz 210167 BLAKE2B 2e7e91674458e28b7d2208b200c5db9f4dace7871a239ebc85fa07d70aee9fa22bf48a41f601ac85b7d083bd62750a08eb98255373a77cb1406dd4b451c42aa4 SHA512 649cc07a2fcdea98ece9a3515e2ccc451e8fb6046642be1a8cd09919e100cf215376703690430ae58b8f5d9dab53b4e0bc4b0f3b19e4ff16bd0b62bfe20404fd
+DIST libpotassco-0_pre20200612-r2.tar.gz 210167 BLAKE2B 2e7e91674458e28b7d2208b200c5db9f4dace7871a239ebc85fa07d70aee9fa22bf48a41f601ac85b7d083bd62750a08eb98255373a77cb1406dd4b451c42aa4 SHA512 649cc07a2fcdea98ece9a3515e2ccc451e8fb6046642be1a8cd09919e100cf215376703690430ae58b8f5d9dab53b4e0bc4b0f3b19e4ff16bd0b62bfe20404fd
diff --git a/sci-libs/libpotassco/libpotassco-0_pre20200612-r1.ebuild b/sci-libs/libpotassco/libpotassco-0_pre20200612-r2.ebuild
similarity index 98%
rename from sci-libs/libpotassco/libpotassco-0_pre20200612-r1.ebuild
rename to sci-libs/libpotassco/libpotassco-0_pre20200612-r2.ebuild
index 7f13cf089f..ec6ee26f76 100644
--- a/sci-libs/libpotassco/libpotassco-0_pre20200612-r1.ebuild
+++ b/sci-libs/libpotassco/libpotassco-0_pre20200612-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/potassco/${PN}/archive/${COMMIT}.tar.gz -> ${PF}.tar
S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="test tools"
diff --git a/sci-libs/mlpack/mlpack-3.4.2_p20220501.ebuild b/sci-libs/mlpack/mlpack-3.4.2_p20220501.ebuild
index 29b2f8f458..0b59057d3e 100644
--- a/sci-libs/mlpack/mlpack-3.4.2_p20220501.ebuild
+++ b/sci-libs/mlpack/mlpack-3.4.2_p20220501.ebuild
@@ -28,7 +28,7 @@ EGO_SUM=(
"rsc.io/pdf v0.1.1/go.mod"
)
GO_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit cmake flag-o-matic go-module python-single-r1
diff --git a/sci-libs/saclib/Manifest b/sci-libs/saclib/Manifest
index 71a3569e9f..7757917a46 100644
--- a/sci-libs/saclib/Manifest
+++ b/sci-libs/saclib/Manifest
@@ -1,2 +1,2 @@
-DIST saclib-2.2.8_p20220502-r1.tar.gz 2493425 BLAKE2B 5e5b631617ce317d5d7f4d5844ab32b5dabc01d0cbee7486d98288fc30b4a26e4d1d9d69ccdf886fde0584c6196b33f9aa7488bb24bd6170ff1b41ffed68219c SHA512 0e3ad12ee1129cbb792d1275563d718abd5a0ddaf458ce55fe8d72200a0545b2d6c5de7052651909d0c85631ea12d1f342c33a044ebeac48e947c2f96edf64ed
+DIST saclib-2.2.8_p20220502-r2.tar.gz 2493425 BLAKE2B 5e5b631617ce317d5d7f4d5844ab32b5dabc01d0cbee7486d98288fc30b4a26e4d1d9d69ccdf886fde0584c6196b33f9aa7488bb24bd6170ff1b41ffed68219c SHA512 0e3ad12ee1129cbb792d1275563d718abd5a0ddaf458ce55fe8d72200a0545b2d6c5de7052651909d0c85631ea12d1f342c33a044ebeac48e947c2f96edf64ed
DIST saclib2.2.8.tgz 3060308 BLAKE2B 446546e02e3571bc523bd7602894f161d3c569ddd2126dd596125b7623a20bd44df2d04d062ec3891d2f4c4dadf1a63c9ab840316a47c68ff86ff9d841b9da35 SHA512 72589e07beed5abd2fce7a37c4e91122814d6b0fb373b19664c4892a4a68064bacbe886d76ec66c18aec76e54ae022b90a0dfd1b5ca68d617f4bfa8251ea8fb4
diff --git a/sci-libs/saclib/saclib-2.2.8_p20220502-r1.ebuild b/sci-libs/saclib/saclib-2.2.8_p20220502-r2.ebuild
similarity index 98%
rename from sci-libs/saclib/saclib-2.2.8_p20220502-r1.ebuild
rename to sci-libs/saclib/saclib-2.2.8_p20220502-r2.ebuild
index 007252bd08..2dadf8bc37 100644
--- a/sci-libs/saclib/saclib-2.2.8_p20220502-r1.ebuild
+++ b/sci-libs/saclib/saclib-2.2.8_p20220502-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Alessandro-Barbieri/${PN}/archive/${COMMIT}.tar.gz -
S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
BDEPEND="app-shells/tcsh"
diff --git a/sci-libs/superlu_dist/superlu_dist-8.0.0_p20220526.ebuild b/sci-libs/superlu_dist/superlu_dist-8.0.0_p20220526.ebuild
index 018291878d..c0bf990193 100644
--- a/sci-libs/superlu_dist/superlu_dist-8.0.0_p20220526.ebuild
+++ b/sci-libs/superlu_dist/superlu_dist-8.0.0_p20220526.ebuild
@@ -45,7 +45,7 @@ PATCHES=(
"${FILESDIR}/${P}-system-colamd.patch"
"${FILESDIR}/${P}-fortran.patch"
)
-RESTRICT="!test? ( test )"
+RESTRICT="test" # tests require an MPI setup
src_prepare() {
rm -r CBLAS || die
diff --git a/sci-mathematics/clingo/clingo-5.5.2.ebuild b/sci-mathematics/clingo/clingo-5.5.2.ebuild
index 55957c759f..48020cf1fe 100644
--- a/sci-mathematics/clingo/clingo-5.5.2.ebuild
+++ b/sci-mathematics/clingo/clingo-5.5.2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
LUA_COMPAT=( lua5-{3..4} )
-PYTHON_COMPAT=( python3_{8..10} ) # IDK how to pass pypy3
+PYTHON_COMPAT=( python3_{8..11} ) # IDK how to pass pypy3
inherit cmake flag-o-matic lua-single python-single-r1 toolchain-funcs
diff --git a/sci-mathematics/qepcad/Manifest b/sci-mathematics/qepcad/Manifest
index edac71776c..24ec51cb62 100644
--- a/sci-mathematics/qepcad/Manifest
+++ b/sci-mathematics/qepcad/Manifest
@@ -1 +1 @@
-DIST qepcad-1.72b_p20220502-r1.tar.gz 178476571 BLAKE2B fe1c6f9d874e2e3d74f10c0cf1a0f84768293e69020fca6070293388227674e66e4db9d341876c793abe0ef2211c8271b47c2c2f67e17332a091fd79d73971ec SHA512 f6a14c42ec696f7525fa7c1ae2549172e853b74f106fdcce2d52f7929ff031726869657c5627ab3c85ca2e6d5e64d0f8fd80132f14f7b66ea2a8d27e693edbaf
+DIST qepcad-1.72b_p20220502-r2.tar.gz 178476571 BLAKE2B fe1c6f9d874e2e3d74f10c0cf1a0f84768293e69020fca6070293388227674e66e4db9d341876c793abe0ef2211c8271b47c2c2f67e17332a091fd79d73971ec SHA512 f6a14c42ec696f7525fa7c1ae2549172e853b74f106fdcce2d52f7929ff031726869657c5627ab3c85ca2e6d5e64d0f8fd80132f14f7b66ea2a8d27e693edbaf
diff --git a/sci-mathematics/qepcad/qepcad-1.72b_p20220502-r1.ebuild b/sci-mathematics/qepcad/qepcad-1.72b_p20220502-r2.ebuild
similarity index 98%
rename from sci-mathematics/qepcad/qepcad-1.72b_p20220502-r1.ebuild
rename to sci-mathematics/qepcad/qepcad-1.72b_p20220502-r2.ebuild
index 1d832e72a8..70ba312d2c 100644
--- a/sci-mathematics/qepcad/qepcad-1.72b_p20220502-r1.ebuild
+++ b/sci-mathematics/qepcad/qepcad-1.72b_p20220502-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Alessandro-Barbieri/${PN}/archive/${COMMIT}.tar.gz -
S="${WORKDIR}/${PN}-${COMMIT}/qesource"
LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
RDEPEND="
diff --git a/sci-physics/SU2/SU2-7.2.0-r1.ebuild b/sci-physics/SU2/SU2-7.2.0-r1.ebuild
index 2d2ce73611..29413cf3ee 100644
--- a/sci-physics/SU2/SU2-7.2.0-r1.ebuild
+++ b/sci-physics/SU2/SU2-7.2.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit meson python-single-r1
@@ -26,35 +26,43 @@ IUSE="autodiff cgns directdiff librom mixed-precision mkl +mpi mpp openblas open
RDEPEND="
${PYTHON_DEPS}
- cgns? ( sci-libs/cgnslib:= )
+ cgns? ( >=sci-libs/cgnslib-4 )
librom? ( sci-libs/libROM )
mkl? ( sci-libs/mkl )
mpi? (
sci-libs/metis
virtual/mpi[cxx]
)
- mpp? ( sci-libs/Mutationpp )
+ mpp? ( sci-libs/Mutationpp:= )
openblas? ( sci-libs/openblas )
parmetis? ( sci-libs/parmetis )
pastix? (
+ #include
+-#include "../../../Common/include/geometry/dual_grid/CEdge.hpp"
+-#include "../../../Common/include/geometry/dual_grid/CVertex.hpp"
++#include "../../../../Common/include/geometry/dual_grid/CEdge.hpp"
++#include "../../../../Common/include/geometry/dual_grid/CVertex.hpp"
+
+ TEST_CASE("Volume Computation", "[Dual Grid]") {
+
+--- a/UnitTests/Common/geometry/primal_grid/CPrimalGrid_tests.cpp
++++ b/UnitTests/Common/geometry/primal_grid/CPrimalGrid_tests.cpp
+@@ -27,8 +27,8 @@
+
+ #include "catch.hpp"
+ #include
+-#include "../../../Common/include/geometry/primal_grid/CPrimalGrid.hpp"
+-#include "../../../Common/include/geometry/primal_grid/CHexahedron.hpp"
++#include "../../../../Common/include/geometry/primal_grid/CPrimalGrid.hpp"
++#include "../../../../Common/include/geometry/primal_grid/CHexahedron.hpp"
+
+ TEST_CASE("Center of gravity computation", "[Primal Grid]") {
+
+--- a/UnitTests/test_driver.cpp
++++ b/UnitTests/test_driver.cpp
+@@ -31,8 +31,8 @@
+ #define CATCH_CONFIG_RUNNER
+ #include "catch.hpp"
+
+-#include "../../../Common/include/parallelization/mpi_structure.hpp"
+-#include "../../../Common/include/option_structure.hpp"
++#include "../Common/include/parallelization/mpi_structure.hpp"
++#include "../Common/include/option_structure.hpp"
+
+ int main(int argc, char *argv[]) {
+
+--- a/SU2_GEO/include/SU2_GEO.hpp
++++ b/SU2_GEO/include/SU2_GEO.hpp
+@@ -38,7 +38,7 @@
+
+ #include "../../Common/include/geometry/CPhysicalGeometry.hpp"
+ #include "../../Common/include/CConfig.hpp"
+-#include "../../../Common/include/grid_movement/CSurfaceMovement.hpp"
+-#include "../../../Common/include/grid_movement/CFreeFormDefBox.hpp"
++#include "../../Common/include/grid_movement/CSurfaceMovement.hpp"
++#include "../../Common/include/grid_movement/CFreeFormDefBox.hpp"
+
+ using namespace std;
diff --git a/sci-physics/SU2/files/SU2-7.2.0-system-libraries.patch b/sci-physics/SU2/files/SU2-7.2.0-system-libraries.patch
index 3e96c4dd43..176caee932 100644
--- a/sci-physics/SU2/files/SU2-7.2.0-system-libraries.patch
+++ b/sci-physics/SU2/files/SU2-7.2.0-system-libraries.patch
@@ -152,15 +152,3 @@
#include "drivers/CDriver.hpp"
#include "drivers/CSinglezoneDriver.hpp"
---- a/SU2_GEO/include/SU2_GEO.hpp
-+++ b/SU2_GEO/include/SU2_GEO.hpp
-@@ -38,7 +38,7 @@
-
- #include "../../Common/include/geometry/CPhysicalGeometry.hpp"
- #include "../../Common/include/CConfig.hpp"
--#include "../../../Common/include/grid_movement/CSurfaceMovement.hpp"
--#include "../../../Common/include/grid_movement/CFreeFormDefBox.hpp"
-+#include "../../Common/include/grid_movement/CSurfaceMovement.hpp"
-+#include "../../Common/include/grid_movement/CFreeFormDefBox.hpp"
-
- using namespace std;
diff --git a/sci-physics/mbdyn/mbdyn-1.7.3_p20210925-r1.ebuild b/sci-physics/mbdyn/mbdyn-1.7.3_p20210925-r1.ebuild
index 73aa5c47fc..d976ada128 100644
--- a/sci-physics/mbdyn/mbdyn-1.7.3_p20210925-r1.ebuild
+++ b/sci-physics/mbdyn/mbdyn-1.7.3_p20210925-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
COMMIT="ae57618c4e7b030b59707b8c156a6e2a94a6efd0"
MYP="${PN}-${COMMIT}"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit autotools flag-o-matic fortran-2 pam python-single-r1
diff --git a/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild b/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild
index 01a52edc00..97a6bd69b1 100644
--- a/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild
+++ b/sys-cluster/OpenHPC-meta/OpenHPC-meta-2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-single-r1
diff --git a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild
index 5ae7734f0c..1265bf3b52 100644
--- a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild
+++ b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
inherit autotools python-any-r1
diff --git a/sys-cluster/genders/genders-1.28.1.ebuild b/sys-cluster/genders/genders-1.28.1.ebuild
index fda41cd15e..772e6535ec 100644
--- a/sys-cluster/genders/genders-1.28.1.ebuild
+++ b/sys-cluster/genders/genders-1.28.1.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=7
@@ -6,7 +6,7 @@ EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
MY_PV="$(ver_rs 1-2 -)"
MY_P="${PN}-${MY_PV}"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit distutils-r1 perl-module java-pkg-opt-2 flag-o-matic
diff --git a/sys-cluster/libi/libi-5.0.1_p20180510-r1.ebuild b/sys-cluster/libi/libi-5.0.1_p20180510-r2.ebuild
similarity index 98%
rename from sys-cluster/libi/libi-5.0.1_p20180510-r1.ebuild
rename to sys-cluster/libi/libi-5.0.1_p20180510-r2.ebuild
index 2d6aca2797..3fb7e62c63 100644
--- a/sys-cluster/libi/libi-5.0.1_p20180510-r1.ebuild
+++ b/sys-cluster/libi/libi-5.0.1_p20180510-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dyninst/mrnet/archive/${COMMIT}.tar.gz -> ${P/libi/m
S="${WORKDIR}/mrnet-${COMMIT}/external/libi"
LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="slurm"
diff --git a/sys-cluster/mcxx/mcxx-2021.06.ebuild b/sys-cluster/mcxx/mcxx-2021.06.ebuild
index f9420aeb5b..c3d2ae1c21 100644
--- a/sys-cluster/mcxx/mcxx-2021.06.ebuild
+++ b/sys-cluster/mcxx/mcxx-2021.06.ebuild
@@ -7,7 +7,7 @@ DOCS_BUILDER="doxygen"
DOCS_DIR="doc"
DOCS_CONFIG_NAME="doxygen_tl.in"
MYPV="github-release-${PV}"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit autotools flag-o-matic fortran-2 python-any-r1 docs
diff --git a/sys-cluster/nova/nova-25.0.0-r1.ebuild b/sys-cluster/nova/nova-25.0.0-r1.ebuild
index 31b5977e78..ef270c92fe 100644
--- a/sys-cluster/nova/nova-25.0.0-r1.ebuild
+++ b/sys-cluster/nova/nova-25.0.0-r1.ebuild
@@ -173,6 +173,8 @@ python_install_all() {
diropts -m 0750 -o nova -g qemu
dodir /var/log/nova /var/lib/nova/instances
diropts -m 0750 -o nova -g nova
+ keepdir /var/log/nova
+ keepdir /var/lib/nova
insinto /etc/nova
insopts -m 0640 -o nova -g nova
@@ -216,9 +218,9 @@ pkg_postinst() {
use iscsi && elog "iscsid needs to be running if you want cinder to connect"
- optfeature "osprofiler" dev-python/osprofiler-1.4.0
- optfeature "powervm" dev-python/pypowervm-1.1.15
- optfeature "zvm" dev-python/zVMCloudConnector-1.3.0
- optfeature "hyperv" dev-python/os-win-5.5.0
- optfeature "vmware" dev-python/oslo-vmware-3.6.0
+ optfeature "osprofiler" >=dev-python/osprofiler-1.4.0
+ optfeature "powervm" >=dev-python/pypowervm-1.1.15
+ optfeature "zvm" >=dev-python/zVMCloudConnector-1.3.0
+ optfeature "hyperv" >=dev-python/os-win-5.5.0
+ optfeature "vmware" >=dev-python/oslo-vmware-3.6.0
}
diff --git a/sys-cluster/otf2/otf2-2.3-r2.ebuild b/sys-cluster/otf2/otf2-2.3-r2.ebuild
index 52ae069227..8bc4694784 100644
--- a/sys-cluster/otf2/otf2-2.3-r2.ebuild
+++ b/sys-cluster/otf2/otf2-2.3-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
inherit python-single-r1 toolchain-funcs
diff --git a/sys-cluster/scr/scr-3.0.ebuild b/sys-cluster/scr/scr-3.0.ebuild
index ac71cc7d12..fe59b3b3d9 100644
--- a/sys-cluster/scr/scr-3.0.ebuild
+++ b/sys-cluster/scr/scr-3.0.ebuild
@@ -8,7 +8,7 @@ DOCS_BUILDER="sphinx"
DOCS_DIR="${S}/doc/rst"
FORTRAN_NEEDED="fortran"
MYPV="${PV/_pre/rc}"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit cmake python-single-r1 fortran-2 docs
diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild b/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
index 3cc5f940f7..06981810ec 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
DOCS_BUILDER="doxygen"
DOCS_CONFIG_NAME="doxy"
FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
inherit docs flag-o-matic fortran-2 python-any-r1 toolchain-funcs
diff --git a/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild b/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild
index ed9809f651..a8bae06a20 100644
--- a/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild
+++ b/sys-cluster/sionlibl/sionlibl-1.7.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
DOCS_BUILDER="doxygen"
DOCS_CONFIG_NAME="doxy"
FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
inherit docs flag-o-matic fortran-2 python-any-r1 toolchain-funcs
diff --git a/sys-cluster/usort/Manifest b/sys-cluster/usort/Manifest
index 71cc02443d..7b691dce47 100644
--- a/sys-cluster/usort/Manifest
+++ b/sys-cluster/usort/Manifest
@@ -1 +1 @@
-DIST usort-0_pre20211230.tar.gz 36255 BLAKE2B 1137c96141c3bdd26cdddb650224ae276e88eac2f8190210ba9673030f7867f110411040ba4415821fef9b85f1af737f3e880ab15ded164fe3cd8135fcf9d725 SHA512 82474b33e0c74d6ce78a4e34bbbbb0e666646a708bbd56b298e3ae054c0c9682bfe6ea126f4f88c7047ad34eb1bc8aec6936f5cfb867dd5b3254052361b397ea
+DIST usort-0_pre20211230-r1.tar.gz 36255 BLAKE2B 1137c96141c3bdd26cdddb650224ae276e88eac2f8190210ba9673030f7867f110411040ba4415821fef9b85f1af737f3e880ab15ded164fe3cd8135fcf9d725 SHA512 82474b33e0c74d6ce78a4e34bbbbb0e666646a708bbd56b298e3ae054c0c9682bfe6ea126f4f88c7047ad34eb1bc8aec6936f5cfb867dd5b3254052361b397ea
diff --git a/sys-cluster/usort/usort-0_pre20211230.ebuild b/sys-cluster/usort/usort-0_pre20211230-r1.ebuild
similarity index 94%
rename from sys-cluster/usort/usort-0_pre20211230.ebuild
rename to sys-cluster/usort/usort-0_pre20211230-r1.ebuild
index 31b9b5e796..67b6f1b192 100644
--- a/sys-cluster/usort/usort-0_pre20211230.ebuild
+++ b/sys-cluster/usort/usort-0_pre20211230-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
KEYWORDS="~amd64"
LICENSE='MIT'
IUSE=""
-SLOT="0"
+SLOT="0/${PV}"
DEPEND="virtual/mpi"
RDEPEND="${DEPEND}"
@@ -31,6 +31,7 @@ src_prepare() {
dos2unix CMakeLists.txt || die
dos2unix include/seqUtils.h || die
dos2unix include/seqUtils.tcc || die
+ dos2unix include/ompUtils.tcc || die
cmake_src_prepare
}
diff --git a/sys-cluster/veloc/veloc-1.6.ebuild b/sys-cluster/veloc/veloc-1.6.ebuild
index 79255c572b..d88bbd903b 100644
--- a/sys-cluster/veloc/veloc-1.6.ebuild
+++ b/sys-cluster/veloc/veloc-1.6.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit cmake distutils-r1
diff --git a/sys-cluster/wxparaver/wxparaver-4.10.0.ebuild b/sys-cluster/wxparaver/wxparaver-4.10.0.ebuild
index fcf95c327b..ba925bcef9 100644
--- a/sys-cluster/wxparaver/wxparaver-4.10.0.ebuild
+++ b/sys-cluster/wxparaver/wxparaver-4.10.0.ebuild
@@ -7,7 +7,7 @@ COMMIT="f357545a2fdfc7674394f2e6192022a4c2139f63"
DOCS_AUTODOC=0
DOCS_BUILDER="sphinx"
DOCS_DIR="docs/wxparaver_help_contents/sphinx/2.paraver_toolset/source"
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
WX_GTK_VER="3.0-gtk3"
inherit autotools python-any-r1 docs wxwidgets
diff --git a/sys-kernel/tirdad/Manifest b/sys-kernel/tirdad/Manifest
index 15daaa3183..1903b4fec1 100644
--- a/sys-kernel/tirdad/Manifest
+++ b/sys-kernel/tirdad/Manifest
@@ -1 +1 @@
-DIST tirdad-0_p20200926.tar.gz 15656 BLAKE2B 02c628f8d4c9f539cfaf2e7e6a6cc3323169c785f7854b9ac283c59ca95b84fd5361948815d5aa400886b118b8dbd6b0be9b5d1ddd1433ecf56a9fc1137d8b38 SHA512 db6aef5225a2651600f93700e7b858957a20ada3d3d55c19124f2a149b20e270d10ead959580dff9031b346f8c35f9fab3cf21db74afb47937dd977e35d13156
+DIST tirdad-0_pre20200926.gh.tar.gz 15656 BLAKE2B 02c628f8d4c9f539cfaf2e7e6a6cc3323169c785f7854b9ac283c59ca95b84fd5361948815d5aa400886b118b8dbd6b0be9b5d1ddd1433ecf56a9fc1137d8b38 SHA512 db6aef5225a2651600f93700e7b858957a20ada3d3d55c19124f2a149b20e270d10ead959580dff9031b346f8c35f9fab3cf21db74afb47937dd977e35d13156
diff --git a/sys-kernel/tirdad/tirdad-0_p20200926.ebuild b/sys-kernel/tirdad/tirdad-0_pre20200926.ebuild
similarity index 86%
rename from sys-kernel/tirdad/tirdad-0_p20200926.ebuild
rename to sys-kernel/tirdad/tirdad-0_pre20200926.ebuild
index 1723d04f51..c651094e44 100644
--- a/sys-kernel/tirdad/tirdad-0_p20200926.ebuild
+++ b/sys-kernel/tirdad/tirdad-0_pre20200926.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit linux-mod
@@ -9,14 +9,13 @@ MY_REV="9a0e137ae05dd1aa05c20750975598e4dac77dbf"
DESCRIPTION="kernel module for random ISN generation"
HOMEPAGE="https://github.com/0xsirus/tirdad"
-SRC_URI="https://github.com/0xsirus/tirdad/archive/${MY_REV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/0xsirus/tirdad/archive/${MY_REV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_REV}"
LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64"
-S="${WORKDIR}/${PN}-${MY_REV}"
-
MODULE_NAMES="tirdad(misc:${S}:${S}/module)"
BUILD_TARGETS="all"
diff --git a/sys-kernel/ummunotify/Manifest b/sys-kernel/ummunotify/Manifest
index d7f5a2d25e..d1ee0dfee6 100644
--- a/sys-kernel/ummunotify/Manifest
+++ b/sys-kernel/ummunotify/Manifest
@@ -1 +1 @@
-DIST ummunotify-2.tar.gz 326619 BLAKE2B 4ac329368b688eebb5ab9d064703de90e47112b169cd9448b3f6e0daa7717bdd4d1e957c75f5f87f1d30c08564c929ef50d7fe83f633b95f2abbd13014c1c48c SHA512 0650ec6dd01de97822121a720bff8cb65deaf2ec67de03a52507f47d0cfb169000dd40172f73aef7fbb83735eb8e35aed4da9c20ce5ee4ee6607a12baae7ca0f
+DIST ummunotify-2.gh.tar.gz 326619 BLAKE2B 4ac329368b688eebb5ab9d064703de90e47112b169cd9448b3f6e0daa7717bdd4d1e957c75f5f87f1d30c08564c929ef50d7fe83f633b95f2abbd13014c1c48c SHA512 0650ec6dd01de97822121a720bff8cb65deaf2ec67de03a52507f47d0cfb169000dd40172f73aef7fbb83735eb8e35aed4da9c20ce5ee4ee6607a12baae7ca0f
diff --git a/sys-kernel/ummunotify/ummunotify-2.ebuild b/sys-kernel/ummunotify/ummunotify-2-r1.ebuild
similarity index 91%
rename from sys-kernel/ummunotify/ummunotify-2.ebuild
rename to sys-kernel/ummunotify/ummunotify-2-r1.ebuild
index 3b5fc4b6e2..cae92bb209 100644
--- a/sys-kernel/ummunotify/ummunotify-2.ebuild
+++ b/sys-kernel/ummunotify/ummunotify-2-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
MAX_KV_MAJ="4"
MAX_KV_MIN="13"
@@ -14,7 +14,7 @@ HOMEPAGE="
https://lkml.org/lkml/2010/4/22/172
https://github.com/Portals4/ummunotify
"
-SRC_URI="https://github.com/Portals4/ummunotify/raw/master/${MYP}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Portals4/ummunotify/raw/master/${MYP}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/${MYP}"
LICENSE="GPL-2"
diff --git a/sys-power/amdgpu-fan/amdgpu-fan-0.1.0-r1.ebuild b/sys-power/amdgpu-fan/amdgpu-fan-0.1.0-r1.ebuild
index 0a54d7d458..2413023f7e 100644
--- a/sys-power/amdgpu-fan/amdgpu-fan-0.1.0-r1.ebuild
+++ b/sys-power/amdgpu-fan/amdgpu-fan-0.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1 systemd