Merge updates from master

5 files changed, 45 insertions, 79 deletions

diff --git a/dev-libs/libxmlb/metadata.xml b/dev-libs/libxmlb/metadata.xml
index d08e3289c60a..cb44de14664d 100644
--- a/dev-libs/libxmlb/metadata.xml
+++ b/dev-libs/libxmlb/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="stemmer">Enable language stemming support</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">hughsie/libxmlb</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<use>
+		<flag name="stemmer">Enable language stemming support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">hughsie/libxmlb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/fwupd-efi/metadata.xml b/sys-apps/fwupd-efi/metadata.xml
index 771d90fee052..e8bbd920f7b6 100644
--- a/sys-apps/fwupd-efi/metadata.xml
+++ b/sys-apps/fwupd-efi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/fwupd/fwupd-efi/issues</bugs-to>
 		<remote-id type="github">fwupd/fwupd-efi</remote-id>
diff --git a/sys-libs/libblockdev/metadata.xml b/sys-libs/libblockdev/metadata.xml
index 219289b63ed7..1c865386b8fd 100644
--- a/sys-libs/libblockdev/metadata.xml
+++ b/sys-libs/libblockdev/metadata.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="bcache">Enable block device cache support.</flag>
-    <flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
-    <flag name="device-mapper">Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
-    <flag name="dmraid">Support for dmraid devices, also known as ATA-RAID, or Fake RAID.</flag>
-    <flag name="escrow">Support for building crypto plugin with escrow device support</flag>
-    <flag name="kbd">Enable kernel block device support.</flag>
-    <flag name="lvm">Enable support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
-    <flag name="nvme">Add nvme support via <pkg>sys-libs/libnvme</pkg></flag>
-    <flag name="tools">Build tools</flag>
-    <flag name="vdo">Enable Virtual Data Optimizer support.</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">storaged-project/libblockdev</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<use>
+		<flag name="bcache">Enable block device cache support.</flag>
+		<flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
+		<flag name="device-mapper">Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
+		<flag name="dmraid">Support for dmraid devices, also known as ATA-RAID, or Fake RAID.</flag>
+		<flag name="escrow">Support for building crypto plugin with escrow device support</flag>
+		<flag name="kbd">Enable kernel block device support.</flag>
+		<flag name="lvm">Enable support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
+		<flag name="nvme">Add nvme support via <pkg>sys-libs/libnvme</pkg></flag>
+		<flag name="tools">Build tools</flag>
+		<flag name="vdo">Enable Virtual Data Optimizer support.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">storaged-project/libblockdev</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libsmbios/metadata.xml b/sys-libs/libsmbios/metadata.xml
index ba1e3d8a3ecf..b131555971d7 100644
--- a/sys-libs/libsmbios/metadata.xml
+++ b/sys-libs/libsmbios/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>The libsmbios project aims towards providing access to as much
-BIOS information as possible. It does this by providing a library of functions
-that can be used as well as sample binaries.</longdescription>
-  <upstream>
-    <remote-id type="github">dell/libsmbios</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		The libsmbios project aims towards providing access to as much
+		BIOS information as possible. It does this by providing a library of functions
+		that can be used as well as sample binaries.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">dell/libsmbios</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-servers/gunicorn/gunicorn-20.1.0.ebuild b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
deleted file mode 100644
index 0758612b5491..000000000000
--- a/www-servers/gunicorn/gunicorn-20.1.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A WSGI HTTP Server for UNIX"
-HOMEPAGE="https://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn"
-# Tagged on GitHub on 2021-02-12 yet only got posted on PyPI on 2021-03-27, two weeks
-# before this ebuild got published. Will likely switch back to PyPI come next release.
-SRC_URI="https://github.com/benoitc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT PSF-2 doc? ( BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.1.0-tests_optional_modules.patch
-	"${FILESDIR}"/${P}-new-eventlet.patch
-)
-
-DOCS=( README.rst )
-
-distutils_enable_sphinx 'docs/source' --no-autodoc
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--cov=gunicorn --cov-report=xml::' -i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/source/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Alternative worker types need additional packages to be installed:"
-	optfeature "eventlet-based greenlets workers" "dev-python/eventlet"
-	optfeature "gevent-based greenlets workers" "dev-python/gevent"
-}