Merge updates from master

8 files changed, 11 insertions, 79 deletions

diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 057bd804bab6..2da095ce49ce 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,3 +1,3 @@
 DIST tesseract-4.1.1.tar.gz 1974988 BLAKE2B f729beb017ec81704b84f5e6539706ff0cd6a51a4d1b7b730c394af58ce2ea2a659203bf239417e8d500cfbde845a73d6e6e181ca946257c2f22525820899602 SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2
-DIST tesseract-5.0.0.tar.gz 1919742 BLAKE2B 39897f8778017627ce70227c6c162d6b53b504a95c92d9c13e1a27f8b71ec9828bfba8497535cd1684330a110001380433ad6120c0d2a61d86a01bbf1f1db015 SHA512 80e0d6e9076eb8d6b0d99942586acbb43aaec7bee7f7b13a500470aa11bf03f1c128434d764abd67839355e3fb80d41d0bcf10400b33e57fa0ae4659adb42af9
 DIST tesseract-5.0.1.tar.gz 1913596 BLAKE2B 94098704c0a177eb1afc365036f9ff8d7648f80398f20a410e11b7884e1411432c2938e3ab176930630500793ef2e3f33b82f214461ef6677d289c56919f8d55 SHA512 0a4824f71eb76ab022f3b9258d12b9a059adcf2f37fac6442ae1096d0efc80404ba1bfd9c90e8263178c1af606c2aad2b277ceb93efc3b9e93c125f931ff08c1
+DIST tesseract-5.1.0.tar.gz 1910376 BLAKE2B e1c1c5c563e30689d66fb09ab73fdce853a469dfcf3c759571f6e6e1da71809a8fd1fb74c0be38588e97bbdac230c2ce10a35fd66faa6a4370d78efe112d3243 SHA512 d874fc995182c2c7ce210ebd79ad36414fa73afc53063505bc0b0aa0f090dc48db09c650c86a727778584f34a421b7d64c129cefe282ea112560cd7ca24e7f59
diff --git a/app-text/tesseract/tesseract-5.0.0.ebuild b/app-text/tesseract/tesseract-5.1.0.ebuild
index e33c4ece03f9..302638df9e4d 100644
--- a/app-text/tesseract/tesseract-5.0.0.ebuild
+++ b/app-text/tesseract/tesseract-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index 0e6ab14fb5a4..12f6fb49aba2 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1 +1,2 @@
 DIST devedeng-4.16.0.tar.bz2 1763318 BLAKE2B ab3e5b3a94ed8f1dfe0482218786a8ab131c16259635c1297c7fb01a0eb7f7106d53ff24665e056f18796d87cf0430d375278e1c074026b134be9308aa8a3f3f SHA512 032c276eeecc3d85b53bf72ee2a3132aac41c2496cabfd1e30cbee7316f1ce3136c8b476bf03bb88930a532a06f6fad7a098d91f0b9a85e4ecabf9f728783f8a
+DIST devedeng-4.17.0.tar.bz2 1773455 BLAKE2B 46d91145f94122bb3a9e83368f50dde6f1b25cecf5101c7d79bbc237bad69cb3d80d3b78429be76af2e4652eeb09e99e12c6c014c6bac8e71a7dd01d689ba634 SHA512 942e9a969146ae87bf1f1a5fa7441459801258f7dcac5a2f2ac8def146c6d88d8d3db27c474b7741cdc980c0757f99e6ee03b0da524f71895ebdbe2fe442a179
diff --git a/media-video/devedeng/devedeng-4.16.0-r1.ebuild b/media-video/devedeng/devedeng-4.17.0.ebuild
index 48ab84c28f7a..af4294ad0c8f 100644
--- a/media-video/devedeng/devedeng-4.16.0-r1.ebuild
+++ b/media-video/devedeng/devedeng-4.17.0.ebuild
@@ -1,10 +1,10 @@
-# 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
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 xdg
 
@@ -29,6 +29,9 @@ RDEPEND="
 
 DEPEND="${PYTHON_DEPS}"
 
+# src/unitests only works against system installed devedeng
+RESTRICT="test"
+
 PATCHES=( "${FILESDIR}"/${PN}-4.14.0-no_compress_man.patch )
 
 src_prepare() {
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
index 2fef2b7eee3b..44d5163eec87 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,4 +1,2 @@
-DIST element-v1.10.1.tar.gz 16749947 BLAKE2B 6d9aea8d20708140c68b0f91dedbe8949986adf1d0529e3ebfa9c3e39e6265a8eaa1fbb0eb6e748038bc818caef6aa1a76dce3013dcde579b02338e9c4de0b33 SHA512 92f0061821369fd3e130afadcf15e14f3f85e676c240378f091920a2f1a7229ccbe3c912de5cb35b4ae3cf6fb27ddece49787ab9440ebda10203fcb87f1b705f
 DIST element-v1.10.3.tar.gz 17107477 BLAKE2B 5cbae1e531b318ca713bde42ec37db6bcdcafddaa80dc58b1b9fd592bc279aa74761d1ca4cdc13fe8b3a31950a80a223f663638d6c1984fc6165072ae484309b SHA512 117b4854d959773741e8d809147ecfe5c240e6f3517dcb98c380cc9b1dc4d8266a0343906d6fd86d3c5a551532aab814f8f524326306964da40b0eae0aaae55d
-DIST element-v1.9.8.tar.gz 16536829 BLAKE2B bfeb0387fbb8bc5ffd90c34a7d659475665cf207226361caab44bb126381b651793e45bb7d08dd5bf316496445fed808f18383377cc3adeb11b64439ad1a7695 SHA512 4a91849adb1573933d6384bf586f321065a6c5effcaf054390c99a3a63221a5bc887b17a7cff65f1fabf69d3990ec92a07d102f8d86c68c549c323f35aaf867a
-DIST element-v1.9.9.tar.gz 16643907 BLAKE2B 8cd267238c053550a661d5a5475efb0e152995cc592f41e9396aeab80ab4e16a4095245443a6897d5d75b195e2a5d20d604cc9f6bcc9b456543e8fb2b1a5a1fd SHA512 f414748604aaeb95b3725d2926122e52560ce4d18fd9345c40836d6e62177622ff32ecf94f9c2d1004ea1d4a1301a7e8ba7c593f7fbc802a31a36a1a9289d919
+DIST element-v1.10.6.tar.gz 17162058 BLAKE2B dde56d6b1802f0ecd0c41274b203d2c4d244b8648cccd09d0775c2263656a8b475b42c6b204e6e2ac634a8cec9483dfaa8d0500cc601899917020af0c6d4db15 SHA512 3ef064e81c03727aaaf0a1f4fb7c787b638868a7cda9a6b00e287eda8b26fd94e11d634be8b29e2c0d563d462a8253667166b6e0181483f8b8296cbcf800ba3a
diff --git a/www-apps/element/element-1.10.1.ebuild b/www-apps/element/element-1.10.1.ebuild
deleted file mode 100644
index 5d21e015099f..000000000000
--- a/www-apps/element/element-1.10.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="A glossy Matrix collaboration client for the web"
-HOMEPAGE="https://element.io/"
-SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-need_httpd
-
-S=${WORKDIR}/${PN}-v${PV}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/home
-	dodir "${MY_HTDOCSDIR}"/sites
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/home
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites
-	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
-
-	webapp_src_install
-}
diff --git a/www-apps/element/element-1.9.9.ebuild b/www-apps/element/element-1.10.6.ebuild
index 5d21e015099f..bdccc2ddf91f 100644
--- a/www-apps/element/element-1.9.9.ebuild
+++ b/www-apps/element/element-1.10.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit webapp
 
diff --git a/www-apps/element/element-1.9.8.ebuild b/www-apps/element/element-1.9.8.ebuild
deleted file mode 100644
index 0d6f2e6d2cb4..000000000000
--- a/www-apps/element/element-1.9.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="A glossy Matrix collaboration client for the web"
-HOMEPAGE="https://element.io/"
-SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-need_httpd
-
-S=${WORKDIR}/${PN}-v${PV}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/home
-	dodir "${MY_HTDOCSDIR}"/sites
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/home
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites
-	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
-
-	webapp_src_install
-}