diff --git a/Manifest.files.gz b/Manifest.files.gz
index f850b70b1f6f..e947aa389934 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index b425b0dc895f..2c53fdbb0518 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/alertmanager/Manifest b/acct-group/alertmanager/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/alertmanager/alertmanager-0.ebuild b/acct-group/alertmanager/alertmanager-0.ebuild
new file mode 100644
index 000000000000..4530d830ec25
--- /dev/null
+++ b/acct-group/alertmanager/alertmanager-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=294
diff --git a/acct-group/alertmanager/metadata.xml b/acct-group/alertmanager/metadata.xml
new file mode 100644
index 000000000000..6698a4ab7883
--- /dev/null
+++ b/acct-group/alertmanager/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+
diff --git a/acct-group/ntopng/Manifest b/acct-group/ntopng/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/ntopng/metadata.xml b/acct-group/ntopng/metadata.xml
new file mode 100644
index 000000000000..1e878c532c32
--- /dev/null
+++ b/acct-group/ntopng/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ netmon@gentoo.org
+
+
diff --git a/acct-group/ntopng/ntopng-0.ebuild b/acct-group/ntopng/ntopng-0.ebuild
new file mode 100644
index 000000000000..e64f641de3d7
--- /dev/null
+++ b/acct-group/ntopng/ntopng-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=296
diff --git a/acct-group/radicale/metadata.xml b/acct-group/radicale/metadata.xml
index 7a38bb900964..f8ffe025bba5 100644
--- a/acct-group/radicale/metadata.xml
+++ b/acct-group/radicale/metadata.xml
@@ -1,5 +1,12 @@
-
+
+ marco@scardovi.com
+ Marco Scardovi
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index d1bb9f33843e..63ae4fbb13ea 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/alertmanager/Manifest b/acct-user/alertmanager/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/alertmanager/alertmanager-0.ebuild b/acct-user/alertmanager/alertmanager-0.ebuild
new file mode 100644
index 000000000000..78028f69692f
--- /dev/null
+++ b/acct-user/alertmanager/alertmanager-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for alertmanager"
+ACCT_USER_ID=294
+ACCT_USER_GROUPS=( alertmanager )
+
+acct-user_add_deps
diff --git a/acct-user/alertmanager/metadata.xml b/acct-user/alertmanager/metadata.xml
new file mode 100644
index 000000000000..6698a4ab7883
--- /dev/null
+++ b/acct-user/alertmanager/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+
diff --git a/acct-user/ntopng/Manifest b/acct-user/ntopng/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/ntopng/metadata.xml b/acct-user/ntopng/metadata.xml
new file mode 100644
index 000000000000..1e878c532c32
--- /dev/null
+++ b/acct-user/ntopng/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ netmon@gentoo.org
+
+
diff --git a/acct-user/ntopng/ntopng-0.ebuild b/acct-user/ntopng/ntopng-0.ebuild
new file mode 100644
index 000000000000..f6a1885ae868
--- /dev/null
+++ b/acct-user/ntopng/ntopng-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ntopng"
+ACCT_USER_ID=296
+ACCT_USER_GROUPS=( ntopng )
+
+acct-user_add_deps
diff --git a/acct-user/radicale/metadata.xml b/acct-user/radicale/metadata.xml
index 7a38bb900964..f8ffe025bba5 100644
--- a/acct-user/radicale/metadata.xml
+++ b/acct-user/radicale/metadata.xml
@@ -1,5 +1,12 @@
-
+
+ marco@scardovi.com
+ Marco Scardovi
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7aaab871d38f..e56506725c07 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest
index 83ce8bc51b6f..10083e5a42ca 100644
--- a/app-admin/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -1 +1,2 @@
DIST Bitwarden-1.23.1-amd64.deb 47997540 BLAKE2B 2022611fa0c2a55acb39205e726e3f72ab6e32af396161a739a116943baad4d2a8762c6bb955d1db6af6ed59411c01d2d7f0ba568fa4a655514caa87947122bc SHA512 fa92023e0177bb31bc2db1fa88b9dac4e1642614191d4328be536c1351855f2ab2bb14798b151c0ec33e0d37d436fbb667bef677f1c22bda117586ef9124c386
+DIST Bitwarden-1.25.1-amd64.deb 58573904 BLAKE2B 109bec39c1a385127b00222752f6eac906cdea19df790dfede0f8dd6e2febdf35958b2b420737cf2dbfdd9648a85b93810ad1f8e2d6a222dcd07437d9333e7d7 SHA512 b20c5c3890a98f6990f7e7f1274027aba3011a416781b6fd76b6c37959ebf787cdb129dd16fe9b4601b5cbc39018dadc36efe680391c04ed0a4c763d221a3cbd
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.25.1.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.25.1.ebuild
new file mode 100644
index 000000000000..1adffd714ed2
--- /dev/null
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.25.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker xdg-utils
+
+MY_PN="Bitwarden"
+DESCRIPTION="Bitwarden password manager desktop client"
+HOMEPAGE="https://bitwarden.com/"
+SRC_URI="https://github.com/bitwarden/desktop/releases/download/v${PV}/Bitwarden-${PV}-amd64.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-accessibility/at-spi2-core:2
+ app-crypt/libsecret
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/mesa
+ net-print/cups
+ sys-apps/dbus
+ sys-apps/util-linux
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxkbcommon
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ x11-libs/pango
+"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+ opt/Bitwarden/*.so
+ opt/Bitwarden/bitwarden
+ opt/Bitwarden/chrome-sandbox
+"
+
+src_install() {
+ insinto /opt
+ doins -r opt/${MY_PN}
+ fperms 755 /opt/Bitwarden/bitwarden
+ fperms 4755 /opt/Bitwarden/chrome-sandbox
+
+ insinto /usr/share/applications
+ doins usr/share/applications/bitwarden.desktop
+
+ insinto /usr/share/icons
+ doins -r usr/share/icons/hicolor
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild
similarity index 91%
rename from app-admin/webapp-config/webapp-config-1.55-r1.ebuild
rename to app-admin/webapp-config/webapp-config-1.55-r2.ebuild
index 49c4a1068751..08e686f810cf 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python3_{7..9} )
inherit distutils-r1 prefix
@@ -51,12 +52,11 @@ python_install_all() {
dodoc AUTHORS
doman doc/*.[58]
- dohtml doc/*.[58].html
}
python_test() {
- PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \
- || die "Testing failed with ${EPYTHON}"
+ PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v ||
+ die "Testing failed with ${EPYTHON}"
}
pkg_postinst() {
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 37cef6a134c9..611a6da21acf 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python3_{7..9} )
inherit distutils-r1 prefix
@@ -57,12 +58,11 @@ python_install_all() {
dodoc AUTHORS
doman doc/*.[58]
- dohtml doc/*.[58].html
}
python_test() {
- PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \
- || die "Testing failed with ${EPYTHON}"
+ PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v ||
+ die "Testing failed with ${EPYTHON}"
}
pkg_postinst() {
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index d87ddec92e33..1f476ba4f716 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 2fad2fc449e3..0eb3defa5e01 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,2 +1,2 @@
DIST clamav-0.102.4.tar.gz 13234444 BLAKE2B 7109da3e2281472032777b8a9d14ca6ff345aead33e5aaf0b9d1ff4721459926062f789dd1f7e8637155e4b9f3bce9f78127bf450f32baf3f1006b8083d3431a SHA512 29893deb8d2d913dff72331875d3dc3a10356bfb254ddfe1c1933b3ea4f8b76c96a1b840f95e72be36cbc0e00b9ec35e395225ef264761f53e709bb1026a4f09
-DIST clamav-0.103.1.tar.gz 13369791 BLAKE2B 974716a17e67240ef606b074584a1ac344f1d5915347aaa02b388570ea543981433c482423b99f5d07054bdf4dce8a0d043afdd52b42d49ace468f3d801c3353 SHA512 f13e9542898ef42c0db6f7826bcb220b9cb57de2a88bfedc6c991b76ff06c59290522d31119132eaa2093da58c5069d63103f6260e271497bda2b472c3cd6ffb
+DIST clamav-0.103.2.tar.gz 13387954 BLAKE2B de0ececd2fe4486d2e8194dbeb45bfb74086ab3eb45fcab7590e75aa5a2242981066a4e8fa99b571cf7278f4516d986ad1a24254a8fe2c5caf4c870b3179c4b6 SHA512 87d47c4529a57da0b47b3744a279996ca24fa74ce10d7e27a53c19c1e13098af680e0e48ed767122bb2bbd3f927302451da84ccf51a933e7e3556ef43cbe9f45
diff --git a/app-antivirus/clamav/clamav-0.103.1.ebuild b/app-antivirus/clamav/clamav-0.103.2.ebuild
similarity index 100%
rename from app-antivirus/clamav/clamav-0.103.1.ebuild
rename to app-antivirus/clamav/clamav-0.103.2.ebuild
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 594c32b798da..4a65283b30f0 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/dump/dump-0.4.47.ebuild b/app-arch/dump/dump-0.4.47.ebuild
index ba337c3559e8..54b2a6666970 100644
--- a/app-arch/dump/dump-0.4.47.ebuild
+++ b/app-arch/dump/dump-0.4.47.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
# We keep uuid USE flag default dsiabled for this version. Don't forget
# to default enable it for later versions as this is the upstream default.
IUSE="bzip2 debug ermt lzo readline selinux sqlite ssl static test uuid zlib"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3b7588f4cee8..d74e5e9eac88 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 1fcaae335715..4f3c512dfcdd 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,2 +1,3 @@
DIST certbot-1.12.0.tar.gz 1419901 BLAKE2B 0ee1059c34ed6c73d1a066d54592917d5c65a8a193034f2d158397b559d2c7278d25fd3d4f2c4e553cd1737bfd8e871e8afba70e483fc4401cfa9deca913ded0 SHA512 1fbbba6294c6cd11a7f3b3887ac8775ed6c8cacd22879f68a4e3d8fb03021357dd0f32d8c96806b4f5b922dc243e332cfb36ac966f509fba739551e23e0d20fa
DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
+DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
diff --git a/app-crypt/acme/acme-1.14.0.ebuild b/app-crypt/acme/acme-1.14.0.ebuild
new file mode 100644
index 000000000000..45526ccaf417
--- /dev/null
+++ b/app-crypt/acme/acme-1.14.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.10[${PYTHON_USEDEP}]
+ >=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+src_compile() {
+ python_foreach_impl run_in_build_dir default
+ distutils-r1_src_compile
+ if use doc ; then
+ cd docs || die
+ sphinx-build -b html -d _build/doctrees . _build/html
+ fi
+}
+
+python_test() {
+ nosetests -w ${PN} || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 1fcaae335715..4f3c512dfcdd 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,2 +1,3 @@
DIST certbot-1.12.0.tar.gz 1419901 BLAKE2B 0ee1059c34ed6c73d1a066d54592917d5c65a8a193034f2d158397b559d2c7278d25fd3d4f2c4e553cd1737bfd8e871e8afba70e483fc4401cfa9deca913ded0 SHA512 1fbbba6294c6cd11a7f3b3887ac8775ed6c8cacd22879f68a4e3d8fb03021357dd0f32d8c96806b4f5b922dc243e332cfb36ac966f509fba739551e23e0d20fa
DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
+DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
diff --git a/app-crypt/certbot-apache/certbot-apache-1.14.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.14.0.ebuild
new file mode 100644
index 000000000000..bcdc453cba6d
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.14.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+ >=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+ dev-python/python-augeas[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 1fcaae335715..4f3c512dfcdd 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,2 +1,3 @@
DIST certbot-1.12.0.tar.gz 1419901 BLAKE2B 0ee1059c34ed6c73d1a066d54592917d5c65a8a193034f2d158397b559d2c7278d25fd3d4f2c4e553cd1737bfd8e871e8afba70e483fc4401cfa9deca913ded0 SHA512 1fbbba6294c6cd11a7f3b3887ac8775ed6c8cacd22879f68a4e3d8fb03021357dd0f32d8c96806b4f5b922dc243e332cfb36ac966f509fba739551e23e0d20fa
DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
+DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild
new file mode 100644
index 000000000000..52c50cecd71f
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
+ >=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 1fcaae335715..4f3c512dfcdd 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,2 +1,3 @@
DIST certbot-1.12.0.tar.gz 1419901 BLAKE2B 0ee1059c34ed6c73d1a066d54592917d5c65a8a193034f2d158397b559d2c7278d25fd3d4f2c4e553cd1737bfd8e871e8afba70e483fc4401cfa9deca913ded0 SHA512 1fbbba6294c6cd11a7f3b3887ac8775ed6c8cacd22879f68a4e3d8fb03021357dd0f32d8c96806b4f5b922dc243e332cfb36ac966f509fba739551e23e0d20fa
DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
+DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
diff --git a/app-crypt/certbot/certbot-1.14.0.ebuild b/app-crypt/certbot/certbot-1.14.0.ebuild
new file mode 100644
index 000000000000..e2450c428f8d
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.14.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+ >=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index a9118e9afadb..880177b26512 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-DIST qca-2.3.1.tar.xz 725984 BLAKE2B a99121dd95822ef5e1057dc9ad9250bb14486f42b0571936453644bc7c5649f16cbc918fa04d4a5af2c62bc35cc672159a84e27a86e685cfe320518a42076052 SHA512 092704a8d7c5973f05c82584ea55b4f8f874965aea943277e50fde873913a9bdad6a51ea74fc0036bbb632a13141cb4c030504229c06779890286205929f6021
DIST qca-2.3.2.tar.xz 735500 BLAKE2B 559b27c48c756f2b4f4f206d2157c90ae4856610f1539b4162a2bffe7fffe19b5c768d3d3f9d0486d2098fb403eb64372515815f49fd428d22dfc0405d99e435 SHA512 da6415a097c99b878f45730c1dd1e0bfc7f96858ad7018918ac7c2ae2eca830cb73e131173b1018ee4caa6c3a504b80c8ad28f8f9448c2fd1593161c2ac8aad4
diff --git a/app-crypt/qca/files/qca-2.3.1-gcc11.patch b/app-crypt/qca/files/qca-2.3.1-gcc11.patch
deleted file mode 100644
index cd4eaab86880..000000000000
--- a/app-crypt/qca/files/qca-2.3.1-gcc11.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f015cc64889035c084138864e2e030ece19c257b Mon Sep 17 00:00:00 2001
-From: Jeff Law
-Date: Dec 04 2020 03:55:48 +0000
-Subject: Fix missing includes for gcc-11
-
-
-diff --git a/src/qca_cert.cpp b/src/qca_cert.cpp
-index 5e73d98..225aecd 100644
---- a/src/qca_cert.cpp
-+++ b/src/qca_cert.cpp
-@@ -19,6 +19,7 @@
- *
- */
-
-+#include
- #include "qca_cert.h"
-
- #include "qca_publickey.h"
-diff --git a/src/qca_default.cpp b/src/qca_default.cpp
-index fd35702..db87e87 100644
---- a/src/qca_default.cpp
-+++ b/src/qca_default.cpp
-@@ -19,6 +19,7 @@
- *
- */
-
-+#include
- #include "qca_core.h"
-
- #include
diff --git a/app-crypt/qca/qca-2.3.1.ebuild b/app-crypt/qca/qca-2.3.1.ebuild
deleted file mode 100644
index 4414a43132be..000000000000
--- a/app-crypt/qca/qca-2.3.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde.org cmake qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- doc? ( app-doc/doxygen )
-"
-RDEPEND="
- dev-qt/qtcore:5
- botan? ( dev-libs/botan:= )
- gcrypt? ( dev-libs/libgcrypt:= )
- gpg? ( app-crypt/gnupg )
- nss? ( dev-libs/nss )
- pkcs11? (
- >=dev-libs/openssl-1.1
- dev-libs/pkcs11-helper
- )
- sasl? ( dev-libs/cyrus-sasl:2 )
- ssl? ( >=dev-libs/openssl-1.1:0= )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-disable-pgp-test.patch"
- "${FILESDIR}/${P}-gcc11.patch" # bug 764047
-)
-
-qca_plugin_use() {
- echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
- -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
- $(qca_plugin_use botan)
- $(qca_plugin_use gcrypt)
- $(qca_plugin_use gpg gnupg)
- $(qca_plugin_use logger)
- $(qca_plugin_use nss)
- $(qca_plugin_use pkcs11)
- $(qca_plugin_use sasl cyrus-sasl)
- $(qca_plugin_use softstore)
- $(qca_plugin_use ssl ossl)
- -DBUILD_TESTS=$(usex test)
- )
- cmake_src_configure
-}
-
-src_test() {
- local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- if use doc; then
- pushd "${BUILD_DIR}" >/dev/null || die
- doxygen Doxyfile || die
- dodoc -r apidocs/html
- popd >/dev/null || die
- fi
-
- if use examples; then
- dodoc -r "${S}"/examples
- fi
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 561da436bec0..5ec391f11b2b 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/spice/spice-0.14.3-r1.ebuild b/app-emulation/spice/spice-0.14.3-r1.ebuild
index e81e1f418799..36f61160986e 100644
--- a/app-emulation/spice/spice-0.14.3-r1.ebuild
+++ b/app-emulation/spice/spice-0.14.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit autotools python-any-r1 readme.gentoo-r1 xdg-utils
DESCRIPTION="SPICE server"
@@ -36,7 +36,8 @@ RDEPEND="
)"
DEPEND="${RDEPEND}
>=app-emulation/spice-protocol-0.14.0
- smartcard? ( app-emulation/qemu[smartcard] )"
+ smartcard? ( app-emulation/qemu[smartcard] )
+ test? ( net-libs/glib-networking )"
BDEPEND="${PYTHON_DEPS}
virtual/pkgconfig
$(python_gen_any_dep '
diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild
index 30d2884e11c3..44eb9c360ee8 100644
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit git-r3 meson python-any-r1 readme.gentoo-r1 xdg-utils
DESCRIPTION="SPICE server"
@@ -37,7 +37,8 @@ RDEPEND="
)"
DEPEND="${RDEPEND}
~app-emulation/spice-protocol-9999
- smartcard? ( app-emulation/qemu[smartcard] )"
+ smartcard? ( app-emulation/qemu[smartcard] )
+ test? ( net-libs/glib-networking )"
BDEPEND="${PYTHON_DEPS}
virtual/pkgconfig
$(python_gen_any_dep '
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 0f54b69d22ef..76ba10e9f2d4 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 357d791f5200..007c4c5ec9ba 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,2 +1,3 @@
+DIST eselect-repository-10.tar.gz 7123 BLAKE2B 786255e8b83c1348c16ec6e30495e7a0c305d48430712fd2bba28367d27d0e5eea1fe9176636f7896f48feebb71a9a3daa025fdc2f8032d2e6a3c59bd6b5c0c4 SHA512 4a03e1b9ddf3d8f79429e0a98cd03804867ba4594945ddda518be06c07e6e5737c77b8c57893a8cf5930548c96f0d436786d95bed624041ad52ab603348337b2
DIST eselect-repository-8.tar.gz 6774 BLAKE2B d22c2befc744e21b7619a490e9c41f1052c4077135ba5247ea9558f15f7dc5c06642dd934c41ad8cb3bedb40398876ea9d508276bde6f214fe06d5f80b19911b SHA512 b1fd13e3bfa323dea7fec53a33865352545a070df472c9db0b2901945a795833eb8a2b7b264005d94fe6e92dce57414a7e995157d28c8d26048bedcbf42adf96
DIST eselect-repository-9.tar.gz 6791 BLAKE2B 66ca783b66ead0bef0e85839723844147919ca7caf4e66f962a869118bd0f7484ec183c5c7ab0327d960cb8ec9c5aae0d46b5565c121f9df9d3fe90a19426354 SHA512 9bd1f1ce15da01f76248d93d368c133e22ed77aa6dfd778d10295db649783583c203bc6c0388dec712eea5cc38b76b7527528a1e27a6a526f024eaf73e06b6ab
diff --git a/app-eselect/eselect-repository/eselect-repository-10.ebuild b/app-eselect/eselect-repository/eselect-repository-10.ebuild
new file mode 100644
index 000000000000..f221753b22fb
--- /dev/null
+++ b/app-eselect/eselect-repository/eselect-repository-10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-single-r1
+
+DESCRIPTION="Manage repos.conf via eselect"
+HOMEPAGE="https://github.com/mgorny/eselect-repository"
+SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+ app-admin/eselect
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ ')
+ net-misc/wget"
+
+src_compile() {
+ MAKEARGS=(
+ PREFIX="${EPREFIX}/usr"
+ SYSCONFDIR="${EPREFIX}/etc"
+ SHAREDSTATEDIR="${EPREFIX}/var"
+ ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
+ )
+
+ emake "${MAKEARGS[@]}"
+ python_fix_shebang eselect-repo-helper
+}
+
+src_install() {
+ emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+ einstalldocs
+}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index ee180545a6ea..98495a65df7e 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/alertmanager/alertmanager-0.21.0.ebuild b/app-metrics/alertmanager/alertmanager-0.21.0-r1.ebuild
similarity index 85%
rename from app-metrics/alertmanager/alertmanager-0.21.0.ebuild
rename to app-metrics/alertmanager/alertmanager-0.21.0-r1.ebuild
index 7fff854258f8..7905234ae370 100644
--- a/app-metrics/alertmanager/alertmanager-0.21.0.ebuild
+++ b/app-metrics/alertmanager/alertmanager-0.21.0-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit go-module user
+
+inherit go-module
+
GIT_COMMIT=4c6c03eb
MY_PV="${PV/_rc/-rc.}"
@@ -13,16 +15,18 @@ SRC_URI="https://github.com/prometheus/alertmanager/archive/v${MY_PV}.tar.gz ->
LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE=""
BDEPEND="dev-util/promu"
RESTRICT+=" test"
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
+BDEPEND="
+ acct-group/alertmanager
+ acct-user/alertmanager
+"
+
+DEPEND=">=dev-lang/go-1.11
+ dev-util/promu"
src_prepare() {
default
diff --git a/app-metrics/node_exporter/Manifest b/app-metrics/node_exporter/Manifest
index 537313dbabc4..3023236d9278 100644
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@@ -557,8 +557,6 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLA
DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8df49dae4ff187e67704b5586ba78a0dcfe5afa3b820f0ac80f7e12ba4bdb705caa97c6be85407fe97599d1244d2f56f0e9e36554ba43289d9f21d8 SHA512 3285ab90762ee6b771c95e1c842ab308f04ac366ddfa693040c49d8951bb01db33994eb69c2c9dfd6ab2b379b29cbfe31558ca6b6aafe3feea1e693b2a36d0cb
-DIST node_exporter-0.18.1.tar.gz 2110072 BLAKE2B 48c73d00cba892e34e95d40bd29c9ca70bc5748590f00cb7f8adcd25d8a9504f669d887b1273cc65316ca55b06c36d97a3e19a66382f35d5768db7c315981a13 SHA512 cf2b854fbec1ba39b18432cdc11ab507ebc5b2828e6b34b4f49af9b949fcd365cb3e5eb1e265d0825783810c6b1572a8b3512ec27a46e5c83f89a505590159c0
-DIST node_exporter-1.0.1.tar.gz 2792033 BLAKE2B 4e86c348a293e8a4a8d5e22fe99871d84a817cfbbe3ac10b0e7b4fbba3ae7b12352c619f140e3568aa2fb3e4cdfdbde0d19d792497a0b0007b634cb3a4d21e38 SHA512 0643042a04494a65d1ebdedf78671a1e3473b7ac6f3bc606fa2c52e893dfc68b591ef7e38ac6768c4c529c25b831811c01839475a4fde9baeb0a6c581a57839f
DIST node_exporter-1.1.2.tar.gz 313873 BLAKE2B daeedd913ae5bf6d2d21ae7a1d496b48850d5f3363f60dc4b1b715f000c412709452568ec33a5b4ade166512698a129866e28a145b66638b81c056f49963c3f4 SHA512 d40ea07fa0bccaa8843e99034af9a4853e7885e6b851c89db8fa49a133a8db6ea75ea8b829a982c0b78961b9ed33b1b9356f5e25d72a7c9e4ce255b32335911b
DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
diff --git a/app-metrics/node_exporter/files/node_exporter.service b/app-metrics/node_exporter/files/node_exporter.service
index 3235924f7850..20eac483fc8a 100644
--- a/app-metrics/node_exporter/files/node_exporter.service
+++ b/app-metrics/node_exporter/files/node_exporter.service
@@ -1,10 +1,13 @@
[Unit]
Description=Node Exporter
+Wants=network-online.target
+After=network-online.target
[Service]
User=node_exporter
-EnvironmentFile=/etc/sysconfig/node_exporter
-ExecStart=/usr/bin/node_exporter $OPTIONS
+Group=node_exporter
+Type=simple
+ExecStart=/usr/sbin/node_exporter
[Install]
WantedBy=multi-user.target
diff --git a/app-metrics/node_exporter/node_exporter-0.18.1.ebuild b/app-metrics/node_exporter/node_exporter-0.18.1.ebuild
deleted file mode 100644
index 05bfaba831bb..000000000000
--- a/app-metrics/node_exporter/node_exporter-0.18.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot systemd
-
-EGO_PN="github.com/prometheus/node_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT="3db7773"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
- >=dev-util/promu-0.3.0"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache promu build -v --prefix node_exporter || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin node_exporter/node_exporter
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- systemd_dounit examples/systemd/node_exporter.service
- insinto /etc/sysconfig/node_exporter
- doins examples/systemd/sysconfig.node_exporter
- popd || die
- keepdir /var/lib/node_exporter /var/log/node_exporter
- fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
- newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/node_exporter/node_exporter-1.0.1.ebuild b/app-metrics/node_exporter/node_exporter-1.0.1.ebuild
deleted file mode 100644
index ca15b40f88a0..000000000000
--- a/app-metrics/node_exporter/node_exporter-1.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-MY_PV="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT=3715be6
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="acct-group/node_exporter
- acct-user/node_exporter"
-DEPEND=">=dev-util/promu-0.3.0
- ${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" .promu.yml || die
-}
-
-src_compile() {
- mkdir -p bin || die
- promu build -v --prefix node_exporter || die
-}
-
-src_install() {
- dosbin node_exporter/node_exporter
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- systemd_dounit examples/systemd/node_exporter.service
- insinto /etc/sysconfig
- newins examples/systemd/sysconfig.node_exporter node_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- keepdir /var/lib/node_exporter /var/log/node_exporter
- fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-}
diff --git a/app-metrics/node_exporter/node_exporter-1.1.2.ebuild b/app-metrics/node_exporter/node_exporter-1.1.2-r1.ebuild
similarity index 99%
rename from app-metrics/node_exporter/node_exporter-1.1.2.ebuild
rename to app-metrics/node_exporter/node_exporter-1.1.2-r1.ebuild
index dc94a55d0c6e..d3c63f4c9580 100644
--- a/app-metrics/node_exporter/node_exporter-1.1.2.ebuild
+++ b/app-metrics/node_exporter/node_exporter-1.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -578,7 +578,7 @@ SRC_URI="https://github.com/prometheus/node_exporter/archive/${MY_PV}.tar.gz ->
LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
CDEPEND="acct-group/node_exporter
acct-user/node_exporter"
@@ -602,9 +602,7 @@ src_compile() {
src_install() {
dosbin node_exporter/node_exporter
dodoc {README,CHANGELOG,CONTRIBUTING}.md
- systemd_dounit examples/systemd/node_exporter.service
- insinto /etc/sysconfig
- newins examples/systemd/sysconfig.node_exporter node_exporter
+ systemd_dounit "${FILESDIR}"/node_exporter.service
newinitd "${FILESDIR}"/${PN}.initd ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
keepdir /var/lib/node_exporter /var/log/node_exporter
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b0bf75059aaf..8d90b9ebfe20 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
deleted file mode 100644
index 5e6b82ace427..000000000000
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools flag-o-matic linux-info perl-module systemd toolchain-funcs udev
-
-DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
-HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="perl static-libs"
-
-DEPEND="virtual/libusb:0
- >=dev-libs/libg15-9999
- >=dev-libs/libg15render-1.2
- perl? (
- dev-lang/perl
- dev-perl/GDGraph
- >=dev-perl/Inline-0.4
- )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-forgotten-open-mode.patch"
- "${FILESDIR}/${P}-overflow-fix.patch"
- "${FILESDIR}/${P}-g510-keys.patch"
- "${FILESDIR}/${P}-docdir.patch"
- "${FILESDIR}/${P}-avoid_bashisms.patch"
-)
-
-uinput_check() {
- ebegin "Checking for uinput support"
- local rc=1
- linux_config_exists && linux_chkconfig_present INPUT_UINPUT
- rc=$?
-
- if [[ ${rc} -ne 0 ]] ; then
- eerror "To use g15daemon, you need to compile your kernel with uinput support."
- eerror "Please enable uinput support in your kernel config, found at:"
- eerror
- eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
- eerror
- eerror "Once enabled, you should have the /dev/input/uinput device."
- eerror "g15daemon will not work without the uinput device."
- fi
-}
-
-pkg_setup() {
- export CC="$(tc-getCC)" #729294
-
- linux-info_pkg_setup
- uinput_check
-}
-
-src_unpack() {
- unpack ${A}
- if use perl ; then
- unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
- fi
-}
-
-src_prepare() {
- if use perl ; then
- perl-module_src_prepare
- sed -i \
- -e '1i#!/usr/bin/perl' \
- "${S}"/contrib/testbindings.pl || die
- else
- # perl-module_src_prepare always calls base_src_prepare
- default
- fi
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_configure() {
- append-cflags -fcommon #706712
-
- econf $(use_enable static-libs static)
-
- if use perl ; then
- cd "${WORKDIR}/G15Daemon-0.2" || die
- perl-module_src_configure
- fi
-}
-
-src_compile() {
- default
-
- if use perl ; then
- cd "${WORKDIR}/G15Daemon-0.2" || die
- perl-module_src_compile
- fi
-}
-
-src_install() {
- default
-
- find "${ED}" -type f -name '*.la' -delete || die
-
- # remove odd docs installed my make
- rm "${ED}"/usr/share/doc/${PF}/README.usage || die
-
- insinto /usr/share/${PN}/contrib
- doins contrib/xmodmaprc
- doins contrib/xmodmap.sh
- if use perl ; then
- doins contrib/testbindings.pl
- fi
-
- newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
- newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
- systemd_dounit "${FILESDIR}/${PN}.service"
- dobin "${FILESDIR}/g15daemon-hotplug"
- udev_dorules "${FILESDIR}/99-g15daemon.rules"
-
- insinto /etc
- doins "${FILESDIR}"/g15daemon.conf
-
- # Gentoo bug #301340, debian bug #611649
- exeinto /usr/lib/pm-utils/sleep.d
- doexe "${FILESDIR}"/20g15daemon
-
- if use perl ; then
- ebegin "Installing Perl Bindings (G15Daemon.pm)"
- cd "${WORKDIR}/G15Daemon-0.2" || die
- docinto perl
- perl-module_src_install
- fi
-}
-
-pkg_postinst() {
- elog "To use g15daemon, you need to add g15daemon to the default runlevel."
- elog "This can be done with:"
- elog "# /sbin/rc-update add g15daemon default"
- elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
- elog ""
- elog "To have all new keys working in X11, you'll need create a "
- elog "specific xmodmap in your home directory or edit the existent one."
- elog ""
- elog "Create the xmodmap:"
- elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
- elog ""
- elog "Adding keycodes to an existing xmodmap:"
- elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
-}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 48016000c4cf..4165237f3ba4 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index dca7e817908f..0ad814f70c26 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,3 +1,3 @@
DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
-DIST fish-3.2.0.tar.xz 3403640 BLAKE2B 740e20d428ef67b25352d56e5f2ca5732bbcb8310082dc1ca4f66c173d0380a5ab86328d6c1f8d899844d78bfd9547323a02d2c4caf5e82817ad01260bba3a7e SHA512 4525b8dd991179f77a298080d389813d1da8557bd394d174ded9238570715137e3aeec009d123811b34c07856d5f7cbe0ad35dc599d748f8f305036c3b74face
DIST fish-3.2.1.tar.xz 3409808 BLAKE2B ad136c60cc98ae9fdb2e2abecb722107543184cb162a3c6b058e8ebe40a383a09c0e9b0eca762ab95725227dd6630605ad875bd4da59d38e605bc1f82fa1d517 SHA512 bf565bac93e7d163af5253b4053f9c9e760508b929624440fd8a160504a127c34013882576293c72a47ce7f285f87e0b594d61d7cebcefcc3be4e92c572926bc
+DIST fish-3.2.2.tar.xz 3411748 BLAKE2B f8b20b6c56c54f84f347b930b71528dbd61a4f53adfd8addec05314c9d15992257cea89ce854adef2eecf3adfb07e6fa576b9d45c2e362ff360b24cf1edf3afc SHA512 e82c5a390bd94f84c60843a94dc4f30bd46539828a54d2e96f208e0d54a0aa361a8c9d4a66cdf2fa636a5fab310a96bf1c165c58440c38d123f788fff3598f4a
diff --git a/app-shells/fish/fish-3.2.0.ebuild b/app-shells/fish/fish-3.2.2.ebuild
similarity index 100%
rename from app-shells/fish/fish-3.2.0.ebuild
rename to app-shells/fish/fish-3.2.2.ebuild
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 8ca7de1e7d62..1c1518ac97b9 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 21fd980bacb1..06ddb80e9813 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1 +1,2 @@
DIST tiled-1.4.3.tar.gz 17806808 BLAKE2B 81b5a32cc1e6f5f3b4af5520752d34572f0e78aad90df435d075b53ac18b39961aa22d23cff614cd83f0883fd2fd2bca69026160cb8b1b727fddaeff5764babe SHA512 1e75e323733e05563bf542364778d95f2f22484ec0d85b4a9e7fac782c117934b37b049724979be5c83de86a3900c7ca2e9f3c5a660c530d2ecd0f023eb22c2e
+DIST tiled-1.5.0.tar.gz 16694406 BLAKE2B ccab3ec9f5ac807126ddf5d26e4eaa06357e67ffbd63550bdad93e814ff02350f9138f62114a56b5e64bc6c7fd3f6664ab7da836cab7e478ea7075111fa1cae7 SHA512 eb25affdab481db29ab2bbaeb4abafd453b2b43ae47e4b8f9f2fd1ed0d8ed55fdb45ec1bdc0b484ba9a2d63afad5a0c9ba6376304ed4b1eab3918c36a0af29c9
diff --git a/dev-games/tiled/tiled-1.5.0.ebuild b/dev-games/tiled/tiled-1.5.0.ebuild
new file mode 100644
index 000000000000..fdbcb6753cda
--- /dev/null
+++ b/dev-games/tiled/tiled-1.5.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit python-single-r1 qmake-utils xdg-utils
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ app-arch/zstd:=
+ >=dev-qt/qtcore-5.15:5
+ >=dev-qt/qtdeclarative-5.15:5
+ >=dev-qt/qtgui-5.15:5
+ >=dev-qt/qtnetwork-5.15:5
+ >=dev-qt/qtwidgets-5.15:5
+ sys-libs/zlib
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ eqmake5 \
+ LIBDIR="/usr/$(get_libdir)" \
+ PREFIX="/usr" \
+ SYSTEM_ZSTD="yes" \
+ DISABLE_PYTHON_PLUGIN="$(usex !python)" \
+ USE_FHS_PLUGIN_PATH="true"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ einstalldocs
+
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 732d8048c725..fdf4471be84f 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index 64c2fc0a4bca..11b65e0d5ac0 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,7 +1,7 @@
DIST commons-lang-2.0-src.tar.gz 440989 BLAKE2B d71d73504c740138bdb9c1e190e0f4e846fb08a35d8ee2430ac2e24b0094e83cfc8cab9eaa44230c0d7fd26ec768bf7b448f04e123467acc20d49af6efe3008b SHA512 aecbbdd8eb2712981dcd8615bac2ec69e3ea7ae137407287d2a9b3eeaddb48e5367bc9c5cb8d232429ac6091548dac8af67e0593366365c04fcfe39984c3e549
DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87
DIST commons-lang-3.11.tar.gz 1054329 BLAKE2B 7d198e2e7f09f3711909a168cbef405d06aff7482d8ab87059aa11584e82d950ea32f1c1a4d0c9c6c54729396e6b5ee6165a7689b3c38081af31b7a3dad23657 SHA512 ebcb13e47c24e6984835d9d6904fe33077aa3ba781cd61db109fa7005517e4e74cf086c4789a1d65cf3d6c4924b32337c98827a75f91aab908d8e8b9d3b92087
+DIST commons-lang-3.4-sources.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5
DIST commons-lang-3.6.tar.gz 852347 BLAKE2B 4a3ad5f557d27e4a109f6e65f9fe8d792b017376227747669bf949725cdc3817a7f14766e121db099e027fc3c322eeb3f68c41786be9a8d500172cfd3c104c7f SHA512 fb627605154c1b3d4561c27ad931bfcac43303ce98ffca8fca538ce6368506cdd2b80de7f22a93ca628e86804923940dd9909bb884c77ca196b654521febc60a
DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560
DIST commons-lang3-3.3.2-src.tar.gz 740462 BLAKE2B dbf8fe7f6a4bb0cf462e2281d709e4ecd65e5fa116bb707af14a2b7b248eb1877f872f937fde2e5743bbe9b4775fabd1d0897ebeb8ebe92af235914cac7dbc2f SHA512 be889e0e9d7aaa7d6635e41c17d19dd1e5f9e03fd78eac61fd5f5483321170b9a72007ad0bfa7023e6ff55ae418b40eaa01dae350641c4e88138ac59d4001667
-DIST commons-lang3-3.4-src.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5
diff --git a/dev-java/commons-lang/commons-lang-3.4-r1.ebuild b/dev-java/commons-lang/commons-lang-3.4-r1.ebuild
new file mode 100644
index 000000000000..67cbdf0da5dc
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.4-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri http://distfiles.gentoo.org/distfiles/93/commons-lang3-3.4-src.tar.gz --slot 3.4 --keywords "~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" --ebuild commons-lang-3.4-r1.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-lang3:3.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Commons components to manipulate core java classes"
+HOMEPAGE="http://commons.apache.org/proper/commons-lang/"
+SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="3.4"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+
+# Compile dependencies
+# POM: pom.xml
+# test? commons-io:commons-io:2.4 -> !!!groupId-not-found!!!
+# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
+# test? org.easymock:easymock:3.3.1 -> >=dev-java/easymock-3.3.1:3.2
+# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/commons-io:1
+ dev-java/easymock:3.2
+ dev-java/hamcrest-library:1.3
+ dev-java/junit:4
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-disable-some-tests.patch"
+)
+
+S="${WORKDIR}/${PN}3-${PV}-src"
+
+JAVA_ENCODING="ISO-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=(
+ "src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,easymock-3.2,hamcrest-library-1.3,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+ "src/test/resources"
+)
+
+src_prepare() {
+ default
+ java-utils-2_src_prepare
+}
+
+src_test() {
+ LC_ALL=C java-pkg-simple_src_test
+}
diff --git a/dev-java/commons-lang/commons-lang-3.4.ebuild b/dev-java/commons-lang/commons-lang-3.4.ebuild
deleted file mode 100644
index d47b0693c0a1..000000000000
--- a/dev-java/commons-lang/commons-lang-3.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.commons:commons-lang3:3.4"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}3-${PV}"
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang/"
-SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz"
-
-DEPEND=">=virtual/jdk-1.6
- !ppc? (
- !ppc64? (
- test? (
- dev-java/ant-junit4
- dev-java/commons-io:1
- dev-java/easymock:3.2
- )
- )
- )"
-
-RDEPEND=">=virtual/jre-1.6"
-
-LICENSE="Apache-2.0"
-SLOT="3.4"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-RESTRICT+=" ppc? ( test ) ppc64? ( test )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2,commons-io-1,junit-4"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_install() {
- java-pkg_newjar target/${MY_P}.jar ${PN}.jar
-
- dodoc RELEASE-NOTES.txt NOTICE.txt
-
- use doc && java-pkg_dojavadoc target/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
- LC_ALL=C java-pkg-2_src_test
-}
diff --git a/dev-java/commons-lang/files/commons-lang-3.4-disable-some-tests.patch b/dev-java/commons-lang/files/commons-lang-3.4-disable-some-tests.patch
new file mode 100644
index 000000000000..9f7d9b01df2e
--- /dev/null
+++ b/dev-java/commons-lang/files/commons-lang-3.4-disable-some-tests.patch
@@ -0,0 +1,75 @@
+diff --git a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
+index d82dd28..68a1b90 100644
+--- a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
++++ b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
+@@ -577,6 +577,10 @@ public class LocaleUtilsTest {
+ str = str.substring(0, suff);
+ }
+ }
++ // skip invalid locale
++ if (str.endsWith("_001") || str.endsWith("_419") || str.endsWith("_150")) {
++ continue;
++ }
+ final Locale loc = LocaleUtils.toLocale(str);
+ if (!l.equals(loc)) {
+ System.out.println("Failed to parse: " + str);
+@@ -589,4 +593,4 @@ public class LocaleUtilsTest {
+ }
+ }
+
+-}
+\ No newline at end of file
++}
+diff --git a/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
+index dee0e87..272cf03 100644
+--- a/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
++++ b/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
+@@ -319,7 +319,7 @@ public class ToStringBuilderTest {
+ assumeFalse("Oracle Corporation".equals(SystemUtils.JAVA_VENDOR) && "1.6".compareTo(SystemUtils.JAVA_SPECIFICATION_VERSION) < 0);
+ final List