Merge updates from master

10 files changed, 37 insertions, 194 deletions

diff --git a/dev-perl/Mojolicious/Manifest b/dev-perl/Mojolicious/Manifest
index f92d900c9dc2..7152e1a7e717 100644
--- a/dev-perl/Mojolicious/Manifest
+++ b/dev-perl/Mojolicious/Manifest
@@ -10,3 +10,4 @@ DIST Mojolicious-8.20.tar.gz 764063 BLAKE2B 846bb3cfeac502d808f28f26921a73e09587
 DIST Mojolicious-8.30.tar.gz 772067 BLAKE2B b7f21b780a113aea3978968979e67442664104b15c6711d7f68d2dcb068fbb005135acf1845b0aeb4d43c2158672aab853aa862ba2ed1889242266c9ce80733f SHA512 1823a095df339ccdfe74395bb3066627bd5e2a4e9e1b8d907ff716ef511bd834e09c0aa703a1e51f675d2125f2848a25fa4efb2f48f9c5dcbe1dc8a1d0c48ff5
 DIST Mojolicious-8.40.tar.gz 776844 BLAKE2B 6fc2224d55c625cea4eae39fe440903a3924054f07755512f9d6ce7c17aec5152da8999a5de0a30f71a8deab931bd781374c4a0929f7fd65cb3dea5d0a1a89a4 SHA512 7a086f2d195798acb0697595575860ceb111a0d22062637e48fec087b2de19a504425d626b9fa2d4b3bb2ba3d6f63dc703e5acb8a3bd39ba73ea452e07d1c1dc
 DIST Mojolicious-8.50.tar.gz 777007 BLAKE2B 858e7b1f8133ba093e025f9de2f27958063e18eb6f5b09c9928ad2533ef2de19b753e44dc8c3d23f63c4f6b80009c7caaafcdfb419c7b687bec806618d9290c2 SHA512 29864baefb9c7786c77e371c6e29a8f811e434815c07ea265804431cbe37ed8bfcbb7b8bd6a0cfd45ae5aca8e53225121d9f30cd46cac1e6e87ae042d791c6b5
+DIST Mojolicious-8.58.tar.gz 778040 BLAKE2B 80e36b370a89fc3712332e8322a4ef3083a82a2cf1bc798b7a48ee9afec17a19adb2c45774dd0588807f78aefcf147f28fe50c97fe4a66a71d652027931fc37e SHA512 bcd923955253e2d5b4b6dbef919dd3a960189f5724561232543cb0b5ae9e700fecea04851dd87092e04c22d6039940c45985eb23baa7977c794dc90bc58d0643
diff --git a/dev-perl/Mojolicious/Mojolicious-8.580.0.ebuild b/dev-perl/Mojolicious/Mojolicious-8.580.0.ebuild
new file mode 100644
index 000000000000..343d4f6cb0dd
--- /dev/null
+++ b/dev-perl/Mojolicious/Mojolicious-8.580.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=SRI
+DIST_VERSION=8.58
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+LICENSE="Artistic-2"
+DESCRIPTION="Real-time web framework"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test minimal"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!minimal? (
+		>=dev-perl/Cpanel-JSON-XS-4.90.0
+		>=dev-perl/EV-4.0.0
+	)
+	>=virtual/perl-IO-Socket-IP-0.370.0
+	>=virtual/perl-Scalar-List-Utils-1.410.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+PERL_RM_FILES=(
+	t/pod.t
+	t/pod_coverage.t
+)
diff --git a/dev-perl/Mojolicious/metadata.xml b/dev-perl/Mojolicious/metadata.xml
index c756b793a80a..31e0a6ff8c2e 100644
--- a/dev-perl/Mojolicious/metadata.xml
+++ b/dev-perl/Mojolicious/metadata.xml
@@ -102,6 +102,7 @@
     <remote-id type="cpan-module">Mojolicious::Plugin::HeaderCondition</remote-id>
     <remote-id type="cpan-module">Mojolicious::Plugin::JSONConfig</remote-id>
     <remote-id type="cpan-module">Mojolicious::Plugin::Mount</remote-id>
+    <remote-id type="cpan-module">Mojolicious::Plugin::NotYAMLConfig</remote-id>
     <remote-id type="cpan-module">Mojolicious::Plugin::TagHelpers</remote-id>
     <remote-id type="cpan-module">Mojolicious::Plugins</remote-id>
     <remote-id type="cpan-module">Mojolicious::Renderer</remote-id>
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index ccf1a31f162a..f85052c6114d 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,5 +1,3 @@
-DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a6150ec70dc1416dcb507dfa4d8ad9ce325204791a24e5646dee67aea0c1566c15dcddb65a5d9dddbbbb9b896398 SHA512 6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e
-DIST hwids-20190818.tar.gz 3407208 BLAKE2B c2a0098cba4a34210461a2781f325a95f18696c1917ff3a1c26a2f56383e9edd087ab6b3a1a173a92df829fc250cf460d915a98298f9c38a71396bf232916245 SHA512 74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2
-DIST hwids-20191025.tar.gz 3443988 BLAKE2B 0352f1568d7ceeb2c599d789f96a3175703f3c86240188beb9a080eabb6e7659aeeadf193f15050519fb64c58ee8d8832919cf6922b5017861b32be543235a03 SHA512 6f637ca8c4d6b1261c5c2eccd8d1a64ab750f4c36f3d435b50b75949c15e571d83bc61dd6a14e777b53d383d7d02c34f616cc6a62d005db3d965b33b4121deca
 DIST hwids-20200204.tar.gz 3495191 BLAKE2B 23075b6728d9b0e020be45729d0df4cef95cac5e912e646b612266337d1add59c87a1031e6672c5b6eb23e13c26e6299b62a5886aa25017242a86fd474c1e9ae SHA512 1d2a9baaa7ab64575a3d9b98ae4df9060cb8593ae752365296dd53b18bc5996170bbfe1c5b4b1ffc24b28e3dbaa7c321c4fa333bbf91449a6ca7b187cbe23741
 DIST hwids-20200306.tar.gz 3512152 BLAKE2B 6a6ee48598e72f97a90bff8f45aacb699218570ede5b60ed119ebae78de6cd4b92e02f96cf57c83710da699be9a7dcdfdef8d404539e04b664298874b35e54ce SHA512 eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250
+DIST hwids-20200813.tar.gz 3775577 BLAKE2B 7421b39318c7e3476d066441a4e079a0934ce5338a564fd40e39d73b7739eebf1a668f16d3a53a0eac692d07687f9135aefe81934b27d8eec95c67c06f6649d1 SHA512 096070205381fc8b698276d8927d71831684129921c1165323b62ac624a5694f779dd601b25db6dc28a01878704c3de9ff37dbb2696867afafea527544cff2e4
diff --git a/sys-apps/hwids/hwids-20190316.ebuild b/sys-apps/hwids/hwids-20190316.ebuild
deleted file mode 100644
index e772a64910d9..000000000000
--- a/sys-apps/hwids/hwids-20190316.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit udev
-
-DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
-HOMEPAGE="https://github.com/gentoo/hwids"
-if [[ ${PV} == "99999999" ]]; then
-	PYTHON_COMPAT=( python3_{6,7} )
-	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
-else
-	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="|| ( GPL-2 BSD ) public-domain"
-SLOT="0"
-IUSE="+net +pci +udev +usb"
-
-DEPEND=""
-RDEPEND="
-	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
-"
-
-if [[ ${PV} == 99999999 ]]; then
-	DEPEND+="
-		net-misc/curl
-		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
-	"
-	python_check_deps() {
-		if use udev; then
-			has_version --host-root "dev-python/pyparsing[${PYTHON_USEDEP}]"
-		fi
-	}
-else
-	S=${WORKDIR}/hwids-${P}
-fi
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		emake fetch
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e '/udevadm hwdb/d' Makefile || die
-}
-
-_emake() {
-	emake \
-		NET=$(usex net) \
-		PCI=$(usex pci) \
-		UDEV=$(usex udev) \
-		USB=$(usex usb) \
-		"$@"
-}
-
-src_compile() {
-	if [[ ${PV} == 99999999 ]] && use udev; then
-		python_setup
-		_emake udev-hwdb
-	fi
-	_emake
-}
-
-src_install() {
-	_emake install \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		MISCDIR="${EPREFIX}/usr/share/misc" \
-		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
-		DESTDIR="${D}"
-}
-
-pkg_postinst() {
-	if use udev; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-}
diff --git a/sys-apps/hwids/hwids-20190818.ebuild b/sys-apps/hwids/hwids-20190818.ebuild
deleted file mode 100644
index a62015c85539..000000000000
--- a/sys-apps/hwids/hwids-20190818.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
-HOMEPAGE="https://github.com/gentoo/hwids"
-if [[ ${PV} == 99999999 ]]; then
-	PYTHON_COMPAT=( python3_{6,7} )
-	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
-else
-	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="|| ( GPL-2 BSD ) public-domain"
-SLOT="0"
-IUSE="+net +pci +udev +usb"
-
-RDEPEND="
-	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
-"
-
-if [[ ${PV} == 99999999 ]]; then
-	BDEPEND="
-		net-misc/curl
-		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
-	"
-	python_check_deps() {
-		if use udev; then
-			has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-		fi
-	}
-else
-	S=${WORKDIR}/hwids-${P}
-fi
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		emake fetch
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e '/udevadm hwdb/d' Makefile || die
-}
-
-_emake() {
-	emake \
-		NET=$(usex net) \
-		PCI=$(usex pci) \
-		UDEV=$(usex udev) \
-		USB=$(usex usb) \
-		"$@"
-}
-
-src_compile() {
-	if [[ ${PV} == 99999999 ]] && use udev; then
-		python_setup
-		_emake udev-hwdb
-	fi
-	_emake
-}
-
-src_install() {
-	_emake install \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		MISCDIR="${EPREFIX}/usr/share/misc" \
-		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
-		DESTDIR="${D}"
-}
-
-pkg_postinst() {
-	if use udev; then
-		udevadm hwdb --update --root="${ROOT}"
-	fi
-}
diff --git a/sys-apps/hwids/hwids-20200204.ebuild b/sys-apps/hwids/hwids-20200204.ebuild
index a62015c85539..13c9146d0919 100644
--- a/sys-apps/hwids/hwids-20200204.ebuild
+++ b/sys-apps/hwids/hwids-20200204.ebuild
@@ -22,8 +22,6 @@ IUSE="+net +pci +udev +usb"
 
 RDEPEND="
 	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
 "
 
 if [[ ${PV} == 99999999 ]]; then
diff --git a/sys-apps/hwids/hwids-20200306.ebuild b/sys-apps/hwids/hwids-20200306.ebuild
index bbe6c639f9b4..c964e6ebfa16 100644
--- a/sys-apps/hwids/hwids-20200306.ebuild
+++ b/sys-apps/hwids/hwids-20200306.ebuild
@@ -22,8 +22,6 @@ IUSE="+net +pci +udev +usb"
 
 RDEPEND="
 	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
 "
 
 if [[ ${PV} == 99999999 ]]; then
diff --git a/sys-apps/hwids/hwids-20191025.ebuild b/sys-apps/hwids/hwids-20200813.ebuild
index bbe6c639f9b4..c964e6ebfa16 100644
--- a/sys-apps/hwids/hwids-20191025.ebuild
+++ b/sys-apps/hwids/hwids-20200813.ebuild
@@ -22,8 +22,6 @@ IUSE="+net +pci +udev +usb"
 
 RDEPEND="
 	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
 "
 
 if [[ ${PV} == 99999999 ]]; then
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index bbe6c639f9b4..c964e6ebfa16 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -22,8 +22,6 @@ IUSE="+net +pci +udev +usb"
 
 RDEPEND="
 	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
 "
 
 if [[ ${PV} == 99999999 ]]; then