gentoo auto-resync : 29:07:2022 - 09:06:52

8 files changed, 15 insertions, 104 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0ae0de893040..c6366591a265 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index 86fc22e8dd52..c89dc20b8e45 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -1,6 +1,3 @@
-DIST acme-tiny-4.1.0.tar.gz 12776 BLAKE2B 7efd9d1399ec3bbd98180511c9f36fbf6f9a96a0d4e0e72b9d4c85d16246118eaaad25bc26ba42f746fd4b60b498ceca5307e279d788157237ac6ad153848501 SHA512 31d69a5031c019acbc23b3f06041eae8e261766396d4a7420fd70a71cfa16de953bea4c0c2ad0c6a6e793ed61ab5331f40145352ffce69f4f062f35dd0db7519
 DIST acme-tiny-5.0.1.tar.gz 21036 BLAKE2B a09c16ca19570b48d34c919e2a361e3be5d66ed8fc0ccff7af74e4018d294f2940a552906dee45bac27a16e7b039a3567dc35e201b058015c5123baa2cbb01c1 SHA512 6e0619917b31a5795c2c7d8aa811b46231b81fc6b57227f611f7f4b9f73eb3de669676482563c33d935a4a0812498677bcbe974663a561af61abb441a880947e
-EBUILD acme-tiny-4.1.0.ebuild 1108 BLAKE2B fe306b726c732ca03b672bc2cb7668b1125868daf5758b69312ca27e4ea71a3374b9d3ac00cebfe4459c566b68ee5fd807bf3cac1a44f64dd70afb2789a7c783 SHA512 bda714125cad2d2442539691630caf3de45498e0ac6a6e95211ec0e2e3a4fefc4a3d7b2c221359a7ac0b86a7d0126e361604dfb3c8a677b2c026b3fac61016fc
-EBUILD acme-tiny-5.0.1.ebuild 1113 BLAKE2B 858554a9e51966b71805d860e5765d99c0691be61301e2492b7237354a3b2eb0f5ec17a1284e93416774853055074bf01240e4de343a06b9a5cd72253304cc1c SHA512 8e3240b60cba19df9ba608968352c385ce0837d122bcc39b9ceb83e7025973d67b01a8230be421e796f9f7e17419864aa17d4a0557359db93b8d161d85617db8
-EBUILD acme-tiny-9999.ebuild 1115 BLAKE2B ad6d68f9de100b37eadad44105a8d541373663f97f233a1620cebf2055e97f1be701220a772e8fb92a24e69355f8c7f7fb97213c374abecf7869b9ce6b00dcfa SHA512 23a05a75412e621c550cea4ace83c98b5e4b41c76b988cc3c93899ead5de63fdd7e4b57749d0ffd8fe1e692d7985c70284718c64b44283349c7858cdaabca74a
-MISC metadata.xml 250 BLAKE2B 3913e6233b4143308261242b7e5a929f71f89928e0a81360b8fa0b9dbebd4d5dc89413a21fde6fcaa4411fb3e85cfe478f920b26cbb36ca705275401f1d6112e SHA512 3844289663f9437acfaf41e67f3c265da146ccfc067ac6b9c392e8bd103a8e23d30454436ed9db3e3899882153dc788f15ae649ba70c9919517ded2c4197fa54
+EBUILD acme-tiny-5.0.1.ebuild 1180 BLAKE2B 265f9fdb693adc02aec85ebc4b38a77969fc0492fd7f437acaa6f65495374080875d70b8a8b7727a68a0dd087da20fa72312a5d0272bb85f277351d8d1ac2fe8 SHA512 8b7b059d7768f416b30b1c0123a6c5b4f658c166d730122559ee5e25ad712c203b916dd69ef69d0c255a991c95589bef9bf60979fbf3bd121dae684a5d5a1c75
+MISC metadata.xml 308 BLAKE2B 5ec953d075608413e620d96e62dda71733f4d3f802ccc765785dfee72c5d7230ed75bebeddb4ca94859533f48bb3edf6cc995796427c796fcd676cbb2ff2a584 SHA512 e5e7ec53d4c40904b2df23401805ff9d76d80f8943f85c28707b969077340eab8aa0b5348d0ce3c4c6a2e01d6e9055e84ab2031fa92360c57e5e1fba1adb7dcc
diff --git a/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild b/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild
deleted file mode 100644
index d019da939aa5..000000000000
--- a/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
-else
-	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
-HOMEPAGE="https://github.com/diafygi/acme-tiny"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/openssl:0"
-
-pkg_setup() {
-	if [[ ${PV} != 9999 ]]; then
-		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	fi
-}
-
-src_prepare() {
-	sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
-			einfo "The --account-email flag has been changed to --contact and"
-			einfo "has different syntax."
-			einfo "Please update your scripts accordingly"
-		fi
-	done
-}
diff --git a/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild b/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
index d1dbadc05430..11801bcbdbfe 100644
--- a/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
@@ -24,6 +24,9 @@ IUSE=""
 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 RDEPEND="dev-libs/openssl:0"
 
+# Tests require a local ACME server to be set up.
+RESTRICT="test"
+
 pkg_setup() {
 	if [[ ${PV} != 9999 ]]; then
 		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
deleted file mode 100644
index b1ca9c31e4af..000000000000
--- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
-else
-	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
-HOMEPAGE="https://github.com/diafygi/acme-tiny"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/openssl:0"
-
-pkg_setup() {
-	if [[ ${PV} != 9999 ]]; then
-		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	fi
-}
-
-src_prepare() {
-	sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
-			einfo "The --account-email flag has been changed to --contact and"
-			einfo "has different syntax."
-			einfo "Please update your scripts accordingly"
-		fi
-	done
-}
diff --git a/app-crypt/acme-tiny/metadata.xml b/app-crypt/acme-tiny/metadata.xml
index df6528161654..418b25e0fbfe 100644
--- a/app-crypt/acme-tiny/metadata.xml
+++ b/app-crypt/acme-tiny/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">diafygi/acme-tiny</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>graaff@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">diafygi/acme-tiny</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index 1ec4336c90a8..0667ef1d19b1 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -2,4 +2,4 @@ AUX libb2-0.98.1-distcc.patch 473 BLAKE2B 245a73813769d12c83089893d2a82fcb9f6f7f
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
 EBUILD libb2-0.98.1-r2.ebuild 1768 BLAKE2B 7c324eb124cebe4f181763ad3943dacaa69dd89f4c919ac7d8e2030b53a4c4091ed2e2d557d89b7d52ff155a5460eb84c1ba309bc6130748df1c3ac3fcb210a3 SHA512 d5b636bb7a23b21ad66e7a48fe08bdd0081345b5eec653edf585abd60ae70588c10d9d4c31089c5423262176bf4e16e23cf8dc3ba8378fd64048f90d9b6669e3
 EBUILD libb2-0.98.1-r3.ebuild 1828 BLAKE2B 8669c283b1fd133e5dcac6271d3010f9c77feec92e7fbd8ff35a462dbf4191daa7750b29bbcb77f889c9b984f5ae62d3e766de6753a3e6419605011f6bf81105 SHA512 4d6474809c5f1e0dac5fff901b4725333fd90a357529d75b176fa63196349f7a4123e425b3aedec0d1dd30e0b538a09d0b79d0eca757850d43524ffbd25412bb
-MISC metadata.xml 689 BLAKE2B 9eb064a552296b211579b85776b4f3ef323e3019c2350753424aabf354d10069360a27e05b671dc46fdd098cd08498727da9d184cfd62ac2b7216da6d507d5bf SHA512 644eb156edd6b23c748472c2cf18428dade618784f607e83629ad9c45cb1fd3bbd5ae11443232b0d4f1184b3d3b4ac3f09c6e6641234546cba41686de4777083
+MISC metadata.xml 766 BLAKE2B 145882c283f1380a065f239f056b67f46dd281bcdfd1ca1cf946b049136a4465c41ea7aa6262a5fcd2763a06a4a350edfbd3007c80e767c5868193125d4dd766 SHA512 0887ed2a64e96fb780c01061fcde1fe526c6d0caa0ba44b982d10bb62bf387f189ec0804494fb9fa86a7abb463e571d788f73dc4433a2e4cd751e985e0d35347
diff --git a/app-crypt/libb2/metadata.xml b/app-crypt/libb2/metadata.xml
index 7540a555a91a..1b45c3a4d19a 100644
--- a/app-crypt/libb2/metadata.xml
+++ b/app-crypt/libb2/metadata.xml
@@ -18,4 +18,7 @@
 		set in make.conf or similar.
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">BLAKE2/libb2</remote-id>
+	</upstream>
 </pkgmetadata>