Merge updates from master

2026-07-18 03:23:20 -04:00 · 2021-12-15 11:06:28 +00:00
parent 56b4f992c0 5ed938de4d
commit 8f827d8d7e
17 changed files with 16 additions and 26 deletions
--- a/app-crypt/certbot-dns-digitalocean/Manifest
+++ b/app-crypt/certbot-dns-digitalocean/Manifest
@@ -1,7 +1,3 @@
 DIST certbot-dns-digitalocean-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 DIST certbot-dns-digitalocean-1.21.0.tar.gz 1343180 BLAKE2B 79bbaafe96bca4cee9aabb39f4e9f1f12be4d2e1d9c1b156966061606ac3b07e5d80c5053baa03698e5513477076ca8f604aff43f77ee7f45d70d4b88429a875 SHA512 11ea781c5113cf68e3a76cafc2cf38d5ebc9cdb2f40a79eae0cdeac5d40f8dac05a4c71a269d5a6ff78027a1db0676195a8413e28a87d00aaf1602f6f2ce5b5e
 DIST certbot-dns-digitalocean-1.22.0.tar.gz 1352714 BLAKE2B 213dc08d3a88e0d20d6324c026a47eb96b9e45fbde41f79e37c2e62c655d7c6df01292e110d2e78ea085dfc62ef3c7b623279224029c9ae2a59e69c5c00054a5 SHA512 9a7a0d11e9fd5bd59b526a2cc5d0029b972e34a2bf41035c2d8ab535b93fc6d985ee8ea3dd5e50a7f4af80450135b739d1297245ad21b47b8362cddb03738932
-EBUILD certbot-dns-digitalocean-1.20.0.ebuild 692 BLAKE2B 3edd760635f32c303bfbcb6c6841945309841034afc6803786f339b58901a8c23d7a6f106693bc66c54c880b2f798ef4415100551663c5eaddde7413156c22d4 SHA512 a74724746c7f861338b016945ed4b6dfc4528a21f9112c9ac890c35ec9c37f8d8dd00e2c74ccfacde2cde09da646465abdd7c7b19b4e76226131cdbce60b361a
-EBUILD certbot-dns-digitalocean-1.21.0.ebuild 692 BLAKE2B f87f93d5f9e0a15d917da9d222a0057521054bb8ebe8938e8638d66fba65f0bed0646b6214b9f08032ffe2bc4f27d2859d4684ce54962c0b3c01c8a8787d6847 SHA512 98bc28d9e119a8a347b18c8f64f6b72adf55057eaf5e61c2f96f6b72987d5ac360df857cedad58457f78dd6ab93f1ac6894a8331fdaf245d7dc7731da8514513
-EBUILD certbot-dns-digitalocean-1.22.0.ebuild 692 BLAKE2B 7ff25221d9e83dffcd23634e39007991a2eec96c7d304a3d8f8e8640c734658404f9b4a8ffed2f0bc0d13ebd17661ca6097d8351e7f1289f4a6097721b115deb SHA512 7376902d5ab89c14a00a10932758d29a3f3e79a8f6ed76e5a5e0d18b13c511428515f7285ecab3fd61320d5301e5e59add5ad06fc2c3eacc08f85e984d6f3e44
-MISC metadata.xml 371 BLAKE2B 67f0648cfd84bfbda3bb87ab80c5a222529761ec92a75a1bf01efc3e6730a3dadfaf562cf2bcf2e5bd44e84ec81a8d2dcffba1e48aa9ae1fe380233e0a7072a5 SHA512 a5affb76ad347d142958d1a40184aa7b56de490cb5f885f7adf7c08922331007bbcf0dfbf443e29e2ca8ab38586bdd5cc5ae021e3b21bdc26db020d3062b89f3
--- a/app-crypt/certbot-dns-digitalocean/metadata.xml
+++ b/app-crypt/certbot-dns-digitalocean/metadata.xml
@@ -5,7 +5,4 @@
  <email>egorr.berd@gmail.com</email>
  <name>Yahor Berdnikau</name>
 </maintainer>
-<longdescription lang="en">
-  Digitalocean DNS Authenticator plugin for Certbot (Let's Encrypt Client)
-</longdescription>
 </pkgmetadata>
--- a/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9.ebuild
+++ b/app-crypt/gnome-encfs-manager/gnome-encfs-manager-1.9.ebuild
@@ -7,7 +7,7 @@ inherit vala xdg

 DESCRIPTION="An easy to use manager and mounter for encfs stashes"
 HOMEPAGE="https://launchpad.net/gencfsm"
-SRC_URI="https://launchpad.net/gencfsm/trunk/1.9/+download/${PN}_${PV}.tar.xz -> ${P}.tar.xz"
+SRC_URI="https://launchpad.net/gencfsm/trunk/${PV}/+download/${PN}_${PV}.tar.xz -> ${P}.tar.xz"

 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
--- a/app-emulation/quickemu/Manifest
+++ b/app-emulation/quickemu/Manifest
@@ -1 +1 @@
-DIST 3.11.tar.gz 128498 BLAKE2B 15791e21733a2b77b54e8b25d37f9f8b7a112e249635c187ba1267f2bea089f38d96e5690da2d44b82b3668827df524afa765b42f90f61bfe368f53c773c51b4 SHA512 076c6e4108c5bb0e85e36c13da91e3c7f3f607b54cd50cbf73cc64fc157198a18daaa7131473e5d6166e1babd905645b673d05373a2f18959bdb4a8a1c9f897f
+DIST quickemu-3.11.tar.gz 128498 BLAKE2B 15791e21733a2b77b54e8b25d37f9f8b7a112e249635c187ba1267f2bea089f38d96e5690da2d44b82b3668827df524afa765b42f90f61bfe368f53c773c51b4 SHA512 076c6e4108c5bb0e85e36c13da91e3c7f3f607b54cd50cbf73cc64fc157198a18daaa7131473e5d6166e1babd905645b673d05373a2f18959bdb4a8a1c9f897f
--- a/app-emulation/quickemu/quickemu-3.11.ebuild
+++ b/app-emulation/quickemu/quickemu-3.11.ebuild
@@ -8,7 +8,7 @@ inherit python-single-r1

 DESCRIPTION="Create and run optimised Windows, macOS and Linux desktop virtual machines"
 HOMEPAGE="https://github.com/quickemu-project/quickemu"
-SRC_URI="https://github.com/quickemu-project/${PN}/archive/refs/tags/${PV}.tar.gz"
+SRC_URI="https://github.com/quickemu-project/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/app-emulation/unicorn/Manifest
+++ b/app-emulation/unicorn/Manifest
@@ -1 +1 @@
-DIST 1.0.3.tar.gz 3759365 BLAKE2B 130d494d03aa9aa1b27e6806856eb36c1871af6e8b89aef9136baa6ca8b726ba2eab778488185e96c47bf3771dd8bce19bf4fd5090888d28433a6129c827d88c SHA512 10f1b5194358c65bc94723eaafd7b4167fee18f96a4810f46f8c78ed1ef5584546e66e8c910fa4eeadd791fcd73edea68f898e337081409fd188b4090b78a7ca
+DIST unicorn-1.0.3.tar.gz 3759365 BLAKE2B 130d494d03aa9aa1b27e6806856eb36c1871af6e8b89aef9136baa6ca8b726ba2eab778488185e96c47bf3771dd8bce19bf4fd5090888d28433a6129c827d88c SHA512 10f1b5194358c65bc94723eaafd7b4167fee18f96a4810f46f8c78ed1ef5584546e66e8c910fa4eeadd791fcd73edea68f898e337081409fd188b4090b78a7ca
--- a/app-emulation/unicorn/unicorn-1.0.3.ebuild
+++ b/app-emulation/unicorn/unicorn-1.0.3.ebuild
@@ -10,13 +10,14 @@ inherit cmake distutils-r1

 DESCRIPTION="Unicorn CPU emulator framework"
 HOMEPAGE="http://www.unicorn-engine.org/"
-SRC_URI="https://github.com/unicorn-engine/${PN}/archive/${PV}.tar.gz"
+SRC_URI="https://github.com/unicorn-engine/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"

 IUSE="test python"
+RESTRICT="!test? ( test )"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
--- a/app-misc/apidb/apidb-5.13.6_beta.ebuild
+++ b/app-misc/apidb/apidb-5.13.6_beta.ebuild
@@ -19,7 +19,6 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/azaeldevel/apidb.git"
 else
-	inherit autotools
 	SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"
 	KEYWORDS="~amd64"
 fi
--- a/app-misc/xplr/xplr-0.17.0.ebuild
+++ b/app-misc/xplr/xplr-0.17.0.ebuild
@@ -129,7 +129,7 @@ CRATES="
 	yaml-rust-0.4.5
 "

-inherit cargo flag-o-matic desktop
+inherit xdg cargo

 DESCRIPTION="A hackable, minimal, fast TUI file explorer"
 # Double check the homepage as the cargo_metadata crate
--- a/app-office/openoffice-bin/openoffice-bin-4.1.11.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.11.ebuild
@@ -3,7 +3,7 @@

 EAPI="7"

-inherit desktop multilib gnome2-utils pax-utils prefix rpm xdg
+inherit desktop pax-utils prefix rpm xdg

 IUSE="gnome java"

--- a/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild
+++ b/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild
@@ -54,8 +54,8 @@ src_test() {
 src_install() {
 	b install \
 		config.install.chroot="${D}" \
-                config.install.root="${EPREFIX}"/usr \
-                config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-                config.install.doc="${EPREFIX}"/usr/share/doc/${PF} \
+		config.install.root="${EPREFIX}"/usr \
+		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
+		config.install.doc="${EPREFIX}"/usr/share/doc/${PF} \
 		--no-progress
 }
--- a/dev-embedded/mv88e6xxx-dump/mv88e6xxx-dump-0.2.0_pre20210327.ebuild
+++ b/dev-embedded/mv88e6xxx-dump/mv88e6xxx-dump-0.2.0_pre20210327.ebuild
@@ -3,7 +3,7 @@

 EAPI=7

-inherit autotools libtool
+inherit autotools

 MY_COMMIT="25fa4d07d7a5551fee6d8d7ad128cdffd50532c8"

--- a/dev-games/godot/godot-3.3.2-r1.ebuild
+++ b/dev-games/godot/godot-3.3.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )

-inherit desktop python-any-r1 scons-utils xdg
+inherit desktop python-any-r1 scons-utils toolchain-funcs xdg

 DESCRIPTION="Multi-platform 2D and 3D game engine"
 HOMEPAGE="https://godotengine.org"
--- a/dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.2_p7.ebuild
+++ b/dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.2_p7.ebuild
@@ -4,7 +4,7 @@
 # java-vm not yet ported to EAPI 7
 EAPI=6

-inherit java-vm-2 toolchain-funcs eapi7-ver
+inherit java-vm-2 toolchain-funcs

 abi_uri() {
 	echo "${2-$1}? (
--- a/dev-libs/fortran-stdlib/fortran-stdlib-0.1.0.ebuild
+++ b/dev-libs/fortran-stdlib/fortran-stdlib-0.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 FORTRAN_STANDARD="2003"
 PYTHON_COMPAT=( python3_{8..9} )

-inherit cmake fortran-2 python-any-r1 toolchain-funcs
+inherit cmake fortran-2 python-any-r1

 MY_PN="stdlib"
 SRC_URI="https://github.com/fortran-lang/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
--- a/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild
+++ b/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 FORTRAN_STANDARD="2003"
 PYTHON_COMPAT=( python3_{8..9} )

-inherit cmake fortran-2 git-r3 python-any-r1 toolchain-funcs
+inherit cmake fortran-2 git-r3 python-any-r1

 EGIT_REPO_URI="https://github.com/fortran-lang/stdlib.git"
 SRC_URI=""
--- a/dev-python/digitalocean/metadata.xml
+++ b/dev-python/digitalocean/metadata.xml
@@ -5,7 +5,4 @@
  <email>egorr.berd@gmail.com</email>
  <name>Yahor Berdnikau</name>
 </maintainer>
-<longdescription lang="en">
-  Digitalocean API library
-</longdescription>
 </pkgmetadata>