diff --git a/Manifest b/Manifest
index a8e35cf9436e..33d491c9c00c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29638 BLAKE2B 6f36c0188e46dc1771e65d87a3933a43e8ff8e2b84482e20a10769b004a1c4fe404067516e153c1d946a7e495383dd22aaf6a29af89037304aad5bfee5d49372 SHA512 547f1ec1e7f2c11b4fb787e8e977155c71aef8d549bb0aee111f90429c4ba643987b1aef372d13f4d77e837d955cc357cc97f79ea810f1c42a94add8e7705444
-TIMESTAMP 2022-05-05T19:39:42Z
+MANIFEST Manifest.files.gz 29626 BLAKE2B 492334ce1396be6c30f3d8fa7f2178b79c09c8899ae58b1d33520b145f9b3ea551cbc88b1643265aae96cfdfaa15d85ba6df2b333b8b5f9926d1d537f6db1553 SHA512 29513aa1767395f83a5e5c350824c8a83c3ff58424d2f1d0f2b48741e51b4ec1f7a32a86d64cca6d8ca3baf508062afa93b7ece70a1d2aac6ee646a9b01ac39b
+TIMESTAMP 2022-05-06T16:09:48Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJ0J/5fFIAAAAAALgAo
+iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJ1SExfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAdHBAAmlQtJD7AHfY2O+fUdtPtJIQR4eMFcN+G0VDb/ngp/QNLSmea1lOTmUq9
-4LWEgBudjflfGCZ6g8opbu8wk/XScfhjiJ401WYX7/5PgC2AqQGeTnogPzCFzbul
-3QlOhEt9kKqOvQVsfCYmcKG541/8YLVTVkg0FBgvywCmGV9LqZlwD7W2zimVfgOA
-EdkbETZReW4E7AXmJrkbob3oiyaWRT5YMhgEcjV4IJO17Tz5dCw20Y5vzlmIjNR9
-5gE0631jgXD+PQZnFvxP51LDG3hKrAS/1iWEwwe6MKSKuxjQ/3SOuuWV1RoVf9Uk
-c3Ofvy1UqOPobumTFDyLBuYa5bTQRdqzz6ehufRQ3B9fYIckVKZKJcv9q6oNEppK
-N4qFGD0kxbHhSsIPBvsg1FOD731b1NdCApNsal8PKWCc7Qa+5V8SKlPbYzvLPvCW
-ong6uCBso6Mw/Ma4quwbpGHFT8RelZ02/dydgf2syCnjKfFt4PiiPxv77CvNxYOH
-cAb3TV9Qo0V1m/wXtWBFMobsb03rtaJWrLEMJ3qMX7bTOqVVDy0YiT8QYiOWwkQ/
-ecCL2plOE7LFgM3KOS3bkFlcVs2pPKVbnLb8WPUBfmWTepj4rYIxVZ5q1JhRAa+Z
-GzCv7+IZOT7UNcSQDCyYmpMElkpf5thNw3MTEDsvxPXTECE3/Jo=
-=Rzpj
+klA29g/yA3P/L+SKbO4xOu2NCOuimmJCpzewI7FgA8Y5tDwd8aQFr/FfDhqPNvzC
+LANuNCEiXNV5PYNYcFVDbnY9dFv+oSQl60CX6NQBjdKKy6KEdVogVRju6ufkCQBA
+D+PJMKev0lwLyJ6hszaTUOJl16KAE/IG9ThUmcSQ9ZqLH74E2z51tOzX6Wzy9ud7
+8x2beBCzar+jwgTQ53cz0dOwbtoZQVgacBFHJoRmq+DuLZXfXaGglEhmikAvdB7I
+8dUrrHi2mXZds5J6dMLSYbWoahH8GWcGeh+1Rb7P98gU1upsfQOfMulq2PAHB/8V
+GBCEcX8POtpce6L1wA8tmSQJMIcg9PGZSSWxg3hmx+Yu4yPRXV5FLHBAf7pRu3Rj
+vxfLFfP6LDUp7iz2I3N0D+IayTJsbEGRFPiDnC0d44K9I9hDCvNZhkWpIsk2eOaO
+z9Ed0Szr6eVdQAIMU9pYIg9AQ78CpkHvbSL+d2f5VrUP7v7bs6gOGa2mKEemLmXE
+Fpi60RbiONWXxA5KJFJ+LlNcgPlI/Pm8xICOs2Nk8XoGPSZgn5YnsvhwZUTVpagl
+/Jj9+iYgz+W7f7LdhX/EQFkUibFfhoS8JepeThWnZg00gmh6udVmCXOy15PlZxvd
+QwadA1ZPH94Fa4MTrdTYkKAHDaQ4bj0XhpxFGmLWTfSINrtWsw==
+=D9Nu
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 70b6d5312352..6cd4e1ff42cd 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d48aa2ee37b6..45a81ff7684d 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index f9a88d1fe13c..976b6f52fcf2 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,5 +1,7 @@
DIST aws-cli-1.23.4.gh.tar.gz 2200991 BLAKE2B b70012a8dd83d46a460977063ad11111a7af728ee7e00f87cf5d559ff3e1a4eb1824580bfc5f869d749d0e75e336eb3a025a77f2b637a7306dc39fadba2382a1 SHA512 e949b4bf171e1ad4364ced1fbb7bec89d83077ee2de745dfc661fe1518476e7e07a29e58877adbe65c46398602af374d9af47ae976e7984b1ed2e59a67bd4f03
DIST aws-cli-1.23.7.gh.tar.gz 2201704 BLAKE2B 4c97a7bfc09c794afebd7c770bc1dcc98a8f1458597235bdde0a8236ce49f661cff6f7ab7f4c7eee85160432c5f991b18feab45568c6b5b84aa8eff9b11b0c18 SHA512 24173c1f2905bc005c2f02de69feadf21e78e38b569f9c0dcb72658a2ca1b0c3c621bf4a6d121be2388c40fcfb02423feb301b84d63b25ea384ffe1c0ddd8d37
+DIST aws-cli-1.23.8.gh.tar.gz 2201989 BLAKE2B 59651082736c71a08085eab047056d949e908a42ca0f3af15d666cb3b7e5d21d1770622d8121c366489451e51349f19324c36542f24013ede33306989840fe57 SHA512 a58ab507302fb9631983fb31d1b877f5af8856493f04e6c5c18cbb883a60247393e4ce62f1231908fc774d2f74c691086bc8e21af96524e82595489b5cf1d195
EBUILD awscli-1.23.4.ebuild 1790 BLAKE2B 47f98c0eac183f203cb66fb0b2fe928fc93cae08c32d0c7558aff5a64d59b519aa9c76100c8f1f5272c90d85cdc97d77585e1a19854245998d493024935adbc0 SHA512 cbc83f31e92cf2b7ad34201e3c315a36a7fccbf3bbde1aa4984caf29ef211db0c5bc52fd3964690445b658ef35a53dc70bdcfee6d812945559c3e462065f4dee
EBUILD awscli-1.23.7.ebuild 1813 BLAKE2B f1e86ab8f5c8ac7817b46709cfb3e860985a475107a700c6818922d3aaabe1787ef128816eb8eb9580d46325e5b01aa643b9cb08f94df1957e32296e310fd16a SHA512 c4af586ec56601df3308c5395e37060410080f18662c4e52f9f6bfbe860a516a72bb64db97017d2aae6e97dc648fef9c97eed24e95d71d18821302e1878e12a3
+EBUILD awscli-1.23.8.ebuild 1813 BLAKE2B f1e86ab8f5c8ac7817b46709cfb3e860985a475107a700c6818922d3aaabe1787ef128816eb8eb9580d46325e5b01aa643b9cb08f94df1957e32296e310fd16a SHA512 c4af586ec56601df3308c5395e37060410080f18662c4e52f9f6bfbe860a516a72bb64db97017d2aae6e97dc648fef9c97eed24e95d71d18821302e1878e12a3
MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.23.8.ebuild b/app-admin/awscli/awscli-1.23.8.ebuild
new file mode 100644
index 000000000000..acabee851193
--- /dev/null
+++ b/app-admin/awscli/awscli-1.23.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 53535a510822..931a7a0d0816 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 e32623bc9ef4..6ed49d6161c3 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -17,10 +17,8 @@ AUX freshclam.initd 202 BLAKE2B 3bc294930984b779b032d40f9dd5063fb168a096cd45ef43
AUX freshclam.logrotate 631 BLAKE2B d5100e4f80227d3cda00193eb7a065f766d6b7b0c54ef58ad646fc7692cd4c6e572e053d368ba78c62c27cd3e1db111822208d29ecad67d10be7d5957d6622f3 SHA512 43838241c66bdf167105b25967576a568e0661e5b3292d24d3028837353280b03ffd1ea6adbbcbc152e50bc25f77357af42bbf3dd70817cf2cf02258ca0fe611
AUX freshclamd.service-r1 177 BLAKE2B 8c9304e8c43e03288dcb1c6897b53e7c36b6e6116bb5c43db1e9735cc5d7b50094d33679d2b42839a09c572ad631daf572f62c57e4a7b74bfad5ce40a5916364 SHA512 5243465d30de1e64697455b3af50f62e6d7f3d0df7e2ef9b60f89dc974d8118ff67df0b44fbbddd04dd196ca17cf4306ac99f1eec42a5a0ddd42a64c4cb992c8
AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
-DIST clamav-0.103.5.tar.gz 16434316 BLAKE2B c5a21b72419a8cd731656d8a8bbc79c5850895f1d8cc56cb5d19eabe2356a5dfcf88e7dc9553071a24b2719bae07cf1a941da3dbed69da8ac4ae3b8897ab32fe SHA512 242423b507eacbbd31dbae6dd0325dff87da25bb8072f2cee7a5e7cab4b8eb5ee6196c759570c1d75986a2777f0f79f92cfbd6250a30ae5b53390c75b238c29a
DIST clamav-0.103.6.tar.gz 16491761 BLAKE2B 3c43bcda4a613f81d1b31036e7323a7af7708e54af94ad30a659a8fb318d8f79f357086ce70703659298524d778374df886495cd8c75280bbbe4bae30795a85a SHA512 d39e1964678b8251bde3a9f3db30fe3d3d76cc566a86834297f4dd8489086dc9cc4c6541ca128089159f4c071d2d85b530455bd942987d3929ea0082b8ab272b
DIST clamav-0.104.2.tar.gz 11950409 BLAKE2B 7d7eb9d22ca519f7ad0c171b6cab4b59cb52787a897ab31b9567166be2223f9ea89e79f42f1e4e0caf32fcb4b008f5ce755fa136566f85fe1de7808b436f80fa SHA512 8c89a05dec6650677125177434cc49ec2298701525508cdda52358e8f98086d80892287f6267f8b7fda0aef2ca361616cb584c3059f3b066bfde65f7f1ba2df5
-EBUILD clamav-0.103.5.ebuild 7353 BLAKE2B 9849983170e473ed2c906cec47b2e99727e603e0f3f5c72ddcab1cbce3f9255101bc5be34544b89037b90bb967d1ab29c93ed77d8e35ac611493020d0165f5d2 SHA512 b70196e273dc8668bc77211c702dcafd218d7aca2a3ea444ece7a9c132aa3bcc551ba0f07a016fa13963f7642a3716682e00a353c3bc044779081b399226301d
-EBUILD clamav-0.103.6.ebuild 7359 BLAKE2B 95f3aebd8de5b0cac2ea20d5bc30848dce838d0cf4b56765c4b9a19aded0e430f132ab82eccaa08fbbe5e718c1d0bb6bb9b9fb904964e438087dd9b2ead6b848 SHA512 158ca8a5f39932198e0fcb89c07ca492f0db9b527f2d321e11d36403f7830257412d5a6cbb5aece5fb7f3f643cbaa338f1ffc377e69b84a10ab69ba64ddf88fd
+EBUILD clamav-0.103.6.ebuild 7353 BLAKE2B 9849983170e473ed2c906cec47b2e99727e603e0f3f5c72ddcab1cbce3f9255101bc5be34544b89037b90bb967d1ab29c93ed77d8e35ac611493020d0165f5d2 SHA512 b70196e273dc8668bc77211c702dcafd218d7aca2a3ea444ece7a9c132aa3bcc551ba0f07a016fa13963f7642a3716682e00a353c3bc044779081b399226301d
EBUILD clamav-0.104.2.ebuild 6847 BLAKE2B 64117138433379a4432fb98c844745eb298875de45cdb08ed866489b4f40847f74ffd41591520d788a3e1468340b77e0170f78475a18eeecd93e1669a79c2103 SHA512 215f1b11136a888e612b32f05367f19d4a68add3d7415dc0256946e54c0f31ef9afd442182a54bd4532404fa4d7484accd945d8c6dfcc84fc3fee69bdd719c96
MISC metadata.xml 1287 BLAKE2B 75d0e2ee639919863a0b12951c04f6338fab836812a930b5cae82adc9546f0d9115c1c12a233b08e7bcf1810b38f8d0c119ee44a7640ade191f9bdb5c2bdf759 SHA512 2ef5d16db72356b72cfe6334b5a9b6c6e4d491ab445debbf9433d44c843e27d03aade9cc49a4fcad151ecfbb3dc4d99903e5a27eac8954991822eca3bad2b6c0
diff --git a/app-antivirus/clamav/clamav-0.103.5.ebuild b/app-antivirus/clamav/clamav-0.103.5.ebuild
deleted file mode 100644
index 57871e2f02fe..000000000000
--- a/app-antivirus/clamav/clamav-0.103.5.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic systemd tmpfiles
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="https://www.clamav.net/"
-SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test xml"
-
-REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
-
-RESTRICT="!test? ( test )"
-
-# Require acct-{user,group}/clamav at build time so that we can set
-# the permissions on /var/lib/clamav in src_install rather than in
-# pkg_postinst; calling "chown" on the live filesystem scares me.
-CDEPEND="acct-group/clamav
- acct-user/clamav
- dev-libs/libltdl
- dev-libs/libmspack
- || ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
- dev-libs/tomsfastmath
- >=sys-libs/zlib-1.2.2:=
- bzip2? ( app-arch/bzip2 )
- clamdtop? ( sys-libs/ncurses:0 )
- clamsubmit? ( net-misc/curl dev-libs/json-c:= )
- elibc_musl? ( sys-libs/fts-standalone )
- iconv? ( virtual/libiconv )
- !libclamav-only? ( net-misc/curl )
- dev-libs/openssl:0=
- milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
- xml? ( dev-libs/libxml2 )"
-
-# We need at least autoconf-2.69-r5 because that's the first (patched)
-# version of it in Gentoo that supports ./configure --runstatedir.
-BDEPEND=">=sys-devel/autoconf-2.69-r5
- virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
- metadata-analysis-api? ( dev-libs/json-c:* )
- test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-clamav )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
- "${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
- "${FILESDIR}/${PN}-0.103.0-system-tomsfastmath.patch" # 649394
- "${FILESDIR}/${PN}-0.103.1-upstream-openrc.patch"
-)
-
-src_prepare() {
- default
-
- # Be extra sure that we're using the system copy of tomsfastmath
- einfo "removing bundled copy of dev-libs/tomsfastmath"
- rm -r libclamav/tomsfastmath || \
- die "failed to remove bundled tomsfastmath"
-
- AT_NO_RECURSIVE="yes" eautoreconf
-}
-
-src_configure() {
- use elibc_musl && append-ldflags -lfts
- use ppc64 && append-flags -mminimal-toc
-
- # according to configure help it should be
- # $(use_enable xml)
- # but that does not work
- # do not add this, since --disable-xml seems to override
- # --without-xml
- JSONUSE="--without-libjson"
-
- if use clamsubmit || use metadata-analysis-api; then
- # either of those 2 requires libjson.
- # clamsubmit will be built as soon as libjson and curl are found
- # but we only install the binary if requested
- JSONUSE="--with-libjson=${EPREFIX}/usr"
- fi
-
- local myeconfargs=(
- $(use_enable bzip2)
- $(use_enable clamonacc)
- $(use_enable clamdtop)
- $(use_enable ipv6)
- $(use_enable milter)
- $(use_enable test check)
- $(use_with xml)
- $(use_with iconv)
- ${JSONUSE}
- $(use_enable libclamav-only)
- $(use_with !libclamav-only libcurl)
- --with-system-libmspack
- --cache-file="${S}"/config.cache
- --disable-experimental
- --disable-static
- --disable-zlib-vcheck
- --enable-id-check
- --with-dbdir="${EPREFIX}"/var/lib/clamav
- # Don't call --with-zlib=/usr (see bug #699296)
- --with-zlib
- --disable-llvm
- --enable-openrc
- --runstatedir=/run
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm -rf "${ED}"/var/lib/clamav || die
-
- if ! use libclamav-only ; then
- if use systemd; then
- # The tmpfiles entry is behind USE=systemd because the
- # upstream OpenRC service files should (and do) ensure that
- # the directories they need exist and have the correct
- # permissions without the help of opentmpfiles. There are
- # years-old root exploits in opentmpfiles, the design is
- # fundamentally flawed, and the maintainer is not up to
- # the task of fixing it.
- dotmpfiles "${FILESDIR}/tmpfiles.d/clamav.conf"
- systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
- systemd_dounit "${FILESDIR}/clamd.service"
- systemd_newunit "${FILESDIR}/freshclamd.service-r1" \
- "freshclamd.service"
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/clamd.logrotate" clamd
- newins "${FILESDIR}/freshclam.logrotate" freshclam
- use milter && \
- newins "${FILESDIR}/clamav-milter.logrotate-r1" clamav-milter
-
- # Modify /etc/{clamd,freshclam}.conf to be usable out of the box
- sed -i -e "s:^\(Example\):\# \1:" \
- -e "s/^#\(PidFile .*\)/\1/" \
- -e "s/^#\(LocalSocket .*\)/\1/" \
- -e "s/^#\(User .*\)/\1/" \
- -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
- -e "s:^\#\(LogTime\).*:\1 yes:" \
- -e "s/^#\(DatabaseDirectory .*\)/\1/" \
- "${ED}"/etc/clamd.conf.sample || die
-
- sed -i -e "s:^\(Example\):\# \1:" \
- -e "s/^#\(PidFile .*\)/\1/" \
- -e "s/^#\(DatabaseOwner .*\)/\1/" \
- -e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
- -e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
- -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
- -e "s/^#\(DatabaseDirectory .*\)/\1/" \
- "${ED}"/etc/freshclam.conf.sample || die
-
- if use milter ; then
- # Note: only keep the "unix" ClamdSocket and MilterSocket!
- sed -i -e "s:^\(Example\):\# \1:" \
- -e "s/^#\(PidFile .*\)/\1/" \
- -e "s/^#\(ClamdSocket unix:.*\)/\1/" \
- -e "s/^#\(User .*\)/\1/" \
- -e "s/^#\(MilterSocket unix:.*\)/\1/" \
- -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
- "${ED}"/etc/clamav-milter.conf.sample || die
-
- cat >> "${ED}"/etc/conf.d/clamd <<-EOF
- MILTER_NICELEVEL=19
- START_MILTER=no
- EOF
-
- systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
- fi
-
- local i
- for i in clamd freshclam clamav-milter
- do
- if [[ -f "${ED}"/etc/"${i}".conf.sample ]]; then
- mv "${ED}"/etc/"${i}".conf{.sample,} || die
- fi
- done
-
- # These both need to be writable by the clamav user.
- # TODO: use syslog by default; that's what it's for.
- diropts -o clamav -g clamav
- keepdir /var/lib/clamav
- keepdir /var/log/clamav
- fi
-
- if use doc ; then
- local HTML_DOCS=( docs/html/. )
- einstalldocs
-
- if ! use libclamav-only ; then
- doman docs/man/*.[1-8]
- fi
- fi
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-src_test() {
- if use libclamav-only ; then
- ewarn "Test target not available when USE=libclamav-only is set, skipping tests ..."
- return 0
- fi
-
- emake quick-check
-}
-
-pkg_postinst() {
- if ! use libclamav-only ; then
- if use systemd ; then
- tmpfiles_process clamav.conf
- fi
- fi
-
- if use milter ; then
- elog "For simple instructions how to setup the clamav-milter read the"
- elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
- fi
-
- local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
- if [[ ! -f "${databases}" ]] ; then
- ewarn "You must run freshclam manually to populate the virus database"
- ewarn "before starting clamav for the first time."
- fi
-
- ewarn "This version of ClamAV provides separate OpenRC services"
- ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The"
- ewarn "clamd service now starts only the clamd daemon itself. You"
- ewarn "should add freshclam (and perhaps clamav-milter) to any"
- ewarn "runlevels that previously contained clamd."
-}
diff --git a/app-antivirus/clamav/clamav-0.103.6.ebuild b/app-antivirus/clamav/clamav-0.103.6.ebuild
index c741ac2099ac..57871e2f02fe 100644
--- a/app-antivirus/clamav/clamav-0.103.6.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test xml"
REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 04634ac8b8e9..1367a1b88854 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/lzlib/Manifest b/app-arch/lzlib/Manifest
index f7d81432d58c..d40e1d898c4b 100644
--- a/app-arch/lzlib/Manifest
+++ b/app-arch/lzlib/Manifest
@@ -1,6 +1,4 @@
-DIST lzlib-1.12.tar.gz 128996 BLAKE2B 3a86005eaf660a45888ec5af97bc6100368da2a3003c119c2379e881cd77ef318707342b7c930efa9473b671b8c2aff5c5e00dd5b312f647b7cafc39f29a2eea SHA512 b5379422eed4016b0ee124e39902dd22c314ca5cc5f72c1af5ec2ef6a68e1e85c523ab18e30048d453689f73f780d0144dcabaf881337e1c8101e2fe17ee21f8
DIST lzlib-1.13.tar.gz 130005 BLAKE2B 88721890f111c2bb1901329e9cc39e7f581c220bb58bbc93098c34984b7557a80adff236f5755057099870ba20201f6b692925080b97965b4612d221d21cb33c SHA512 b9c4e5a9aca982984b497d1da2e1f0439b37b19acaf88a02f5af114b0a65a828c5ae235b3bd4f419ce001963de38a4d03445a6a1bd93f37e783e799abd75578d
DIST lzlib-1.13.tar.gz.sig 72 BLAKE2B 66d7a9939a5e23874a6927545f265cf315d634a166d7f22cbe4f09ab88dbae778aa9c6f77e6d5e51fbaadc9a503f735fb2bc834475089a6046782f9af22b472f SHA512 1db7a91b3a84d70874c0ec92b2764ab6805e20a351438b975f4e72dd6a1dbe5a4448d47af2bb6d056bde9c6102df375454724d536efbdaa90cd7dbf08eb01c81
-EBUILD lzlib-1.12.ebuild 749 BLAKE2B 2a98f0bd4a23df9cd1551f14a9580ade358436c3eacbca2955703a0bf20dc2a44f22a04f602e40ee72db39293d207f699255323c8328b0c8c6e5d090633266d8 SHA512 16f625984b23730e8e8535eefe5a56233097979974b9046613999b81d31378499dc354d03e7a75838ff6f70e1caaece8508697af85d043e780009adc8518e70f
-EBUILD lzlib-1.13.ebuild 1001 BLAKE2B 58e62ff4dd007050b67478191595e70edf9a1d403d26f1ca509f98256e851deeac437dacfdf6487884f06121a95ff63498646c09f8040477289546b6fc429117 SHA512 fa32ca19e989de0bb28f7f8125aca53578367b6785622ab02042df2911d3ab96e1cdd2fe35649f037fc52421f1b1c4ffa8d4565af592c92bfec9d68b05fa2f37
+EBUILD lzlib-1.13.ebuild 1007 BLAKE2B fd716501076953a716b1285c7dd96eea2fdc6e3c2f19b1ee78595069095238f2517be0ab89086e011c10c24374cec42d654c453050a7d4c93e2a63b3b5846385 SHA512 06219ae5860999b75baabfe0b6d4a43c568b07a1fca81d5613076c7b1f8fa74f8a6c3ff5b07ad2bb8619d6da34d2febea9115a6c5db2b47c31871ec8f9f046a8
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/lzlib/lzlib-1.12.ebuild b/app-arch/lzlib/lzlib-1.12.ebuild
deleted file mode 100644
index 28ba96eca484..000000000000
--- a/app-arch/lzlib/lzlib-1.12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Library for lzip compression"
-HOMEPAGE="https://www.nongnu.org/lzip/lzlib.html"
-SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
-
-LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
-SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ppc ppc64 x86"
-IUSE=""
-
-src_configure() {
- local myconf=(
- --enable-shared
- --disable-static
- --disable-ldconfig
- --prefix="${EPREFIX}"/usr
- --libdir='$(prefix)'/$(get_libdir)
- CC="$(tc-getCC)"
- CFLAGS="${CFLAGS}"
- CPPFLAGS="${CPPFLAGS}"
- LDFLAGS="${LDFLAGS}"
- )
-
- # not autotools-based
- ./configure "${myconf[@]}" || die
-}
diff --git a/app-arch/lzlib/lzlib-1.13.ebuild b/app-arch/lzlib/lzlib-1.13.ebuild
index 09a56cb39c4f..64318adf63a6 100644
--- a/app-arch/lzlib/lzlib-1.13.ebuild
+++ b/app-arch/lzlib/lzlib-1.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$
LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index 476b5fc9398b..0a4117ce6f60 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,3 +1,3 @@
DIST ncompress-5.0.tar.gz 34185 BLAKE2B 7b296bd00024bfb483d3261ff8aa6e47a6be8c62b445c3d456d702b69fbc2a7b731326f7ea91aa331ba8e8a27936f4318b3e252cc978b6bf3198e8812988913f SHA512 5bc886f98f25b03d034e8d8ebb0ee9388d727ee3e0c6d8a906698b2f8fa5c930f55d857486244b7f40447c7b74f3c620626600db619d0c6d6fd434f52912be42
-EBUILD ncompress-5.0.ebuild 756 BLAKE2B 6368d22eced6c197e6eca19db29989e6320f37858f71cb2a4dce56d80eb0ba10c294a498556fdd88f3671bd3eb5c34799ed7ee88c0878ece955ab2b992d91759 SHA512 9332b53efc5df725a3c3a2ac2de3fd36b46596edf888fc8890cecd85a9625cf3183794aa01e0b01a00353bbac6313e6323e13204e5613fc7578aa73b8ff9a818
+EBUILD ncompress-5.0.ebuild 763 BLAKE2B a5eac829aab31ff186a7668542410587ed8bb8fd8787bd2b3053003e9a3a72515dec842050a6bfdadc2115bfffd05e15b7a71a8cd79fc40a3a87cb4391f26416 SHA512 a2753555531e73a519331c9b282e1cd54781093649eec68209bd4c0cbc1e78009f90b9b4a9c0c36ff79afa6b05451084e9a51b00a002ace40cec8fbf138097f5
MISC metadata.xml 393 BLAKE2B 24133518bbc568fc7861bb255fcd6ebb34d8ed24912889ac7df4f0517f34fcb281a3eff0c75d5a285891f820956b680270b42cdb1f5cf7a417f43241b46d392f SHA512 7b5f6f0ea16f60fb9b05d9a27701b56e80b62c8e9d1fbf05ecc75015f51dc010f53546661013ec36831051985360e21fb374bc8b5006ecc14f707f9b715fe745
diff --git a/app-arch/ncompress/ncompress-5.0.ebuild b/app-arch/ncompress/ncompress-5.0.ebuild
index b7f993e7128d..dacdcbd8a783 100644
--- a/app-arch/ncompress/ncompress-5.0.ebuild
+++ b/app-arch/ncompress/ncompress-5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
src_prepare() {
diff --git a/app-arch/plzip/Manifest b/app-arch/plzip/Manifest
index c03415f73166..e2bf59db5f5f 100644
--- a/app-arch/plzip/Manifest
+++ b/app-arch/plzip/Manifest
@@ -1,6 +1,6 @@
DIST plzip-1.10.tar.gz 94541 BLAKE2B deb49345ba3d6b120086aa8646f5684a32e6b64453f2ffc6321011dfd0741ddacca919bb11cba9435a26ea6aa63f453e7c5ff9a7dc7dc38c8ed0c6841237aeef SHA512 7fd7ec288800950deaec9337b3112db72cde059721a0143a091650fc20ba2a3d9d7eebbd7a312e5bbb1a61ca6c902d2450e6c3c7172dccf9c0c8b86db7c2a944
DIST plzip-1.10.tar.gz.sig 72 BLAKE2B d3d40c1f3618750b375f862ece19badbbe762ea3b704ed346b8779d86b0fd1a881f48910222664a121360c2e7da42b31ab950ecfb01724ab91a60bac2694d705 SHA512 c4be15ee893cce47150f4da5bdb84d6e20ed9c84367508911de2673614e0df182a9e82d1e0be8967ec1e180f1e9be38be976b099fb5428c4df1567cb9bf54ecc
DIST plzip-1.9.tar.gz 93312 BLAKE2B a5b9a81cfffa17eca9a4cf4d6b037ad943235022142bd053ec8bcfc4dd99b2b730d69332fa54187ba7704266666efde52d23e13f91c290b9cddb96a87023173e SHA512 3bca603ba6337462bde3967e7c7a7e66287f3a71adf8db987429fcdcb06ebbb90b52e666a7f98ac699bc158cbda21a9cce02490131d33fc44171b84ebb3a4a19
-EBUILD plzip-1.10.ebuild 890 BLAKE2B 42b30f49fc6ec8d26336353f00a04da83e129ec8f7dd0b4df572a932a46a092053bc25509fd954bcbb463e17cf4949c09e8d6fa2e52283bf5ecc79f8a198d18d SHA512 3996a701275d4e20812738d3c806a73d4ddcca009c30821ffab3eaa8b5c110b2ff55464b5c89bb293d13448e9abbd15f47254c7922c82cc77746b06815a47f1c
+EBUILD plzip-1.10.ebuild 897 BLAKE2B 5e25097d778d9852f1ae1880c10d436f98a49fa7996b97ac52a73dab7384dff489fcb271800bf94488fe60d0fdf46227292065de5cf9a443522d398cda4a7adc SHA512 e9e4dadae2f0bf9202997865e279b90c907d958969751b0e5192391a5ff0eb41372622d06265825305156dfb39d3d34f6558887f36d19082899cb32e8603e01a
EBUILD plzip-1.9.ebuild 642 BLAKE2B 6027697197ff5732ff2be7fa61187d1f7261f878ea94df0438d1a09f2e16c7e970a1e6a66d520246132289b73245807706cd57cf38bd1c191be19e8c788ae9eb SHA512 ca0bbf2fe5ea6ddaa3a5cf1a9c8f53e950076b42efe743db016a5435cd11b5c9dace5308e8ed181c527c43ac24378bb972574de982c478d519a2fc0295ba354d
MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/plzip/plzip-1.10.ebuild b/app-arch/plzip/plzip-1.10.ebuild
index 55ac23ad823f..a3ea67ff918e 100644
--- a/app-arch/plzip/plzip-1.10.ebuild
+++ b/app-arch/plzip/plzip-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~x86"
RDEPEND="app-arch/lzlib:0="
DEPEND="${RDEPEND}"
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index e35c3fcedc49..330fa107f9c2 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/ramspeed/Manifest b/app-benchmarks/ramspeed/Manifest
index 77c70196121d..8ba31c214c09 100644
--- a/app-benchmarks/ramspeed/Manifest
+++ b/app-benchmarks/ramspeed/Manifest
@@ -1,3 +1,3 @@
DIST ramsmp-3.5.0.tar.gz 79481 BLAKE2B 2bc3e12bf9e33c1a696743d8efa4a80ddcc2503dde2574a51a78d7f8927cbea08837be8a9ca0f9fc66865db5879785f86715afdc4c096aff326c9a462eab45c0 SHA512 175cd2e568e4efdb1225e3c5319950376c4834633dd618324cf4268c762213733ed67ea94b4e5835b0259483e88afd2e9d9a3fde63515b8b25e5ec0b51f16b0e
-EBUILD ramspeed-3.5.0-r2.ebuild 1349 BLAKE2B 6cb6931f60672f7d69fff803fa1d3320266c079a0d009146ea097d4814e7eca5c595ca00c5d88cfb07e32dddba0b3b9a2ce877e0565ce603078a8bd4c327605d SHA512 638c48648541155a77a151c7abd3b3e3e4a7b788744586268e6012efd73f55d23cc1d46c5daf462ba4ea587b5858399796c7869d9e19900f64fc677a69a3916f
+EBUILD ramspeed-3.5.0-r2.ebuild 1350 BLAKE2B 4dab1bb9ef37cda0564ca7e459138dcadf9752766744811b5d003f5142fc65deb48a2f7d21a0bc59b4a1b3964dca6009a92c98ae948b9eb615b79c48a5f3e36b SHA512 4b9c08ea9896726977b513e91ecfc975fa16b1f44703c26b683aba9476a63dd9d5a87ee628b788a871604ddcf91cc7ffe1e43f4c1bfd05a1c9bb3f786bed385c
MISC metadata.xml 273 BLAKE2B d25700d58579a0d8313bf6d7118c9dc4684280545965e8aaa60e1df5cf845825f691ba75bea475c1f3a9b42afbb767798062b6596e204d42a83a5cfc99e6f14a SHA512 184bae98754386b9136c20ad95f3beb518a265466cbc221bf0d96e54a88cc2dffdf55e0da45fe996cd7d9bb5e9bf67ad80c08286d025a864b1e43d99d2a8d672
diff --git a/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild b/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
index 049935400795..f7235482bd87 100644
--- a/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
+++ b/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
@@ -31,7 +31,7 @@ src_configure() {
append-ldflags -Wl,-z,noexecstack
obj=( ramsmp.o ${arch_prefix}{fltmark,fltmem,intmark,intmem}.o )
- use pic && append-ldflags -nopie
+ use pic && append-ldflags -no-pie
if use amd64; then
sed -i \
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 74c2c75c172a..3691284f5b11 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index c1ab262f66c3..570652869b6a 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1,6 +1,6 @@
AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
-DIST acme.sh-3.0.2.tar.gz 248581 BLAKE2B 13d13a86a904909272c271d52d579065a7c84263ef2169b282b3bf270f33c7a8405aca640724120c08d1f495ea2a39035d46e1ec7f7eecfc093ce4dfa7c33b7d SHA512 6bd40951df02e3eaa1ed0efd8767acb5245e9c26c666ec7087db2cd0a38b65ea3c79ade98be954b4fbde0e89b6a988ac1c85ce2a6bd77b33574fb3fc0266ea03
-EBUILD acme-sh-3.0.2-r1.ebuild 1176 BLAKE2B a3556e98d9a7fda0b106568bd941e0fd47b66a1bb30f4849e07e352606f486e00a91dff59ed52e93bdaf92495795c37aa7d9b4770183bf06b8acb45f7e612196 SHA512 d27105ac59311219987d5fccd61a48e5090d79bf12880fe036a282da5be270c6a48193271fd7087a469de42fffa0481f307938abc09b656807bc6b63ef8bfb4a
+DIST acme.sh-3.0.3.tar.gz 253111 BLAKE2B 43b97b033e5e16412e8a958966077ba6b26c49b17206cda5af848b7f9fbf8a8f8bc406b63a13f792dfa93ff7b0759da03a0f599c43f92d25587b582feb59a3cf SHA512 b26f20422a3b40d6c1acbdd52d41124962975313f4187cf918746ad9dc047600a92e529cd1e66ede5b456e253522920b574cb614f455dd73aac707a18f34ad35
+EBUILD acme-sh-3.0.3.ebuild 1176 BLAKE2B a3556e98d9a7fda0b106568bd941e0fd47b66a1bb30f4849e07e352606f486e00a91dff59ed52e93bdaf92495795c37aa7d9b4770183bf06b8acb45f7e612196 SHA512 d27105ac59311219987d5fccd61a48e5090d79bf12880fe036a282da5be270c6a48193271fd7087a469de42fffa0481f307938abc09b656807bc6b63ef8bfb4a
EBUILD acme-sh-9999.ebuild 1068 BLAKE2B 247f340859f63dbcc5827f0b9ca531913eaec3685180d86622e027f6984e9544e0dff7450c48770325fa49b94600bdfd1bcee03b8a5ab322b8160b700186f980 SHA512 9af2ba31be6a19e89d9ee34a9f444f752743dd8284b165c7d91c051c745b136b92416c576c6d73ef1fbe460893ac399ef4cfdd1aa70ff752281e6fba1bb2ac14
MISC metadata.xml 677 BLAKE2B 783e74dfc78dc11568fe72316c5bd100d18fd5c90987d9c21386930f98713d6be5de74d395ed919a8dd7986f0bada50d16c24a670ba856318d103b186a514046 SHA512 6a34e252d900761bc12fe5b1f8d8b8277fded6685f8495a307de4906a19d797f2a4eb9b84676ae1f5f43720c092e3f3d081ec243dff19efa626d4d538974efc1
diff --git a/app-crypt/acme-sh/acme-sh-3.0.2-r1.ebuild b/app-crypt/acme-sh/acme-sh-3.0.3.ebuild
similarity index 100%
rename from app-crypt/acme-sh/acme-sh-3.0.2-r1.ebuild
rename to app-crypt/acme-sh/acme-sh-3.0.3.ebuild
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 63522adaa4d0..acac90f30fe0 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,3 +1,3 @@
DIST argon2-20190702.tar.gz 1505307 BLAKE2B fa9c3dde7b39c8d797a3d6b52992ebfe35f5eba1c7d7b3aa02c440edc36a3f5186cacee2e39e27ed7c6356dc1970dac0e8198d6f2065eb63ff77f9dfb2937cf8 SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f
-EBUILD argon2-20190702-r1.ebuild 1363 BLAKE2B 49cf923442a666901226ab667275dd0037430cf7c6e2ba32596d43cb6a0277f024feeaaab58ef5baf89399cbe4bebf59772a840eedd0afe8f1bd2c2faaaef546 SHA512 447c0603229045d479a95451105b72b370d01f1bcc9afc6ade6b1e124bf1ccd1cd72471ff75429d4ce1c3f361795088c2259726d3020d8d94f5ec46112564be9
+EBUILD argon2-20190702-r1.ebuild 1370 BLAKE2B f48159ebdfc179378bbb9bc8f61c33a0e00cdd9ba50b2d3df3c4aa3e5b7876c0e5940b137dc2090e15455f86ba4d297d5a8bc8e5be903b4fc4b007e8aaef0177 SHA512 331201bf0ef489c383e28529a0d058d0e9a3bf1cb5e82ed57dcd12af15b2f59afa7380e6fa59db204f4e069963c148fe973b5a596f1ee806d15b8ecb308705ca
MISC metadata.xml 669 BLAKE2B a29e9ed5c8f1d6a91cefed3273a3e6a81258c44d4653e98cc32c5a92c3b5d7ea88a316795f56c345c18e0cc6166939ae85e05d538c24245c7141e1dc5c644745 SHA512 acf451c558fc2b080d398c8f94f9d0a42b6c15b13bd8020271199f3616774207c820ee3e2d5d3c674b56e2f7de8b8a60bef171c1eab7fc9fe16dd9bfcd9245a8
diff --git a/app-crypt/argon2/argon2-20190702-r1.ebuild b/app-crypt/argon2/argon2-20190702-r1.ebuild
index 1c8889d043d4..c7862036ebec 100644
--- a/app-crypt/argon2/argon2-20190702-r1.ebuild
+++ b/app-crypt/argon2/argon2-20190702-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
LICENSE="|| ( Apache-2.0 CC0-1.0 )"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="static-libs"
S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 8eaefcf7adf5..cfc7f5bce702 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index e623e6c4d173..37f966c22cc2 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -19,6 +19,6 @@ EBUILD vim-8.2.3741.ebuild 10255 BLAKE2B 3ec921f6df09830f772a1838a31438fbd58d62b
EBUILD vim-8.2.3950.ebuild 10263 BLAKE2B 4ea42fe51e86c59171caff73949b034c71ce423d42bd0963793f540f880b99617d81e133e50e023ab8e03859ab5e17d72fa1e8051dd0980cdfc5662258d93a57 SHA512 0cb1212338ec77b2348975477bd0ef195b3a312a2c1bed464d7a6c62f52a1b0cccc95e47d23aa780d9c3a5c580791e5b9689df90d9aa51eeacaa73c8b8ed5fa3
EBUILD vim-8.2.4285.ebuild 10263 BLAKE2B 4ea42fe51e86c59171caff73949b034c71ce423d42bd0963793f540f880b99617d81e133e50e023ab8e03859ab5e17d72fa1e8051dd0980cdfc5662258d93a57 SHA512 0cb1212338ec77b2348975477bd0ef195b3a312a2c1bed464d7a6c62f52a1b0cccc95e47d23aa780d9c3a5c580791e5b9689df90d9aa51eeacaa73c8b8ed5fa3
EBUILD vim-8.2.4328-r1.ebuild 10086 BLAKE2B 64dbea53a7d53118454df67162014d82d4e510e13b1eb4a6335b8ce01da028f25f959138787b390fc72c471f9a353711bae12f832d82be48a73e3f6f5464f16e SHA512 05a2464b7868dbb811d3bb8c0154dd48b8d3114f42a3e61294568f3dd9c547ae7de271cb4322f8bf36daac5be1c28f3c9477b68416181bb25cdb3b162af332b6
-EBUILD vim-8.2.4586.ebuild 10099 BLAKE2B 864816c5ec11a7ec652dc5694abc7806e4a6c0afb2d3f72454c05873639ae462fce8dd9f8717d8c99ebcbf43004463db0f4c550f76c2414d737cfbdff340ab90 SHA512 9314e7eac6c6e7c0fd2aa7714fb3e62dcfd9477c727f57de845adf6d9b6e54cc87dfea8bb3ea1f91df5ee965026721a0da02dee0bd7064f3e96b3480356c12b6
-EBUILD vim-9999.ebuild 10099 BLAKE2B 864816c5ec11a7ec652dc5694abc7806e4a6c0afb2d3f72454c05873639ae462fce8dd9f8717d8c99ebcbf43004463db0f4c550f76c2414d737cfbdff340ab90 SHA512 9314e7eac6c6e7c0fd2aa7714fb3e62dcfd9477c727f57de845adf6d9b6e54cc87dfea8bb3ea1f91df5ee965026721a0da02dee0bd7064f3e96b3480356c12b6
+EBUILD vim-8.2.4586.ebuild 10099 BLAKE2B 4ab25750ea3d261d2f634bae5292156373ba3bea919aa74003ca46e64cc874ecd0be3affbf0063c267853841677c8faaecd9c67482cde983759aedcf37272bdb SHA512 7b48b9fa701e4ebbbc4af8bfcbdbf26983dfd2248188c911a5e71545bcc6454e6f1e9e22fd08978eef0660b9d392648d2ab8301201f3292a9694644ae723b36c
+EBUILD vim-9999.ebuild 10099 BLAKE2B 4ab25750ea3d261d2f634bae5292156373ba3bea919aa74003ca46e64cc874ecd0be3affbf0063c267853841677c8faaecd9c67482cde983759aedcf37272bdb SHA512 7b48b9fa701e4ebbbc4af8bfcbdbf26983dfd2248188c911a5e71545bcc6454e6f1e9e22fd08978eef0660b9d392648d2ab8301201f3292a9694644ae723b36c
MISC metadata.xml 951 BLAKE2B 10b867295bee9174e71d1df8a2a8a251c669fb2415893f2e90e361622520fa6b357a2098cb0184637a6f3078ed1873ed1d38f64be205d941de13040fb9f197e2 SHA512 683a03f6198c53c16874cfd8b50a265460a507afcb1bff104ce8932a9957cd4a3cc0cd6d0e494ea0757645162994c55a792d282fd6ad1278dd10659804d2f54c
diff --git a/app-editors/vim/vim-8.2.4586.ebuild b/app-editors/vim/vim-8.2.4586.ebuild
index ad075b05bd24..62ce11b27b08 100644
--- a/app-editors/vim/vim-8.2.4586.ebuild
+++ b/app-editors/vim/vim-8.2.4586.ebuild
@@ -7,7 +7,7 @@ EAPI=7
VIM_VERSION="8.2"
LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+)"
USE_RUBY="ruby24 ruby25 ruby26 ruby27"
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index ad075b05bd24..62ce11b27b08 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=7
VIM_VERSION="8.2"
LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+)"
USE_RUBY="ruby24 ruby25 ruby26 ruby27"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7759fac41aa3..70a291f3e56e 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index ae94282af6a1..5a0c68a7bbdc 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -25,15 +25,12 @@ DIST edk2-a3741780fe3535e19e02efa869a7cac481891129.tar.gz 12886279 BLAKE2B 2054b
DIST ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz 3962725 BLAKE2B a8084abaf93a4ab06ba170427a66dab08e68ba1288f42ea744e2cbc66d6bd2294bee82f6d0994260d2cd60daf6a6068e40eb74fdeba2bccaa432d090d81fd9db SHA512 4ac1d07ce879a3a8c6c260380258c37f5e4ecddc880b27fb59afc38fbf3718e81b04a4dda2b58fe7a438a23175e00b6179fc067acbc4a75e33d93c4b85ff5d68
DIST ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz 3931642 BLAKE2B bf0b5d9ea1d44803bc5c4aa0bf9188636e292b226ab759f32e3c2bfa3f80dd3f546526b9a11c1f67193793ede5309bfa67bdce80aba62ccca54597dc6e7e4ba4 SHA512 0a63f83c9135d05c6bfe7c4d12da3ff76271e35305a4d5654bd5aefa9ee59f5363546c65820c42133deb0fb5a0a0bcaa9b1c48396f9f996acea0d492a5f03f33
DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
-DIST xen-4.15.1-upstream-patches-1.tar.xz 15476 BLAKE2B 9f0cf8f3dd993e32939ff1ee35244224bd3d16fbd345500ff01e51eb5828d3e44bddc539462c39d8c37b6497d4bf8887261a8df5d31b17b413b0c21f7faf3a84 SHA512 aac3f91c3c753aa8430abad055252cba5dbdfd9e548f219df1452388ef2f82b65c428755363aa0645824431e812f3b799af4f9468669e42a0f5b6b8874397c75
-DIST xen-4.15.1.tar.gz 40800852 BLAKE2B 39475ea33f029fb0e84b82b4a2b13fd613bab01e3ef6c241dfede3d190ee9be53c99b62121d37d83b1e078764b3e4d88d1dfb99be1b5623691e56519850c6798 SHA512 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9
DIST xen-4.15.2-upstream-patches-2.tar.xz 93208 BLAKE2B 5b01953ba93551830e533cf7e9e8675a44ed6c2ad3da152e0b5feeb3782b9bc3a1a0a7c0a84ac1de8ed7146fcf364db7604ea269ee243438df34c91b4b6acc5b SHA512 c2f585223d3d9e08d08b295c0f35e4856e4801d214cf0a1f925585c28a7a25cb3b82a5f5e7d41d35b2c746d5a307cd5b5a369d5342f35681e227d8ce91e741c2
DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
DIST xen-4.16.0-upstream-patches-2.tar.xz 111668 BLAKE2B e8bbedb7cc50f7a6cb1a3869f0165cce3d02c33f04b935384e770aa5206e6aa6cb51329c5d69375391a8781ba23f20c35e06406d5164720d253b405a77f5aee9 SHA512 6b6770117e81ae407e3ded0e366b14f3fa2411cc93a95187db27548c3dd17a1f85e60fc3971b008693297ad97aa0c5fa7b4d88e01d67a972f39e51bf0a2cf39d
DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 7e16a93b3f1131e2b10307fabc10641a9c5983173155b9a35eaf6ff317b6a747bccf6b8c87c06686830acc2c4bd3e19e5867eb443eabac9a1e4ee59124dfa87f SHA512 2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87
DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49
DIST xen-gentoo-patches-24.tar.xz 20952 BLAKE2B 292ea384f007a9615ca840068c45cd0e37a63a59e596c9c87a278a0136805327c85f5e5576eac751e40bda616559e413b396d313d43f2d36d904f09a41b0d302 SHA512 26b7344cea40ef44d1eaec330465071c96ee27a5b0ca91f787fc80c6801abed47cab9050a40ef80f20471a7cd9ee0dc7aaa46b16e5af7d0e50643ccc7d3a828b
-EBUILD xen-tools-4.15.1-r2.ebuild 17876 BLAKE2B 23701eb4b49ed4a301a24f7e72c2f83dcab77352b9e3fc84c93d5285e3e204504ad857a67c07993647f702e3c9153d757579ee77708bf7dbd7d6a1cb989d4ff8 SHA512 c0cab92f2cfe387ae0d936a839dec9c89cb629fec63e5b2da26ec5a2159b211c3dbd303cd665d0f3813b65c5a7c9fb0800bf3170ecde16aa06a80c86ac57c0d4
EBUILD xen-tools-4.15.2-r2.ebuild 17828 BLAKE2B dd49a8492b9b2b27eaea3702aba04d663a8f4eb052e4d92f34b8ffd3165ef23d6d20b024a5894ac5ff9555cecb0efacb785d6a70a9393c564862e1e8a3b7e267 SHA512 1955d40d91295250d173568c80dea737c082e17c4e90e5c980158fea90384b6705cca5911207d23da67b9eed6779f8a558e848322b495dbb42e1b0ae890f9884
EBUILD xen-tools-4.16.0-r4.ebuild 17858 BLAKE2B 29aa48088088a99eb76c5f82e3342dc058d9641329a51e7fda8196304d8674d7e2b9f91a41ebb8ae4fd456872b44a8ddeef5cf65d62021d3ba193107acffbba1 SHA512 fc746a9ae4afe2dd3ff93445b45271c3917726797bee3b5abb665810af525a19e376eac8a4e631caa3f25370dfa98ace9aab7c5c09a9d05c150fb7cad8c5d733
MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/xen-tools-4.15.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.15.1-r2.ebuild
deleted file mode 100644
index 746c16ee9f20..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.15.1-r2.ebuild
+++ /dev/null
@@ -1,556 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE='ncurses,xml,threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- REPO="xen.git"
- EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
- S="${WORKDIR}/${REPO}"
-else
- KEYWORDS="amd64 ~arm ~arm64 x86"
- UPSTREAM_VER=1
- SECURITY_VER=
- # xen-tools's gentoo patches tarball
- GENTOO_VER=23
- # xen-tools's gentoo patches version which apply to this specific ebuild
- GENTOO_GPV=0
- # xen-tools ovmf's patches
- OVMF_VER=
-
- SEABIOS_VER="1.14.0"
- EDK2_COMMIT="a3741780fe3535e19e02efa869a7cac481891129"
- EDK2_OPENSSL_VERSION="1_1_1j"
- EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
- EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
- IPXE_COMMIT="988d2c13cdf0f0b4140685af35ced70ac5b3283c"
-
- [[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
- [[ -n ${SECURITY_VER} ]] && \
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
- [[ -n ${GENTOO_VER} ]] && \
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
- [[ -n ${OVMF_VER} ]] && \
- OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
- https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
- ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
- ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
- https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
- https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
- https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
- ${OVMF_PATCHSET_URI} )
- ${UPSTREAM_PATCHSET_URI}
- ${SECURITY_PATCHSET_URI}
- ${GENTOO_PATCHSET_URI}"
-
- S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://xenproject.org"
-DOCS=( README )
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ipxe? ( rombios )
- ovmf? ( hvm )
- pygrub? ( python )
- rombios? ( hvm )
- system-ipxe? ( rombios )
- ?? ( ipxe system-ipxe )
- ?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
- sys-apps/pciutils
- dev-libs/lzo:2
- dev-libs/glib:2
- dev-libs/yajl
- dev-libs/libaio
- dev-libs/libgcrypt:0
- sys-libs/zlib
- ${PYTHON_DEPS}
-"
-
-RDEPEND="${COMMON_DEPEND}
- sys-apps/iproute2[-minimal]
- net-misc/bridge-utils
- screen? (
- app-misc/screen
- app-admin/logrotate
- )
- selinux? ( sec-policy/selinux-xen )"
-
-DEPEND="${COMMON_DEPEND}
- app-misc/pax-utils
- >=sys-kernel/linux-headers-4.11
- x11-libs/pixman
- $(python_gen_cond_dep '
- dev-python/lxml[${PYTHON_USEDEP}]
- pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
- ')
- x86? ( sys-devel/dev86
- system-ipxe? ( sys-firmware/ipxe[qemu] )
- sys-power/iasl )
- api? ( dev-libs/libxml2
- net-misc/curl )
-
- ovmf? (
- !arm? ( !arm64? ( dev-lang/nasm ) )
- $(python_gen_impl_dep sqlite)
- )
- !amd64? ( >=sys-apps/dtc-1.4.0 )
- amd64? ( sys-power/iasl
- system-seabios? ( sys-firmware/seabios )
- system-ipxe? ( sys-firmware/ipxe[qemu] )
- rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
- doc? (
- app-text/ghostscript-gpl
- app-text/pandoc
- $(python_gen_cond_dep '
- dev-python/markdown[${PYTHON_USEDEP}]
- ')
- dev-texlive/texlive-latexextra
- media-gfx/transfig
- )
- hvm? ( x11-base/xorg-proto )
- qemu? (
- app-arch/snappy:=
- sdl? (
- media-libs/libsdl[X]
- media-libs/libsdl2[X]
- )
- )
- system-qemu? ( app-emulation/qemu[xen] )
- ocaml? ( dev-ml/findlib
- dev-lang/ocaml[ocamlopt] )
- python? ( >=dev-lang/swig-4.0.0 )"
-
-BDEPEND="dev-lang/perl
- sys-devel/bison
- sys-devel/gettext"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
- usr/libexec/xen/boot/hvmloader
- usr/libexec/xen/boot/xen-shim
- usr/share/qemu-xen/qemu/hppa-firmware.img
- usr/share/qemu-xen/qemu/s390-ccw.img
- usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
- usr/libexec/xen/bin/elf2dmp
- usr/libexec/xen/bin/ivshmem-client
- usr/libexec/xen/bin/ivshmem-server
- usr/libexec/xen/bin/qemu-edid
- usr/libexec/xen/bin/qemu-img
- usr/libexec/xen/bin/qemu-io
- usr/libexec/xen/bin/qemu-keymap
- usr/libexec/xen/bin/qemu-nbd
- usr/libexec/xen/bin/qemu-pr-helper
- usr/libexec/xen/bin/qemu-storage-daemon
- usr/libexec/xen/bin/qemu-system-i386
- usr/libexec/xen/bin/virtfs-proxy-helper
- usr/libexec/xen/boot/xen-shim
- usr/libexec/xen/libexec/qemu-pr-helper
- usr/libexec/xen/libexec/virtfs-proxy-helper
- usr/libexec/xen/libexec/virtiofsd
- usr/libexec/xen/libexec/xen-bridge-helper
- usr/share/qemu-xen/qemu/s390-ccw.img
- usr/share/qemu-xen/qemu/s390-netboot.img
- usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-4.15.0-fix-xenstat-python-bindings.patch" )
-
-pkg_setup() {
- python_setup
- export "CONFIG_LOMOUNT=y"
-
- #bug 522642, disable compile tools/tests
- export "CONFIG_TESTS=n"
-
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then
- if use x86 && use amd64; then
- die "Confusion! Both x86 and amd64 are set in your use flags!"
- elif use x86; then
- export XEN_TARGET_ARCH="x86_32"
- elif use amd64 ; then
- export XEN_TARGET_ARCH="x86_64"
- elif use arm; then
- export XEN_TARGET_ARCH="arm32"
- elif use arm64; then
- export XEN_TARGET_ARCH="arm64"
- else
- die "Unsupported architecture!"
- fi
- fi
-}
-
-src_prepare() {
- local i
-
- # Upstream's patchset
- if [[ -n ${UPSTREAM_VER} ]]; then
- einfo "Try to apply Xen Upstream patch set"
- eapply "${WORKDIR}"/patches-upstream
- fi
-
- # Security patchset
- if [[ -n ${SECURITY_VER} ]]; then
- einfo "Try to apply Xen Security patch set"
- # apply main xen patches
- # Two parallel systems, both work side by side
- # Over time they may concdense into one. This will suffice for now
- EPATCH_SUFFIX="patch"
- EPATCH_FORCE="yes"
-
- source "${WORKDIR}"/patches-security/${PV}.conf || die
-
- for i in ${XEN_SECURITY_MAIN}; do
- eapply "${WORKDIR}"/patches-security/xen/$i
- done
-
- # apply qemu-xen/upstream patches
- pushd "${S}"/tools/qemu-xen/ > /dev/null
- for i in ${XEN_SECURITY_QEMUU}; do
- eapply "${WORKDIR}"/patches-security/qemuu/$i
- done
- popd > /dev/null
-
- # apply qemu-traditional patches
- pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
- for i in ${XEN_SECURITY_QEMUT}; do
- eapply "${WORKDIR}"/patches-security/qemut/$i
- done
- popd > /dev/null
- fi
-
- # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
- mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
- pushd tools/firmware/ > /dev/null
- ln -s seabios-dir-remote seabios-dir || die
- popd > /dev/null
-
- # Gentoo's patchset
- if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
- einfo "Try to apply Gentoo specific patch set"
- source "${FILESDIR}"/gentoo-patches.conf || die
- _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
- for i in ${!_gpv}; do
- eapply "${WORKDIR}"/patches-gentoo/$i
- done
- fi
-
- # Ovmf's patchset
- if use ovmf; then
- if [[ -n ${OVMF_VER} ]];then
- einfo "Try to apply Ovmf patch set"
- pushd "${WORKDIR}"/edk2-*/ > /dev/null
- eapply "${WORKDIR}"/patches-ovmf
- popd > /dev/null
- fi
- mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
- rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
- rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
- rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
- rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
- mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
- mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
- cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
- cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
- cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-
- # Bug #816987
- pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
- eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
- popd > /dev/null
-
- pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
- eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
- popd > /dev/null
-
- pushd tools/firmware/ovmf-dir-remote > /dev/null
- eapply "${FILESDIR}/${PN}-4.15.1-edk2-python3.9.patch"
- popd > /dev/null
- fi
-
- # Fix building with ocaml 4.12 #818100
- eapply "${FILESDIR}/${PN}-4.15.1-ocaml-4.12.patch"
-
- # ipxe
- if use ipxe; then
- cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
-
- # gcc 11
- cp "${WORKDIR}/patches-gentoo/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
- echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
- fi
-
- mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
- # Fix texi2html build error with new texi2html, qemu.doc.html
- sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
- use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
- -i tools/firmware/Makefile || die
-
- # Drop .config, fixes to gcc-4.6
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
-
- # drop flags
- unset CFLAGS
- unset LDFLAGS
- unset ASFLAGS
- unset CPPFLAGS
-
- if ! use pygrub; then
- sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
- fi
-
- if ! use python; then
- sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
- fi
-
- if ! use hvm; then
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
- # Bug 351648
- elif ! use x86 && ! has x86 $(get_all_abis); then
- mkdir -p "${WORKDIR}"/extra-headers/gnu || die
- touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
- export CPATH="${WORKDIR}"/extra-headers
- fi
-
- if use qemu; then
- if use sdl; then
- sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
- tools/Makefile || die
- else
- sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
- tools/qemu-xen-traditional/xen-setup || die
- sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
- tools/Makefile || die
- fi
- else
- # Don't bother with qemu, only needed for fully virtualised guests
- sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
- fi
-
- # Reset bash completion dir; Bug 472438
- sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
- -i Config.mk || die
-
- # xencommons, Bug #492332, sed lighter weight than patching
- sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
- -i tools/hotplug/Linux/init.d/xencommons.in || die
-
- # fix bashishm
- sed -e '/Usage/s/\$//g' \
- -i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
- # respect multilib, usr/lib/libcacard.so.0.0.0
- sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
- -i tools/qemu-xen/configure || die
-
- #bug 518136, don't build 32bit exactuable for nomultilib profile
- if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
- sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
- fi
-
- # uncomment lines in xl.conf
- sed -e 's:^#autoballoon=:autoballoon=:' \
- -e 's:^#lockfile=:lockfile=:' \
- -e 's:^#vif.default.script=:vif.default.script=:' \
- -i tools/examples/xl.conf || die
-
- # disable capstone (Bug #673474)
- sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
- -i tools/Makefile || die
-
- # disable glusterfs
- sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
- -i tools/Makefile || die
-
- # disable jpeg automagic
- sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
- -i tools/Makefile || die
-
- # disable png automagic
- sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
- -i tools/Makefile || die
-
- # disable docker (Bug #732970)
- sed -e "s:\$\$source/configure:\0 --disable-containers:" \
- -i tools/Makefile || die
-
- # disable abi-dumper (Bug #791172)
- sed -e 's/$(ABI_DUMPER) /echo /g' \
- -i tools/libs/libs.mk || die
-
- default
-}
-
-src_configure() {
- local myconf="--prefix=${PREFIX}/usr \
- --libdir=${PREFIX}/usr/$(get_libdir) \
- --libexecdir=${PREFIX}/usr/libexec \
- --localstatedir=${EPREFIX}/var \
- --disable-golang \
- --disable-werror \
- --disable-xen \
- --enable-tools \
- --enable-docs \
- $(use_enable api xenapi) \
- $(use_enable ipxe) \
- $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
- $(use_enable ocaml ocamltools) \
- $(use_enable ovmf) \
- $(use_enable pam) \
- $(use_enable rombios) \
- --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
- "
-
- use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
- use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
- use amd64 && myconf+=" $(use_enable qemu-traditional)"
- tc-ld-disable-gold # Bug 669570
- econf ${myconf}
-}
-
-src_compile() {
- local myopt
- use debug && myopt="${myopt} debug=y"
- use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
- if test-flag-CC -fno-strict-overflow; then
- append-flags -fno-strict-overflow
- fi
-
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
- if use doc; then
- emake -C docs build
- else
- emake -C docs man-pages
- fi
-}
-
-src_install() {
- # Override auto-detection in the build system, bug #382573
- export INITD_DIR=/tmp/init.d
- export CONFIG_LEAF_DIR=../tmp/default
-
- # Let the build system compile installed Python modules.
- local PYTHONDONTWRITEBYTECODE
- export PYTHONDONTWRITEBYTECODE
-
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
- XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
- # Created at runtime
- rm -rv "${ED}/var/run" || die
-
- # Fix the remaining Python shebangs.
- python_fix_shebang "${D}"
-
- # Remove RedHat-specific stuff
- rm -rf "${D}"/tmp || die
-
- if use doc; then
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
- dodoc -r docs/{pdf,txt}
- else
- emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
- fi
- dodoc ${DOCS[@]}
-
- newconfd "${FILESDIR}"/xendomains.confd xendomains
- newconfd "${FILESDIR}"/xenstored.confd xenstored
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
- newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
- newinitd "${FILESDIR}"/xencommons.initd xencommons
- newconfd "${FILESDIR}"/xencommons.confd xencommons
- newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
- newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
- newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
- if use screen; then
- cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
- cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
- keepdir /var/log/xen-consoles
- fi
-
- # For -static-libs wrt Bug 384355
- if ! use static-libs; then
- rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
- fi
-
- # for xendomains
- keepdir /etc/xen/auto
-
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
- keepdir /var/lib/xen/dump
- keepdir /var/lib/xen/xenpaging
- keepdir /var/lib/xenstored
- keepdir /var/log/xen
-
- if use python; then
- python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
- python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
- fi
-
- python_optimize
-}
-
-pkg_postinst() {
- elog "Official Xen Guide and the offical wiki page:"
- elog "https://wiki.gentoo.org/wiki/Xen"
- elog "https://wiki.xen.org/wiki/Main_Page"
- elog ""
- elog "Recommended to utilise the xencommons script to config system at boot"
- elog "Add by use of rc-update on completion of the install"
-
- if ! use hvm; then
- echo
- elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
- elog "support enable the hvm use flag."
- elog "An x86 or amd64 system is required to build HVM support."
- fi
-
- if use qemu; then
- elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
- elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
- elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
- elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
- fi
-}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 6c19a645d622..208535f5abb1 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -2,13 +2,10 @@ AUX xen-4.15-efi.patch 2181 BLAKE2B a06b944dea37c3dfdbe4344191ec4a286348f46bcccf
AUX xen-4.15-flask.patch 400 BLAKE2B 68ee04b8b0923cbe7e2b93b834a23b465c9c8e63ae41bea98c8b4bce4ff59374534294b8c5cd5be30ea64d7c66caec54de0bc1bf70d80275d027b3a082ec2003 SHA512 146c6a161d3def5ab947264d6ac5932066f3124e25be14185ebd75eaa18932adcf35daf21edd051861cacd28b950b6a3ee5c5ac335ccc1d0e27b3242da5c4441
AUX xen-4.16-efi.patch 696 BLAKE2B 2bc3db7286d7ea24c762e914012c71d3fe6dc4d8c47551c9c88282d67d896917c04456c607c155d8340d0b264a34830091309a1a28417dbfc585f26a9fc692ad SHA512 0c1f594ae6321af190cc205d2ebb8afbca53c2897302b630a6f0eee9ce43f591483c96cc4f8b8be5db78ee11451c724882e50bb4226359e784bbda520b090524
AUX xen-4.16-no-symlink.patch 1044 BLAKE2B 3f5cb93403e3cd606a5eabb8b0e7facb3c95ae7f805c4bfa0e5a357342b845f6f260915f9eac46573bd9813fa602702df6254ad4b946fccb32cfea7514cc86b3 SHA512 0d1a8c8dbfdd57dac6d9732afcf4d0da1746ecbfa06689eb343b3d54167a784c9b9b65555f4cabd8f30a97692c511ee16c7787cdc3d335f7e39c2e3f8fc86ccf
-DIST xen-4.15.1-upstream-patches-3.tar.xz 49644 BLAKE2B 261d45d726ba9b06a817fd4f4e9d2a83e516cd637f73dff50ccb9b046d562e14bee47fc64795c0406947fb06988679047a19e5851482fbf85701bcc495225258 SHA512 8d8b7e42f9a401f6d3a7cb87b980714aa14dadbeadb3a26f495b6a1892d1a04de244490255b589952f565d0a0b8c69fd527c0168d40e974e0f77cecda25e7cb3
-DIST xen-4.15.1.tar.gz 40800852 BLAKE2B 39475ea33f029fb0e84b82b4a2b13fd613bab01e3ef6c241dfede3d190ee9be53c99b62121d37d83b1e078764b3e4d88d1dfb99be1b5623691e56519850c6798 SHA512 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9
DIST xen-4.15.2-upstream-patches-2.tar.xz 93208 BLAKE2B 5b01953ba93551830e533cf7e9e8675a44ed6c2ad3da152e0b5feeb3782b9bc3a1a0a7c0a84ac1de8ed7146fcf364db7604ea269ee243438df34c91b4b6acc5b SHA512 c2f585223d3d9e08d08b295c0f35e4856e4801d214cf0a1f925585c28a7a25cb3b82a5f5e7d41d35b2c746d5a307cd5b5a369d5342f35681e227d8ce91e741c2
DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
DIST xen-4.16.0-upstream-patches-2.tar.xz 111668 BLAKE2B e8bbedb7cc50f7a6cb1a3869f0165cce3d02c33f04b935384e770aa5206e6aa6cb51329c5d69375391a8781ba23f20c35e06406d5164720d253b405a77f5aee9 SHA512 6b6770117e81ae407e3ded0e366b14f3fa2411cc93a95187db27548c3dd17a1f85e60fc3971b008693297ad97aa0c5fa7b4d88e01d67a972f39e51bf0a2cf39d
DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 7e16a93b3f1131e2b10307fabc10641a9c5983173155b9a35eaf6ff317b6a747bccf6b8c87c06686830acc2c4bd3e19e5867eb443eabac9a1e4ee59124dfa87f SHA512 2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87
-EBUILD xen-4.15.1-r3.ebuild 4404 BLAKE2B adf44a62bf582e312583fc9bb5b2255fd11499b4aeb9e548cb761fdd5ca4e4fce90c5afdb5177c95dba3eaafcbeddcaeede01211aca2fb0db939db9060ef43e9 SHA512 1fab9205124be3aaaa686bb70a393dc0383969b61ff47e7db783717efdbac1aa800e9ced1cb29361be8becfbefc7e4f958e2abd21f9e24c09500d0db521ba6fd
EBUILD xen-4.15.2-r2.ebuild 4405 BLAKE2B 0090bf96c539f0ec10bdded08f4a67d5413bfed25e9f85b68c65e7c49bd4c220d493b45800b3515c81c8bde3670a29cc34a6d079b9429ade6ed69e0ee47ad0c8 SHA512 355a160d6326367eb12ca7c0492b324e35d8b635e295e5a8b0c431ca44bdded9e7c2160592fdc4327ad1473a593d03f9e6d71e80ddc2734aa9ed87b6319da6d3
EBUILD xen-4.16.0-r7.ebuild 4813 BLAKE2B dc3dc467d2a41c3fb5a353c4727a40e2213871aa93391453d3eeda82ed86ecfc15a10bcecdf9bd355494f1dbb1853643120c31ed0b9dc423efc1561b66ee5c6f SHA512 591cbf54d0261347f373c9c0b1de743cc17199ef2cdb236f62f1d7ef5653593e4a5f443144b0a3379e2dc2d6499fd90db990133e973d63d96c7aaf052fa64730
MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/xen-4.15.1-r3.ebuild b/app-emulation/xen/xen-4.15.1-r3.ebuild
deleted file mode 100644
index e5e433b4879a..000000000000
--- a/app-emulation/xen/xen-4.15.1-r3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
- SRC_URI=""
-else
- KEYWORDS="amd64 ~arm -x86"
- UPSTREAM_VER=3
- SECURITY_VER=
- GENTOO_VER=
-
- [[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
- https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
- [[ -n ${SECURITY_VER} ]] && \
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
- [[ -n ${GENTOO_VER} ]] && \
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
- SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
- ${UPSTREAM_PATCHSET_URI}
- ${SECURITY_PATCHSET_URI}
- ${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
- efi? ( >=sys-devel/binutils-2.22[multitarget] )
- !efi? ( >=sys-devel/binutils-2.22 )
- flask? ( sys-apps/checkpolicy )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python-any-r1_pkg_setup
- if [[ -z ${XEN_TARGET_ARCH} ]]; then
- if use amd64; then
- export XEN_TARGET_ARCH="x86_64"
- elif use arm; then
- export XEN_TARGET_ARCH="arm32"
- elif use arm64; then
- export XEN_TARGET_ARCH="arm64"
- else
- die "Unsupported architecture!"
- fi
- fi
-}
-
-src_prepare() {
- # Upstream's patchset
- [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
- # Security patchset
- if [[ -n ${SECURITY_VER} ]]; then
- einfo "Try to apply Xen Security patch set"
- # apply main xen patches
- # Two parallel systems, both work side by side
- # Over time they may concdense into one. This will suffice for now
- source "${WORKDIR}"/patches-security/${PV}.conf
-
- local i
- for i in ${XEN_SECURITY_MAIN}; do
- eapply "${WORKDIR}"/patches-security/xen/$i
- done
- fi
-
- # Gentoo's patchset
- [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
- # Symlinks do not work on fat32 volumes
- eapply "${FILESDIR}"/${PN}-4.15-efi.patch
-
- # Enable XSM-FLASK
- use flask && eapply "${FILESDIR}"/${PN}-4.15-flask.patch
-
- # Workaround new gcc-11 options
- sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
-
- # Drop .config
- sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
-
- if use efi; then
- export EFI_VENDOR="gentoo"
- export EFI_MOUNTPOINT="/boot"
- fi
-
- default
-}
-
-src_configure() {
- use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
- use debug && myopt="${myopt} debug=y"
-
- # remove flags
- unset CFLAGS
- unset LDFLAGS
- unset ASFLAGS
-
- tc-ld-disable-gold # Bug 700374
-}
-
-src_compile() {
- # Send raw LDFLAGS so that --as-needed works
- emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
- local myopt
- use debug && myopt="${myopt} debug=y"
-
- # The 'make install' doesn't 'mkdir -p' the subdirs
- if use efi; then
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
- fi
-
- emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
-
- # make install likes to throw in some extra EFI bits if it built
- use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
- elog "Official Xen Guide:"
- elog " https://wiki.gentoo.org/wiki/Xen"
-
- use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
-
- ewarn
- ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
- ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
- ewarn "to work fine."
- ewarn
- ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
- ewarn
- ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
-}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 51d244def05f..4fcf54851615 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/ceph_exporter/Manifest b/app-metrics/ceph_exporter/Manifest
new file mode 100644
index 000000000000..7ff2d73559ae
--- /dev/null
+++ b/app-metrics/ceph_exporter/Manifest
@@ -0,0 +1,6 @@
+AUX ceph_exporter.confd 48 BLAKE2B 617ddc4f13ee9307f331d0c8de9b9e329786fccc0bbf68211863b61f5a32351a2936972278ef8fe283e0a2cc9ea2ce55d14412cb9777bf88aa9c3a49b3eddfe4 SHA512 bc5be0687671d08d28288d652eae7f699cb406989efa49ccfa38bcf4e8f6ceaf2ca5e2d2a81e5224cfcab7b712b52cca37d5cd0ea2e2b7f49abf8720e217fe00
+AUX ceph_exporter.initd 670 BLAKE2B 57b1ee2932309892f534f363643a93f1e92acf6dc53108d54c9d571574a137e3200440b9b6fce8460ec2c6f7a3b1b4b830be5425b7a76765b1532aa9f8ddf249 SHA512 5014b09cd1cf1ad1e8fa43de16a886b53af43ac011bd94bf517277eb58c4a6739066f5bd7303fd0d9f7fe5b713b5d4305db1dc45916f0677f9f71c0de355b3f7
+DIST ceph_exporter-4.0.1-deps.tar.xz 7402752 BLAKE2B 4619eba4c1630cd683193fec8f449698587dc8d17c26992e033fa7495934de26bcca84fac4ac174e25e7f405c27033fc324703748cac59f90b6e58c2548f8cd2 SHA512 893a6d246c640647ac55f5f32d657cbd80bec3c9404e1484e6188e4e045a20d01d50559723105f179d438019f66d904938a24ce164f85a41631930067d92f7ba
+DIST ceph_exporter-4.0.1.tar.gz 143653 BLAKE2B 2a8c907fb5ff06bc629644aab94b450646f6b25ff057d2b01485f0131cef3e64e3b159f029f29cf78c8d6b450ff9b750858799fe079256509e31e5b8bcf3e012 SHA512 154e75cc397635450d2b99e5e56c829fd5816e9aad95707eff42500ce21fd92a6d12772a58530b580b8e14e5db7c32d2d24f395175f414df9d89fbcbb8239ece
+EBUILD ceph_exporter-4.0.1.ebuild 939 BLAKE2B 575f51efcfa7aa42de719f2ac2c8a1760afc5a2fd13f8cbc79ae2401dcaa78b72887938076b6fa6c8769dd4903d05b81f41585d77be872a3677c512ddc9747d5 SHA512 6797ad6fedb132e3caaf465f47a18411791a8f0c9d40a02cd3860c177a381d543775ac47af01a100052de47ea19aae6f4eee0bf90e3db60993f45f970010cbdd
+MISC metadata.xml 243 BLAKE2B 63665ae2020bc799fa6ebd6e1fca6755be6498803fdbc17cc630f9f4ffa03fbd46a9ad396e70adc3bc1c32b0a746fe4bab1c6291f32e68e636251207bca9e95c SHA512 78eab20831018fcf4957171a83aaaca9ced53380e01f083c07450c30fa1adfc02dd50ff2fa9f491dd62802f6e779264add1c47a09ade0a35cda558c1d5529ad0
diff --git a/app-metrics/ceph_exporter/ceph_exporter-4.0.1.ebuild b/app-metrics/ceph_exporter/ceph_exporter-4.0.1.ebuild
new file mode 100644
index 000000000000..ef1c3479b0c1
--- /dev/null
+++ b/app-metrics/ceph_exporter/ceph_exporter-4.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Prometheus exporter that scrapes metrics from a ceph cluster"
+HOMEPAGE="https://github.com/digitalocean/ceph_exporter"
+SRC_URI="https://github.com/digitalocean/ceph_exporter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ acct-group/ceph
+ acct-user/ceph
+ =sys-cluster/ceph-16*
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-lang/go-1.18"
+
+src_compile() {
+ go build -o bin/ceph_exporter || die
+}
+
+src_install() {
+ dobin bin/ceph_exporter
+ dodoc {README,CONTRIBUTING}.md exporter.yml
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ keepdir /var/lib/ceph_exporter /var/log/ceph_exporter
+ fowners ceph:ceph /var/lib/ceph_exporter /var/log/ceph_exporter
+}
diff --git a/app-metrics/ceph_exporter/files/ceph_exporter.confd b/app-metrics/ceph_exporter/files/ceph_exporter.confd
new file mode 100644
index 000000000000..46da635f4264
--- /dev/null
+++ b/app-metrics/ceph_exporter/files/ceph_exporter.confd
@@ -0,0 +1,2 @@
+# arguments for ceph exporter
+# command_args=""
diff --git a/app-metrics/ceph_exporter/files/ceph_exporter.initd b/app-metrics/ceph_exporter/files/ceph_exporter.initd
new file mode 100644
index 000000000000..59632972d1be
--- /dev/null
+++ b/app-metrics/ceph_exporter/files/ceph_exporter.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus ceph metrics exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-ceph}
+group=${group:-ceph}
+
+command="/usr/bin/ceph_exporter"
+command_background="true"
+output_log="/var/log/ceph_exporter/${RC_SVCNAME}.log"
+error_log="/var/log/ceph_exporter/${RC_SVCNAME}.log"
+start_stop_daemon_args="--user ${user} --group ${group}"
+
+depend() {
+ after net
+}
+
+start_pre() {
+ if [ ! -f "/etc/ceph/ceph.${user}.keyring" ]; then
+ eerror "keyring not found, exporter won't be able to connect to the cluster!"
+ exit 1
+ fi
+}
diff --git a/app-metrics/ceph_exporter/metadata.xml b/app-metrics/ceph_exporter/metadata.xml
new file mode 100644
index 000000000000..3b2a9c591010
--- /dev/null
+++ b/app-metrics/ceph_exporter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+williamh@gentoo.org
+William Hubbs
+
+
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index bba9089ccfd1..2c8ba1fb75ad 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 0e36629eccb6..e278da2ceb58 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,4 +1,4 @@
AUX khal-0.10.4-add-etag.patch 417 BLAKE2B 2eadf7cb5ba1a4bd179a4f8b37278407819de7f798ce9f23723a11694fe9954bb67a267932d85416644a7dcf09544d13ca0107c02c832e63d36122cdab1e00f9 SHA512 ff5cd23b3351e474f8d9327bee52733587f8e5f8ab8973beff3736bd59af017865512c53b0c42b81f1b4fbb8212099b2d0d3751aa67e190f0e57349ffedd87b2
DIST khal-0.10.4.tar.gz 185736 BLAKE2B 0cb9deb793f577bbcedcbba4788988973ee9d0ab71fdd30a01142a54434767d74b1d10e5bfa5f6a2feb9f18a8a9fe22717d4a38a07ab5e30b331c87b79a79f39 SHA512 b32f1bfe5d3a3976278726a6570eb345a5ad44f63a52b75f045fd0509d145edd5b76e11a10acffd9c3982edc124f93daec34a37c39299c2311796c0314016eb6
-EBUILD khal-0.10.4.ebuild 1309 BLAKE2B 6e434cf11da9566a73c8332178c191d412bc630b3eadb74817e6c0db2053e1077379f3c3ac21880fb43628073ef872eeab1ff79de851cf730c1c34326f3b7924 SHA512 2812692b896baa76082173b808995ee8b0ec54fa2a88101b27de63198bbe86bc3141e002754f1f0bd130d8b94ff7db8b0541f995ce87558a5d8e77fe3cc56873
+EBUILD khal-0.10.4-r1.ebuild 1306 BLAKE2B b010ade57359c1172980e17569f8a1a2841251f4ec3a758a5db7537309490098df177981a3f9dd2e879732b242bd48cff94257ae28a45a04a1d57cfb8ab07776 SHA512 fb7d04a0db84c42b1795de6e497ac9fac45a4c0ad021b64ba13fa2063e494fee3b224c37b6083720cadf2aa42397c19a1a90e6fad7a5f79c9b375c7265113c8a
MISC metadata.xml 285 BLAKE2B 5e4543b327c8dc84cecfda51b540cccf8722c584a44ce5146beb390ccb3105af8789c8dfefe614e92723eb12a3c167baab09d6e83bd1d7ad2feb3f5ae31f7c81 SHA512 6309634c2ea8e5cbe7ce1627098b90fc90ae12829000332f83e967dd3ef1677dc807b78332cc9c790155323086d901b9db1c5acb23252c1f5e5d241d8b0b73d9
diff --git a/app-misc/khal/khal-0.10.4.ebuild b/app-misc/khal/khal-0.10.4-r1.ebuild
similarity index 96%
rename from app-misc/khal/khal-0.10.4.ebuild
rename to app-misc/khal/khal-0.10.4-r1.ebuild
index 3fb13770ef22..3179def35992 100644
--- a/app-misc/khal/khal-0.10.4.ebuild
+++ b/app-misc/khal/khal-0.10.4-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-
-#
-# The procedure is coded in https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71
-# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'.
-# So the failing tests will be excluded, saved for a later attempt.
-#
-# Not excluding any test classes results in "Tests run: 1109, Failures: 98"
-# Excluding those test classes listed below leads to "OK (812 tests)"
-JAVA_TEST_EXCLUDES=(
- # https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56
- # test.class.pattern = *Test
- "org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope
- "org.apache.ivy.core.TestPerformance" # not in scope
- "org.apache.ivy.util.TestXmlHelper" # not in scope
- "org.apache.ivy.TestFixture" # not in scope
- "org.apache.ivy.TestHelper" # not in scope
- # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420
- #
- "org.apache.ivy.util.url.AbstractURLHandlerTest"
- "org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest"
- "org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest"
- # following excluded tests cause test failures
- "org.apache.ivy.ant.BuildOBRTaskTest" # Tests run: 3, Failures: 2
- "org.apache.ivy.core.deliver.DeliverTest" # Tests run: 1, Failures: 1
- "org.apache.ivy.core.module.descriptor.IvyMakePomTest" # Tests run: 1, Failures: 1
- "org.apache.ivy.core.settings.XmlSettingsParserTest" # Tests run: 29, Failures: 1
- "org.apache.ivy.osgi.core.AggregatedOSGiResolverTest" # Tests run: 3, Failures: 1
- "org.apache.ivy.osgi.obr.OBRResolverTest" # Tests run: 16, Failures: 16
- "org.apache.ivy.osgi.repo.BundleRepoTest" # Tests run: 4, Failures: 3
- "org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParserTest" # Tests run: 46, Failures: 1
- "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest" # Tests run: 44, Failures: 7
- "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriterTest" # Tests run: 10, Failures: 1
- "org.apache.ivy.plugins.parser.xml.XmlModuleUpdaterTest" # Tests run: 14, Failures: 3
- "org.apache.ivy.plugins.resolver.JarResolverTest" # Tests run: 3, Failures: 3
- # following excluded tests can pass if run individually
- "org.apache.ivy.ant.IvyConfigureTest" # OK (14 tests)
- "org.apache.ivy.IvyTest" # OK (1 test)
- "org.apache.ivy.MainTest" # OK (12 tests)
- "org.apache.ivy.plugins.report.XmlReportWriterTest" # OK (3 tests)
- "org.apache.ivy.plugins.resolver.BintrayResolverTest" # OK (12 tests)
- "org.apache.ivy.plugins.resolver.ChainResolverTest" # OK (15 tests)
- "org.apache.ivy.plugins.resolver.FileSystemResolverTest" # OK (27 tests)
- "org.apache.ivy.plugins.resolver.IBiblioMavenSnapshotsResolutionTest" # OK (1 test)
- "org.apache.ivy.plugins.resolver.IvyRepResolverTest" # OK (3 tests)
- "org.apache.ivy.plugins.resolver.Maven2LocalTest" # OK (2 tests)
- "org.apache.ivy.plugins.resolver.PackagerResolverTest" # OK (3 tests)
- "org.apache.ivy.plugins.resolver.URLResolverTest" # OK (5 tests)
- "org.apache.ivy.plugins.trigger.LogTriggerTest" # OK (3 tests)
- # Without PROPERTIES="test_network", the following test cause additional failures.
- "org.apache.ivy.core.settings.OnlineXmlSettingsParserTest"
-# "org.apache.ivy.osgi.updatesite.UpdateSiteAndIbiblioResolverTest"
- "org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest"
-# "org.apache.ivy.plugins.resolver.IBiblioResolverTest"
-# "org.apache.ivy.plugins.resolver.MirroredURLResolverTest"
- "org.apache.ivy.util.url.ArtifactoryListingTest"
-# "org.apache.ivy.util.url.BasicURLHandlerTest"
-# "org.apache.ivy.util.url.HttpclientURLHandlerTest"
-)
-
-src_prepare() {
- default
-
- mkdir --parents "${JAVA_RESOURCE_DIRS}/META-INF" || die
- pushd "${JAVA_RESOURCE_DIRS}"
- cp "${S}"/{NOTICE,LICENSE} META-INF/ || die
- cp -r "${S}"/src/java/* . || die
-
- # DEPRECATED: 'ivyconf' element is deprecated, use 'ivysettings' instead
- # according to 210,221 build.xml and still in the upstream .jar file
- cp org/apache/ivy/core/settings/ivy{settings,conf}-local.xml || die
- cp org/apache/ivy/core/settings/ivy{settings,conf}-default-chain.xml || die
- cp org/apache/ivy/core/settings/ivy{settings,conf}-main-chain.xml || die
- cp org/apache/ivy/core/settings/ivy{settings,conf}-public.xml || die
- cp org/apache/ivy/core/settings/ivy{settings,conf}-shared.xml || die
- cp org/apache/ivy/core/settings/ivy{settings,conf}.xml || die
-
- find . -type f -name '*.java' -exec rm -rf {} + || die
- popd || die
-}
-
-src_test() {
- # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L396-L407
- # name="build-custom-resolver-jar"
- JAVA_SRC_DIR="test/custom-classpath"
- JAVA_JAR_FILENAME="test/java/org/apache/ivy/core/settings/custom-resolver.jar"
- java-pkg-simple_src_compile
-
- # Without "license.xml" the tests won't even start. "Tests run: 1109, Failures: 318"
- jar -cf test.jar \
- -C test/java org/apache/ivy/plugins/parser/xml/license.xml \
- -C test/java org/apache/ivy/plugins/parser/m2/license.xml || die
-
- # Reduce number of failures to "Tests run: 1109, Failures: 98"
- jar -uf "test.jar" -C test/java . || die
-
- # Separate *.java files from test resources
- # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L389-L393
- mkdir test-src || die
- cp -r test/java test-src/ || die
- find test -type f -name '*.java' -exec rm -rf {} + || die
-
- # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L430-L438
- # name="prepare-test-jar-repositories"
- mkdir test/jar-repos || die
- jar -cfM "test/jar-repos/jarrepo1.jar" -C test/repositories/1 . || die
-# jar -cfM "test/jar-repos/jarrepo1_subdir.jar" -C test/repositories 1/**/*/ || die
-
- java-pkg-simple_src_test
-}
-
-src_install() {
- default
- java-osgi_dojar-fromfile "ant-ivy.jar" "META-INF/MANIFEST.MF" "ant-ivy"
- use doc && java-pkg_dojavadoc target/api
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/apiguardian-api/Manifest b/dev-java/apiguardian-api/Manifest
index ed731d067316..683cf4495ef5 100644
--- a/dev-java/apiguardian-api/Manifest
+++ b/dev-java/apiguardian-api/Manifest
@@ -1,3 +1,3 @@
DIST apiguardian-api-1.1.2.tar.gz 67267 BLAKE2B 27bbe157f23c0904863d093930968854771f4c6b1bc6b6a6e6b86604383abd291348fa8b009d760b3bc739bbfbdb74e9429942ce1acf4bfc52e29e79386f2059 SHA512 7c56ee15e0aba07e95b6f2fe7cedd98e449e774958eb63b2467066c381e1e82ad67c982c2885e18154c62e55fda80a1c2e0f689253afe449db9f7e7563122db6
-EBUILD apiguardian-api-1.1.2.ebuild 764 BLAKE2B 53cbbf796d53b9b6812b56be208d0dd81bdabddfd917655f54d9e0475b749c08843d54f39713ca570c16c09926990cba4a5424b2e8e5889b6bf04ff9095cc0d5 SHA512 2781ecb5c87cb0ea750082a64ecc97b901f271bd517173713cb2804b52e74c59439a0d6928941865b08adea4396bd1c77f8fddb2e1fb321c0292ab3ee1c60bed
+EBUILD apiguardian-api-1.1.2.ebuild 760 BLAKE2B bff17e704af6674b3fc6ae6f5fc694f7d3de3b0df3edf1a5bc154012f8c15ae0c238e910c9da0e32fbed10d8d03c459b9a88102d1d2ddb5f77914ebf9f668b0a SHA512 ca5dd36c585792d4ae9230996a1b6f2ae138457d53dd974e34b0b59b39fc94edabd22d07f4877cf30d6f9ac36a3026d6f34d64082be22842b0d9a031b8c32a53
MISC metadata.xml 630 BLAKE2B 4d001de91a36f097a4a939e959ef99d68374661bf7ee8ecbbe53cf6c4802eb4de781b2410e0e9e0a33e17ed1647a02094561ab6f95b8140b9e0b60824e71251f SHA512 6b327e02c57224a464bde643b82b385a4ef874cddd1c61cb0d7bdfbd4ef98c8a3dd0c150d02998ad1189f194713e2f0d1b1738fffe63f84070d1aa6eb8df140e
diff --git a/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild b/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
index 0a4134224322..b9bd660df331 100644
--- a/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
+++ b/dev-java/apiguardian-api/apiguardian-api-1.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/apiguardian-team/apiguardian/archive/r${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 83dfee5a0cee..ee312efdd1e4 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,6 +1,4 @@
AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294ef11924310e2e63865018843faf199521f619e0859cc2c857d8a9fb038fbc44d88b06cf2df44b05cc6891c9e9d1bba5898071a873fc0dd774427afb0a2de2 SHA512 af18eeb48d8da55fc63526a528b88f626d9fad2369a6a8f570fe2dfee76384a5d86a9bab4883e557a1acd0a866859c4bd075476f9cfaff8e8465de6db0f2848d
DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
-DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
EBUILD commons-httpclient-3.1-r2.ebuild 1709 BLAKE2B 73b08779a549b7f3ba8e5961e9db672aa69ebdd89e7998f389763fe8c70a57f40ec8bd83b343f17670e1934038a4699ae443451071b4b24f21ff6b33118dbbc5 SHA512 9b5a9f39c2e2856e1778cb04db68d12211d1d0bd789f94d7ac3dfb5eeec1803d5ede3b93087a0af092824fea3e916aad5d05b3e606c02e2994318cdac615d4a0
-EBUILD commons-httpclient-4.5.13-r1.ebuild 2234 BLAKE2B 193917142633805b8663f25a95b103ebe7fd498fd640cf51e5e70828786e92dcb7d6e3f4da100cd0485dca2f57bc78dc4ef0668e7d44d1485c907313f9d8ced1 SHA512 137bca4b83f20d955b4c0c90edd2ab4896c3a10c8d22db9d082246479400a1429f2d4d2dcc8fa96568e33d6386241e3e45e4a4c21b63d84ac257052749c3fd90
MISC metadata.xml 457 BLAKE2B aa9b78ee94c6ac0cd435c142183612524e588138764dcf4ea6b2474925f5238983ebbcf75ba32d78e42b62f3751e042785291f00cd9a6453c9711b4110ce04a5 SHA512 46da6fef35f122be653de8ff6f87048475dae83e8853a05210e403f239ce3823caafca0e26aa503377ccfd9c5616f4f69d4d3b483b9adb7b512351d85be5f531
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
deleted file mode 100644
index 38274be97d07..000000000000
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom httpcomponents-client-4.5.13/httpclient/pom.xml --download-uri https://github.com/apache/httpcomponents-client/archive/refs/tags/rel/v4.5.13.tar.gz --slot 4 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-httpclient-4.5.13.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.httpcomponents:httpclient:4.5.13"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache HttpComponents Client"
-HOMEPAGE="https://hc.apache.org/httpcomponents-client"
-SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-# Common dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# commons-codec:commons-codec:1.11 -> >=dev-java/commons-codec-1.15:0
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# org.apache.httpcomponents:httpcore:4.4.13 -> >=dev-java/httpcore-4.4.14:0
-
-CDEPEND="
- dev-java/commons-codec:0
- dev-java/commons-logging:0
- dev-java/httpcore:0
-"
-
-# Compile dependencies
-# POM: httpcomponents-client-${PV}/httpclient/pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.10.19 -> >=dev-java/mockito-1.9.5:0
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*
- test? (
- dev-java/hamcrest-core:1.3
- dev-java/mockito:0
- )"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( ../{LICENSE,NOTICE,README,RELEASE_NOTES}.txt )
-
-S="${WORKDIR}/httpcomponents-client-${PV}/httpclient"
-
-JAVA_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcore"
-JAVA_SRC_DIR=(
- "src/main/java"
- "src/main/java-deprecated"
-)
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- # Tests run: 929, Failures: 1
- # javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake
- "org.apache.http.conn.ssl.TestSSLSocketFactory"
-)
-
-src_install() {
- default
- java-pkg-simple_src_install
-}
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 013612448c20..521faf14c45f 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -3,5 +3,5 @@ DIST fop-2.0-src.zip 26381859 BLAKE2B 8500de6a23e93c14fdb4f27c59bafba27a64e6aaff
DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
DIST fop-2.7-src.tar.gz 26799877 BLAKE2B 00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a SHA512 bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633
EBUILD fop-2.0-r3.ebuild 3050 BLAKE2B 99e24888912fda8f6d9d2ca37ad03d6af2b4631e8bbf6d3fd3f2398c92636612afba50127fa1c627401b4a41b7f8c03632aea486e92c3c3c493a083a0b9d15b2 SHA512 debaeea4df79a274fe79c531e808e331f1995deb23c981224fe3f8dde57dd62c911494c86a578d314d373289d286d0475c96ad8bbeedf9227f87a4679c21ea45
-EBUILD fop-2.7.ebuild 4195 BLAKE2B 7b70bb6404afa0dfe0e36a0c1e024ee76ed0bc6a291957f841dc901f393ae3ccf57f0c01f6b725c319aa6f71a659ade5f7b1717c5a0c8c53c6d4caf31bd3b47d SHA512 b7eb5d3fdcbb757d2c4998bfb10199c87e8a4fa422bc0eafcb7777ab62eab2b3763b57efb786a14577e0d3274e01f7966171f592cef3e8cbc4142aef09fce379
+EBUILD fop-2.7.ebuild 4193 BLAKE2B bc0aecd27a3b2b1d1313d2bbe72c7b086823ac3b340a9fe17f9630729b5d01894853f7d221bd7f55432da7c60dd763541060ca3d618bcd2a82c9175aceb76546 SHA512 152afc6899db080a161a6fb3f98dd5e481d720ee86c4f7dacf15120dad947a97ab2c00e037781f086c131b64acb34ede7fa56921e0713ba33c19b0c375c9c192
MISC metadata.xml 449 BLAKE2B 91dd2fd3b50581a408755aade7aa37406c527e9298bd0156cb18d363fef88cf60eb85f259ba443022fbd6c5377be0e0fc990cb2826d418347dc92bf7b6ff5ca9 SHA512 cf49f03d1ed992a7df7deebb7c00721895be45ff144da8c4b1777aecba5e17d86a7353a83ad8df8b356f70afda5fadcdc53350b2c5732a0f0469b18f501959d4
diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild
index 5c30a5a49912..59fa332f90a6 100644
--- a/dev-java/fop/fop-2.7.ebuild
+++ b/dev-java/fop/fop-2.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="2.7"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
CP_DEPEND="
dev-java/batik:1.14
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 052668c08614..dac04812983d 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,3 +1,3 @@
DIST gson-2.8.8-sources.tar.gz 393941 BLAKE2B ebdd1088a069eea58e5ea4e2eddea0d42064c53f7284778b1b7217c8bc7abeb7e14350e19d838af1d94f78c5c38aca6de0f37674b022f0e528ed65eef803c3f1 SHA512 f90ad679c99c5e9a6ee9e397e59ab1d7d94a9c82366902b808addc40ebbab101fdba7fc83e4666c4f35e52d8b127e6f901e65072a7de210496466074dcd043c5
-EBUILD gson-2.8.8.ebuild 1750 BLAKE2B e0b59437e868dc049ce0ea9d70fb9f09ea14302c4a5d9131097ddf8cc1cb711d24e2f65d88c4983bab24025b6e49a84d84428c9da06817e552c5b1b65cc28d61 SHA512 01ee9babce849f123f7bd9468130909ae380487e617d77c4e536399695b36ac6e6848879d0b2ed124fbdd6dd3d5a6b194a9527d438d083bc6de1e7c4bca3e9a7
+EBUILD gson-2.8.8-r1.ebuild 1745 BLAKE2B 6df1694112b6a71a33b7e96cb84d227cd96a69e6f55c3a964e3f4cbb585e96f9f457900e47260fb8204e7bdaf5e771f4dd9833090e9f22a63388e224e9fb4d7f SHA512 af2f7b14c43f914a91ab4285c1f702388fc45d9d78bcf9fdb65b918436bc4cfda135269168255df20813c24cfa32c38ec4eabf5a49fc6e22b2c6cd6e5bc3c063
MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.8.8.ebuild b/dev-java/gson/gson-2.8.8-r1.ebuild
similarity index 98%
rename from dev-java/gson/gson-2.8.8.ebuild
rename to dev-java/gson/gson-2.8.8-r1.ebuild
index a4d0f7c1d6f9..a69ff0ad0aab 100644
--- a/dev-java/gson/gson-2.8.8.ebuild
+++ b/dev-java/gson/gson-2.8.8-r1.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
DEPEND="
- >=virtual/jdk-1.8:*
+ virtual/jdk:11
"
RDEPEND="
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index f5a9de75ee28..a5b8079df996 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,5 +1,3 @@
-DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
-EBUILD jaxen-1.1.6-r2.ebuild 861 BLAKE2B 97da05063fd187441941327f16b6091c87559bf4b569f5a89caffae5b4d19e439901705272d2614747e89bcef84f27788155c903f26566aa9ad15eab33ba2698 SHA512 e5ccdf47ac5886a9f58d520a7cf587292c47f5adffdb668fcbc47eba8d3b2d70d2875561aa69dc6b6fad2bcda4a9db530bd47dc87a0fe72da644adaf5890d874
EBUILD jaxen-1.2.0-r1.ebuild 1912 BLAKE2B b7c2b6d75ae49f3df6a46c20a23488f9084fc81d39cec91e3d5258c8ba26532bc03c7da45a4520c245a5b9132d40437cf93b0ab7eefa18459401fe6e091ce1e0 SHA512 f9a9252c02312941af0c08073956449834a5baaf19ff0ebe32fd279cda927e0e6b951c928270e3699d3fccf54b8867f5198aec24ddf8977339e78dbad6d3f3d8
MISC metadata.xml 719 BLAKE2B 81b0a7991de9a06ca79c793dc619356856370488753d22fbfc77d92e5323ab6a5cd489fe9098a60d1de248fa481d906696a20032e7a27972f9630d72a8175906 SHA512 221fb2b9430c909ea27039513feb2c9395992cd67ec087e008cc284dcb3a8d19fd373405c52d59f0ad41cf481586ce58588c04b05e864cc7731d6c4162a3544d
diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
deleted file mode 100644
index be43e2578b5a..000000000000
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.8:*"
-
-JAVA_SRC_DIR="org"
-
-src_prepare() {
- default
-
- # xom depends on jaxen already. if we don't remove xom packages here and
- # require jaxen to depend on xom, we end up in a circular dep.
- # I fear though that removing those classes might bite us somewhere down
- # the line...
- rm -rv org/jaxen/{dom4j,jdom,xom} || die
-
- # this is now part of jdk
- rm -rv org/w3c || die
-}
diff --git a/dev-java/opentest4j/Manifest b/dev-java/opentest4j/Manifest
index 557e7a187f45..5a5119aad11c 100644
--- a/dev-java/opentest4j/Manifest
+++ b/dev-java/opentest4j/Manifest
@@ -1,3 +1,3 @@
DIST opentest4j-1.2.0.tar.gz 77616 BLAKE2B a331cc5e97d1e50b3b57e6aac926278d16f4d75067b4e4b25acb5ee25d4d4cd9d1f75c115155303ec63f5cb22b09ad1cbaa01d62620b350dd2c1d61541657b78 SHA512 cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08
-EBUILD opentest4j-1.2.0.ebuild 770 BLAKE2B b7a3aebc6fbd690895bd9b4e1a00d40a623d4159cf6a6c091e0b608b261582577e3d0f0b5dbb0e42c4aa40cbdd0d9b646223f96d5a8a77d72b243bbd7473375b SHA512 71963eebf8cf7ca1b911e2f63451337feb59f69be3dbf6652835f4f9fb9f379edebcb1a14eabccc4577e0ae0edb5bd16a07fddc53000f8e72ac26a8b2c2a19e2
+EBUILD opentest4j-1.2.0.ebuild 766 BLAKE2B 8a010437e247e7598d8549d205ba1789c9dbd942c172504216900069854bfc1b43edfdb13246bf721dcb8d07b92480b34c62f1445753291ce03e6ddd57f4d580 SHA512 100dd0c35f45452781f565fc910a06c2e671d500ffaf1ba6109f1234f3a03cded416b74247d31bc0d85a4ca0e1b0206f9e86ff075fd2af46c45387b6751360f0
MISC metadata.xml 303 BLAKE2B 07307ccd1ef1f074fa091ff02bdacfe83a3f3c0a2d79f7545821d5955834a83391d64d34dc8170cb5a4752302296e746393491f7b628a6936a3f0c2b85e09f29 SHA512 9760587d9dec49089d8ea86b7046d145e41075c6ae02af3be319e795272b3eeaef6540dfbb90564bb85d50974f44acd4bfd71d57956b1ff0e2e216220bf60f48
diff --git a/dev-java/opentest4j/opentest4j-1.2.0.ebuild b/dev-java/opentest4j/opentest4j-1.2.0.ebuild
index 398dc826230c..cb2a9e6814fb 100644
--- a/dev-java/opentest4j/opentest4j-1.2.0.ebuild
+++ b/dev-java/opentest4j/opentest4j-1.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ota4j-team/opentest4j/archive/r${PV}.tar.gz -> ${P}.
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/randomized-runner/Manifest b/dev-java/randomized-runner/Manifest
index b94698cec7cc..46f06f53c364 100644
--- a/dev-java/randomized-runner/Manifest
+++ b/dev-java/randomized-runner/Manifest
@@ -1,5 +1,3 @@
-DIST randomized-runner-2.7.8.tar.gz 1501825 BLAKE2B e375d4509d8be914829c4ebfad5584e16f8f03be480ed21b52a0ad3db363b7f2761ae6442bb9baa8c929bc182c422963a6e8480165f53b7b820f9f4e2954a243 SHA512 5627f14dc70a6341838ad1ade0fa0f152ec6a5a7f3da4bc31e0ff040ea2c62aeafd669460f61f37db31de379db857ce3d58f0deed22d1cf714f1461988a92cdc
DIST randomized-runner-2.7.9.tar.gz 1501927 BLAKE2B 41ac32c724a87021c9fd58d3c421cab1fefd00a1e9e25a29d6188b831120c5e1407894f19fa92254df5cd1f2a66a44bf6e4469fa2128d841c1f17d17a623eec9 SHA512 23db6f21a805146d759fa9d3c9a37199b7181d6c53d0f62a4d82c42cbc15816cc25a87a174ef3d533870d648039b3f8dcac9370ffaff4ef76fefb6fc2c38ee88
-EBUILD randomized-runner-2.7.8.ebuild 1494 BLAKE2B 380abe39801f39addfd5e6b5ebc35987505d6c6eae3f071eb6323cf8b4a3c72628feef3437c4a272485ee34d17ad7fd838e7b0d75b85a0c3f56df72e850c4a0c SHA512 224ef0bab01bf780e378d964ef419a2b53f534dbb5f3ad919e8b2f62819cef6868b0ad5414670143570efbc2aa127f0d39181c8c4952a9f31bf5a29d9a6e1cab
EBUILD randomized-runner-2.7.9.ebuild 1934 BLAKE2B c783f68a3b54df6d17059be6dd8b0aebfaca6156a82fc81b36c040a538ce82daa2965fbcf3d9701b3ade6ddeac6b0ffe7313f8e4517db3f2e09e6c265178c8f9 SHA512 c08ea9e7291fcdd6e8663058151a178d72ad40fea95b7e9e3d969bb6cdf16517cd3e1026fc0a753fd0a3c6685432f414ec171fec2673edeae8b1aeba03cb3fcc
MISC metadata.xml 317 BLAKE2B 3da80829ccd32c18e7f9d05eaffee0f9433c2d0893363e911f1a0fb6d4260507ec4712c7035cdb2bd9d7b3fc7269d60f8346f2d82eb9bf7f3e25c03068ec1edd SHA512 f72fc2cfb58f31854ceb21c43f771b7eaf9b89d444e54179e54b2940ab7759f702640535f89b2101b65585ac8ea73d13c64583ae485608ab5a88e8f35f5a2a94
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
deleted file mode 100644
index 044d1859d98a..000000000000
--- a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 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 https://github.com/randomizedtesting/randomizedtesting/archive/refs/tags/release/2.7.8.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild randomized-runner-2.7.8.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.8"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JUnit test runner and plugins for running JUnit tests with pseudo-randomness"
-HOMEPAGE="https://github.com/randomizedtesting/randomizedtesting/randomizedtesting-runner"
-SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/refs/tags/release/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# junit:junit:4.12 -> >=dev-java/junit-4.12:4
-
-CDEPEND="
- >=dev-java/junit-4.12:4
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? org.assertj:assertj-core:2.2.0 -> >=dev-java/assertj-core-2.3.0:2
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
- test? (
- >=dev-java/assertj-core-2.3.0:2
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}"
-
-S="${WORKDIR}/randomizedtesting-release-${PV}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="junit-4"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="assertj-core-2"
-JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index c92877f1cfe5..7e63692cfebd 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,10 +1,7 @@
AUX stringtemplate-4.3.1-BaseTest-javac-source-target.patch 1318 BLAKE2B 6b93c9591b220584c8dca11a10c7012801f54d922a2dc938ce87cb7c996b0eec1124fb5ec57725a71c482c18922f8bae585f7aacc5609ac9e40715553f96d8e8 SHA512 618b10a46373cc0be12e3bbc6cf4d2177b300b52e65385d1babd1af67236f080a848ab61271c84102a305552de48071945e5f66c40aa084bf4aa8705ed92a267
-DIST ST4-4.3.1-sources.jar 198002 BLAKE2B d1bd78dac71800e342291920ba78ab39c9a43b1f3866e2afcb0e1d61d439592663a625efe2a5a215c6032469e7ebeeebb31267e1681536ca0cc524cc58781a3d SHA512 bd06940b629ab0378afd6342b6f5beef002023387843cefd866ebe6ae8e94996edc3f21a0c70ed3570d3fcb7194bf354d0e42d4eff32522b3c01c51369867be0
DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc SHA512 7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f
DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
-DIST stringtemplate-4.3.1.tar.gz 432541 BLAKE2B c5b4124524e36a7104908dabf9ed258d2397095d8dc86eef401d0da1ac245629e88a1b2d0e35417ed7735ad6b8495fd2cc82970601a16ee856f5456fdc24b48f SHA512 afe62ca1cbc7572d05859c6fdaa1eb3221045da582bce5d88c328acae39128c904396f8ba1e10643a2757123297ba1924e046841cc8a667fbc724bdeca95680c
DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679 SHA512 d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1
EBUILD stringtemplate-3.2.1-r2.ebuild 1557 BLAKE2B 23393c4b73e75d1dd536957bceef00194eef22db42db38a6423f3fbc515e9bcd89a554d725735c94040c8abdae462e712ed92e2f58594338710c8790b8ef3c0c SHA512 244089013be014dbc4de338339ead998c9aa19464e651f7fcc02fa56410218e8289e1d91b5deb6b3905a11696b4ff6c44a0d19f783157b96acf8f3d85647a7d6
-EBUILD stringtemplate-4.3.1.ebuild 2946 BLAKE2B d6552374db1cea1a9bcf20e725f0ebb441579e0a7f56872fdecb2d6276203618bbdfed84ddc6680b7f464aeb3746e0fedae4597026ccb90a8808f662662d83c3 SHA512 17cb383f2e8e6111a82bf1d257136e789e7fafe1ffd88c50ca5065236a36a03001e3adaad600696766d34db5ac25fa16dcbec544dd6a933efa77950d24aacd64
EBUILD stringtemplate-4.3.2.ebuild 3312 BLAKE2B 831ddaeb827e85e9749b13725bbdbc75f15a277b97ecd107839f988efa21becf70fc851ddb2b2e39f2478637798dc72c38495907565db908f91c06ce35f0d920 SHA512 32a4d5a7698c87d6e0e6a683b29ffc33500ee4f8d13543ad93f58e33853f58cfc9d963fdb8341371e31b64c858b958ac86db4e25281ccbdae740c2d8699f1f5e
MISC metadata.xml 323 BLAKE2B 4b53767b7c81b78dfcfb69b4175baba46ee266cf145dff77dc855838f8b3209edf2fa1949b17aa88b284f0cc92d68250c0b64d4966253de734f1263d46b6b6be SHA512 9f7523f1186535db76c503816be7b41a6f58fb07469347d43acfbee68effdb5e748ebae3cc9cba2c9ac45b0c504b64eabd4947c48f040efa2d42f11328ae100c
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
deleted file mode 100644
index 96b458d2cc14..000000000000
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.antlr:ST4:4.3.1"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="https://www.stringtemplate.org/"
-# Maven Central sources JAR for *.java sources pre-generated from *.g files;
-# the source generation requires antlr-tool-3.5, which depends on this package.
-# Tarball for the test suite and DOCS files
-SRC_URI="
- https://repo1.maven.org/maven2/org/antlr/ST4/${PV}/ST4-${PV}-sources.jar
- https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CP_DEPEND="
- dev-java/antlr-runtime:3.5
-"
-
-BDEPEND="
- app-arch/unzip
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
- test? (
- dev-java/antlr-tool:3.5
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CP_DEPEND}
-"
-
-S="${WORKDIR}"
-TARBALL_S="${S}/${PN}4-${PV}"
-
-JAVA_SRC_DIR="org"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,antlr-tool-3.5"
-JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
-
-DOCS=( "${TARBALL_S}/"{CHANGES.txt,contributors.txt,README.md} )
-
-src_prepare() {
- java-pkg_clean # Just in case Maven Central sources JAR contains binary
- if use test; then
- pushd "${TARBALL_S}" > /dev/null ||
- die "Failed to enter directory storing tarball contents"
- eapply "${FILESDIR}/${P}-BaseTest-javac-source-target.patch"
- popd > /dev/null ||
- die "Failed to leave directory storing tarball contents"
- fi
- java-pkg-2_src_prepare
- # Some of these tests requires a graphical display.
- rm -v "${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || die
-}
-
-src_test() {
- # Make sure no older versions of this slot are present in the classpath
- # https://bugs.gentoo.org/834138#c4
- local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
- local new_test_cp="$(\
- java-pkg_getjars --with-dependencies "${JAVA_TEST_GENTOO_CLASSPATH}")"
- new_test_cp="${new_test_cp//"${old_ver_cp}"/}"
-
- # Some of the test cases require an absolute path to the JAR being tested
- # against to be in the classpath, due to the fact that they call the 'java'
- # command outside ${S} and reuse the classpath for the tests:
- # https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/TestImports.java#L103
- # https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/BaseTest.java#L174
- new_test_cp="${S}/${JAVA_JAR_FILENAME}:${new_test_cp}"
-
- # Use JAVA_GENTOO_CLASSPATH_EXTRA to set test classpath
- local JAVA_TEST_GENTOO_CLASSPATH=""
- [[ -n "${JAVA_GENTOO_CLASSPATH_EXTRA}" ]] &&
- JAVA_GENTOO_CLASSPATH_EXTRA+=":"
- JAVA_GENTOO_CLASSPATH_EXTRA+="${new_test_cp}"
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg-simple_src_install
- einstalldocs # https://bugs.gentoo.org/789582
-}
diff --git a/dev-java/univocity-parsers/Manifest b/dev-java/univocity-parsers/Manifest
index 651ea4b0cffc..f71480fcce19 100644
--- a/dev-java/univocity-parsers/Manifest
+++ b/dev-java/univocity-parsers/Manifest
@@ -1,4 +1,4 @@
AUX univocity-parsers-2.9.1-explicitly-import-Record.patch 7598 BLAKE2B dabf3f190ecedc9f8897418ffb03351c9dc2b6db2d0cece5325997ba7b6b99da5a52466fbef920a5c09785874f99422c0eaba70031159a5186a26109a8fbc275 SHA512 80a84722a81a97b3f799dc2962c19b7bed077170a436e09a4440d536ec78ab6a994df7dfe1e4e3ea30c9fdecfb61f5f78147fa0045b63cfc3d274952b4dffb47
DIST univocity-parsers-2.9.1.tar.gz 486417 BLAKE2B 4da3d31a1e57613731a0e112dfedcb084e57a2d0b6568e14f49986c447a080cb2cf8c530a6bb0ed30026a3afe5c5c648de2b4559eeca9432c5e13b5eb9b92b67 SHA512 f22062a277015c5f7fdc10b192ff07576baa6a8b67116bdc8e9aed37a70b6f3268a8faf0e422620be63deff13e3d74d4606f7c972cd9b4afda553f88feb75887
-EBUILD univocity-parsers-2.9.1.ebuild 1005 BLAKE2B 54136375d3a47b43f600ccc96dc600ec6ab670046ee658235a47e72ec999b17b66a87c1fe33abf391bb4ee2d71b9c7cc05e8a0becb18f21ac61aa565b03306f1 SHA512 f876930c1c0b0ad5e45448ccb163e234be59a681dc2fbed4472a1f4483542ae0bc1724bea072d6fefe64019ac8cd62ecf7de1376790f5dd677cb3c033818f793
+EBUILD univocity-parsers-2.9.1.ebuild 1001 BLAKE2B e279e5f7ef2928c09e34a9fa1c81d2a1fe4b69865a9ab5936e3b0599a441fa47520a7d23c5e8fc5fb862d400ca5cc27db92377fd188ddaf6f021a29b6a167651 SHA512 00bf368b3c760aaf6535f90667bac57e44d19a7a1b09d41ed18012b55aaa4da5831c602b2a0a9adeaeeb28b6dc2c6fa40c2db9f35a1c076c4bbf42c9667fd721
MISC metadata.xml 563 BLAKE2B 06b896125c89616bdfb3319129ffa5bee987d73bed7ecc870ef48db920482529b944fae703e63093d511921f530af2ea466209166ebfd50ca31e2821699b3020 SHA512 4367b7035e745d340bb0ae565328e539db9bf45e8f8e4d2dec5bdd665deb8e1cd6da3db2d03444ac6344ddae1d972f137cc46d8f5bdfc0d3c8f873b009afe19a
diff --git a/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild b/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
index a202127995b9..58e46ec195a5 100644
--- a/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
+++ b/dev-java/univocity-parsers/univocity-parsers-2.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uniVocity/univocity-parsers/archive/refs/tags/v${PV}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 552c3b204b8a..5cb0b8e768f6 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/cfortran/Manifest b/dev-lang/cfortran/Manifest
index 4e12ea726ba0..b1d6aa11c124 100644
--- a/dev-lang/cfortran/Manifest
+++ b/dev-lang/cfortran/Manifest
@@ -4,7 +4,7 @@ DIST cfortran_20210827-1.debian.tar.xz 8096 BLAKE2B 719b9cda29149e88342a54931af7
DIST cfortran_20210827.orig.tar.gz 94493 BLAKE2B 9ba0a22d1231702d04e484c21b566967a44684691fe08f7dc156e7b58946ab72694040e1513d51754993f82c4b80e58b365c25ad99acfb875cd2bf5db29dd7f6 SHA512 df12086f7718d205f3d0e40fafc1584339020e2be8ce5a96a314448018eac8d76fa7ae888c353e36f10e7347add609c2fe00558ec369e0ede2580973c21e5963
DIST cfortran_4.4-14.diff.gz 23084 BLAKE2B 8e760b3697869c12e94925c4781318fbe7640f0563a2464bf5d9f51a4afcb4bf9c281bab189542f2342d6dbc6f5524b4a48d9f844459d190e9182a96ebefbf9b SHA512 1e0b267efc17c2ba30ca1108d59ef87d1a401e6b88bea2c7045458f8cfad6ec9a05f6bf4a08c1d6cb314c790a4969a1f0fdf0c7b6abc28bae544928aad5b0218
DIST cfortran_4.4.orig.tar.gz 120119 BLAKE2B df4e0650e2718ed0c2009fb1b85330266308b0b584fcdc85e08cad0913bf063ab38824724b43a005a63a6e6bd5152b35115a68659487a992b96d0d38792e6d0a SHA512 969d0db566ecd7ed7945cac7f8ceea1cbd94ab427734ba83882acf97022c83b1417e32515d847fee89144137f58f7041cf5164fc397f3d7526f3aa958f8b038c
-EBUILD cfortran-20110621.ebuild 1416 BLAKE2B 4175b7a75672f246ad5a2474374204cea62ad438000df92678846ac365188afa928f276172dbc6939b298c2bf8baa23e4b89a731ae5180454e7c21723fd664dd SHA512 ae9ac2cce49dea1ae3b9791afeb9e922c73e3078ae21b365b4b6076f3b37801a51d4b224e1a51a8207613c32ca74043d0cdffff16be791926328954849a8661c
-EBUILD cfortran-20210827.ebuild 1525 BLAKE2B a5718642d226b61ac91ba0b47cc44b4b28f6419637c15917ebc99f08174adda7c4a3d70b5c822786c97ac098b4db37a5546d3ad425f9da883ca2857c32c27907 SHA512 142974415f6f3dd0781a05d0675a9cc07c021c2eead30509b485002dc22a811e4d6d2f13b761f5fc8ae01ac81f91e8ed749dd225bc0b1f401404ba8738de668e
+EBUILD cfortran-20110621.ebuild 1559 BLAKE2B 81947a1b88493e41e745a1dca5eea75806b01e8a86befd1d57e05c7e2430d588bd16b68964c0182626b15f1f9d31fc4073a48338e8690ff2053285aeec93b8a4 SHA512 ac393c8d1ffc01ad86678e563d8249f40aa28ce951dcdefb6636302028819bdbbf257f7bebafc5e95026f6941801578abdd9a737d756d61aafde89f089d1b424
+EBUILD cfortran-20210827.ebuild 1669 BLAKE2B 3cc90c86786e1017886d6d1ac59dfe1d9e3b5c48085e271ed831019198ff87dc6ccd4ef383412bcd5d10ef84d5e3c1a107abb33320fb951e8711027314455617 SHA512 fddb209db372461810520333d910f94ea5bcd079955587c4a0b22e3e76493f083d6c7c6ff6d33d133fbbbcb3218b6b8923bf67a9ee73e199ab7bd2c990bde118
EBUILD cfortran-4.4-r3.ebuild 1136 BLAKE2B 79debf78d636671368b117d93e58482eacda398b631f7855d075fcbb8785dbc069c45edcd4d3fe6f9ea84d13768dc3c7741eb633eabe67c79af8187c7c315d6d SHA512 aeed0e2b0532ce563554afc3df7576c9b7ac8d8e1706bfaac4291f42b957036bb7e5be0267d42305830b33f8fd3818ce4d62352d82b271b3f6c12a86bc746347
MISC metadata.xml 589 BLAKE2B 0d608e14da396cb7c906fd1859a36eecd8adc283a0c4e5202bbb022adc95dd148c7de31dd6d65f8e611b2e79a96290b2fa59447d564780ebe58cf7a1d092e74c SHA512 a3b37c71425dc57d3116a6bac8ed5935a2f558e58f78bbe34faadd5f0584bbeb954af353778d5c46aaa667a2dacd06de6cd8ff8f95882f6c2ee898f1cd03cbd5
diff --git a/dev-lang/cfortran/cfortran-20110621.ebuild b/dev-lang/cfortran/cfortran-20110621.ebuild
index e61e831fc6a1..9a624c62ccf7 100644
--- a/dev-lang/cfortran/cfortran-20110621.ebuild
+++ b/dev-lang/cfortran/cfortran-20110621.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
FORTRAN_NEEDED=test
-inherit autotools fortran-2
+inherit autotools fortran-2 flag-o-matic
DEB_PR="1"
@@ -17,7 +17,7 @@ SRC_URI="
SLOT="0"
LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
RESTRICT="!test? ( test )"
@@ -38,6 +38,11 @@ src_prepare() {
fi
}
+src_configure() {
+ use sparc && append-fflags $(test-flags-FC -fno-store-merging -fno-tree-slp-vectorize) # bug 818400
+ default
+}
+
src_install() {
default
diff --git a/dev-lang/cfortran/cfortran-20210827.ebuild b/dev-lang/cfortran/cfortran-20210827.ebuild
index d389fc9ca6b7..9639036d2826 100644
--- a/dev-lang/cfortran/cfortran-20210827.ebuild
+++ b/dev-lang/cfortran/cfortran-20210827.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
FORTRAN_NEEDED=test
-inherit autotools fortran-2
+inherit autotools fortran-2 flag-o-matic
DEB_PR="1"
@@ -39,6 +39,11 @@ src_prepare() {
fi
}
+src_configure() {
+ use sparc && append-fflags $(test-flags-FC -fno-store-merging -fno-tree-slp-vectorize) # bug 818400
+ default
+}
+
src_install() {
default
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index f3ea396021be..7c89c3e815fd 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -7,5 +7,5 @@ EBUILD vala-0.50.10.ebuild 1325 BLAKE2B 552a3cfd64d5f1b465575d1fcb410145d8ec0f8f
EBUILD vala-0.52.10.ebuild 1325 BLAKE2B 7a86df69fc88acb215accc50b924f15f9135d7675a24217c49138aafd6a46fcb4687c49969318590ae132571b43583ceeb0f2dfe1ba9c7d5a4e1495567658e61 SHA512 31fa5ee98de090a4c84ea2e409b23b87a473323dcb067b4cde46b73078fb1c9990c1cf9df34668eacd3970210800bb4041fc4a4cd8b7c0dfd22466f15560c932
EBUILD vala-0.54.7.ebuild 1332 BLAKE2B 26fa5f5a6e81a64509e67f99906a311a3c7864a049016b22881faf170bc232b5a50efe6bb048edbfb47e3c4b26f6df0b65123c666c0165be7c8f9e3f36fca614 SHA512 3771444445b32d1840cca46d8d0cd4d93969ac48493379df0b418580608192262f7c97d6c23c6761cb07c413dbd50c993d3abd1c4998bd80d9f46b09760e734d
EBUILD vala-0.56.0.ebuild 1332 BLAKE2B be25d2413d255c9b1eb29120414d4523f40f4b017fd898542591f704aa9c5142caf728eeca37a82a36dfce62cf611fd5e007fe6474769823a5c0660430e34403 SHA512 9eba7b86d2af63dce9baa88383e9fe352290a6da13f827ceca0da482770463bddf3a57d4345ca4b013eef1c1fc42a172ac8af1ae433446a6c1fa904a6c55b8ad
-EBUILD vala-0.56.1.ebuild 1332 BLAKE2B be25d2413d255c9b1eb29120414d4523f40f4b017fd898542591f704aa9c5142caf728eeca37a82a36dfce62cf611fd5e007fe6474769823a5c0660430e34403 SHA512 9eba7b86d2af63dce9baa88383e9fe352290a6da13f827ceca0da482770463bddf3a57d4345ca4b013eef1c1fc42a172ac8af1ae433446a6c1fa904a6c55b8ad
+EBUILD vala-0.56.1.ebuild 1339 BLAKE2B e8cc2225e305a760f64623116d749ebc1bb3a4899e9c44bab49d9fec61c661e4632dbc6641b72bfdd46efdfb1e6ebf24e83dde20c11f502c1fb3bef942038651 SHA512 db50352b35882ba02c3339e3695eb98fccc3db9a2718f106bd9b5e9abadd6b6f8dbd679402ba521ce2f007f5b877701ae8011983912f583d16c1ea00eb1f2955
MISC metadata.xml 346 BLAKE2B 277f10c368556c7d571d77958bde8a421a85f772ccdb5e9abebf2c7c86cc26c33a79a7e552aa76016c7cb8c32cd4435d8779befd42b1e9c8f904e28a0dac5be1 SHA512 a4092a8421609b743fbca75c329df84030f0debef4f6614a399af9a7b331c758a130a91e5eeb2815e56b9b3af6ba7509a3f39e8168bb4c482ef9158a58b69cb8
diff --git a/dev-lang/vala/vala-0.56.1.ebuild b/dev-lang/vala/vala-0.56.1.ebuild
index c0e5551a7eb6..c46df3dd37e3 100644
--- a/dev-lang/vala/vala-0.56.1.ebuild
+++ b/dev-lang/vala/vala-0.56.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0.56"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
IUSE="test valadoc"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index bd04a6433d1d..5f37d96f4096 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index 01ab4dea5cbe..401280bd4baa 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -2,5 +2,5 @@ AUX dbus-glib-0.110-config-glib-genmarshal.conf 3281 BLAKE2B 5724ec3aa555d71b267
DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
DIST dbus-glib-0.112.tar.gz 715340 BLAKE2B 24e1c222f0116b32c109682816f6c35771647f4c63cab93a6621bd68b71ea4dca62fbf9e6bb360386b8658146dbf34b0d7dc471db7525585412d120340c4c969 SHA512 7c9f393f065dfb3d698f35e6554caf15fe539f5dd52d2b2bb6ed1770e130f5dab8e45379232520301455bae9bb77e25a109faf175153fcd4b9dd11d7de4a546e
EBUILD dbus-glib-0.110.ebuild 2536 BLAKE2B 0371202a4ec7de8de93db1c50c9d038aa430a5080a79b255c395015b36e81e0df5b11fa83240fc65fdef175944af22b594a84f321f662dfb1f9e4465393c400d SHA512 219d236d22ed666f7d8109c940101b2cc44f86d352a2f2d5d17f4023c941f7c90766ea3e7deef12724f4bbb7a851d9eab134614f3551483e7dc3bb4def5546ea
-EBUILD dbus-glib-0.112.ebuild 2474 BLAKE2B 28e850f8b9d029928c145e1848f528b6dd436ff0e9d04ccafb4c8f4fe920727556a8c718c5c39b821c6dee53d3a3edb5f4e36dce66db9ca935fd2d58e9ba8fee SHA512 2a792ec83448853169db1dada3a75a9b0db52c83b31c27436ce2325a4dc1a8514e0fa640fca124c8ca3aef14bb3dc01b1f2486b34bad59800204e2c4738b4cd6
+EBUILD dbus-glib-0.112.ebuild 2481 BLAKE2B d6047bcdc5b23e97665c8e01d7709d78933bfd7ba269dd365b3744848d2b880397b993cbbf0652e5b54a7c6b257ff749d5c8f95de035fcffc7696208647f9aac SHA512 8fa250d7226d69acefaebf11c872074efdebd0b58513be8ce6626c4ce59aae9efe0ed8d32b70715845d8a5afe0df9cb6daeaad0fe0cbe1b8b35b88aaed1a3f01
MISC metadata.xml 327 BLAKE2B b8042178da38fd88443c3c73602e58e46003e265c86521284d63401110e217bc2a67629e269290e9bbdda58a15eec5e79a8b424e9435ad77ca7f400946342adf SHA512 5dc80dea95565a990d2d8575171582096e827b82ccdcec8b3adf0f8f5289052e784c97cbe8f087043b228c86d43e2685f0b6942c2699bfa94a8e0df962349de1
diff --git a/dev-libs/dbus-glib/dbus-glib-0.112.ebuild b/dev-libs/dbus-glib/dbus-glib-0.112.ebuild
index 1dac549aefbc..80449ae7b0b4 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.112.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.112.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="|| ( GPL-2 AFL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="debug static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 5486614659e3..970f2aa1c6d7 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -5,6 +5,6 @@ AUX libaio-0.3.113-respect-LDFLAGS.patch 537 BLAKE2B 6981fe9a607ddd4f9f803797f91
DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
DIST libaio-0.3.113.tar.gz 49980 BLAKE2B 2379c88670310b36942563d10f29dfcba0f49391952ffe7fe18b0c917f33ef610405fe13297d1dbb34b7ad1d3066d4a32587a7fb20babba2f264cfc2ab289e57 SHA512 65c30a102433bf8386581b03fc706d84bd341be249fbdee11a032b237a7b239e8c27413504fef15e2797b1acd67f752526637005889590ecb380e2e120ab0b71
EBUILD libaio-0.3.112.ebuild 2184 BLAKE2B 9af25ed8c5c41bb07f93f6139ba91ae70bac4131fa5171328b527842169bf68bf6c49a2becfc2539e1fc13a16ffc2026b8e208c6f2817d060c534ba5f8b49576 SHA512 695bd6ae41e784f76c16cf1a094f9d9282e8e9918d0612628ae587a669fbbc7bcd1d7276aeb1b421712b278333b33020e3ca1ac22e8be8e06676aff2e8970b28
-EBUILD libaio-0.3.113.ebuild 2329 BLAKE2B 6eaf85cdf7518dda7f764a774df28b5480b6b25780b0ee74ec8208032ad0c4b3785c19c18f98dd4c2d6a1ab7aef75cc9aafd05969b8db27544738749e1123139 SHA512 77f6d3bc08c7995e88c8df7f306628e9f63d630d75fb2a487c18a6977a1a7f092ccdc5bfb71a75d27d22c7ac7af705abc379d7ecd3b008d2eeaa2bfe9de31920
+EBUILD libaio-0.3.113.ebuild 2355 BLAKE2B 1ce696094fab440ec1fdc0562a070ff4f057c6e8c014f60f71e4b0d83b889e8424eedc137fd84c1344723e7fc79beab100c5c461259bb77b794fecb71bce30d6 SHA512 263f9dd199c584dd82c4f531b85f09d0c6ce1c0863bfc3ba4658468a8c684940eb6bcc68d83d6977cda00144eaa79902b8b517bdd048a0613eac998b28c457de
EBUILD libaio-9999.ebuild 2175 BLAKE2B 09786c3428b1e0dafc1959dbf2eec9cbea4cdbcac2384414bf0c53014d355be3c00559ac19c5310236280829008e04fb9c9d008e49bd56c5a5568eea5eea33ae SHA512 c230b35ab0f8c39eb75fc01cae8faf6f2fe5fe6459fa9c11c029cc3529cd8960fbb33d4d8a26e45206a1d17243039126c9d40d1d4f8e917736bf6a970cda3463
MISC metadata.xml 415 BLAKE2B 5f25806b5b169a85b455a39a9ba1995ccfa3c41e17ce1b8a7f2269167ba477fa0b76abc4ba46d977e5d6bba365b63e342304837a19dd57c0ac8d83e5846a2b22 SHA512 ad7bc8b579f5037c678294b77511af2b9027ed696a814bbbda6e3f630853040092b0abe20967d52fef7f65815c807bd49a2e57f392cd1035d1133e6d48009204
diff --git a/dev-libs/libaio/libaio-0.3.113.ebuild b/dev-libs/libaio/libaio-0.3.113.ebuild
index 1f2cb960692f..c72cf7a83a27 100644
--- a/dev-libs/libaio/libaio-0.3.113.ebuild
+++ b/dev-libs/libaio/libaio-0.3.113.ebuild
@@ -15,7 +15,8 @@ else
# Has test failure on abi_x86_32 which needs investigating
# https://marc.info/?l=linux-aio&m=164996470108464&w=2
# https://pagure.io/libaio/issue/21
- #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~loong"
fi
LICENSE="LGPL-2"
SLOT="0"
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index d4753cf90c2a..923ee3c40422 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,5 +1,5 @@
DIST libcbor-0.8.0.tar.gz 267044 BLAKE2B e8548e7351984ebdcbeb5f13a7ca35412c3f3f05e2a44a5438d57b90bdcdc51f5265953163106f90ade911a96af665956ebeba7ed1c48cf207acf6d683af5606 SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc
DIST libcbor-0.9.0.tar.gz 275405 BLAKE2B 7e78722650c702552dda4844615c454989281abe8c45ba3c9168af16e9d440a1b7e4e0c9afd89faa48e74ba85dcbe0c7733eec3e44fdafc0ca340e97574fe274 SHA512 710239f69d770212a82e933e59df1aba0fb3ec516ef6666a366f30a950565a52981b0d46ca7e0eea739f5785d79cc21fc19acd857a4a0b135f4f6aa3ef5fd3b0
EBUILD libcbor-0.8.0.ebuild 1400 BLAKE2B 7ac71bd26273ecf58e7aad467dde3ce9ff481df063cc8560430c83315df0811b6449d554fb5d07cf759c7c6d43ad582891b5d77bab131c47886e3ac6a10d9c64 SHA512 8f5a022618f982241debf0dae641c32449c2c7d37099b70efe390833d371ef498cd76556bac9e31431f9da70bedc33f117accfab72ed7203b405a0f56324b95f
-EBUILD libcbor-0.9.0.ebuild 1414 BLAKE2B a29cfa3b2b76f49ea79a7a284e7efceccae8ef01e7735713abc411c1acc0b2151034037f829448e5ccc9f74dbb2a46560f2e803615779404033f2908d2691f1e SHA512 e500a1ca4e9700ca176511ae1ba56409f2646988a1135e5008dcf26824a72a2eb75379ec46503cd92cd4fcd549eb556e75d9a21b0a625a0c62565206e98f3b4f
+EBUILD libcbor-0.9.0.ebuild 1421 BLAKE2B 4ba52e47b9f5fe428491509f28d4d0b8ecc0176c3d1ae40ede58fd08508425e3f08705c1874a6436e0914352d85b100ed9cfe9af232fb34f2ddbf4be0cd971c0 SHA512 3f09ae08fcce834dcfb9fd0124c7215026144a0253248a7fd4a098ea6a8ed8cfdbc2ac0c305938963896c05a223609919a5d164de2c0bdb59ad1e50370f4d9db
MISC metadata.xml 354 BLAKE2B d9752402ef9faeeaea114dbb4500672b2f4afd3c76787723c7b8037de18bb97e76079da1365905aa1b13d6852302632c7bcb46b8a685c90b5d04cb479c066c21 SHA512 bfe13a6ade46439d252cf3848a006b05ee8ac053fd80b091d0f01a2a67fe4fb1018ddd15d3a410f9061e59001f1dd448caa0a063e5fb5df180864cae830d02e2
diff --git a/dev-libs/libcbor/libcbor-0.9.0.ebuild b/dev-libs/libcbor/libcbor-0.9.0.ebuild
index a48480af6a93..e232a2794eb9 100644
--- a/dev-libs/libcbor/libcbor-0.9.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="+custom-alloc doc test"
BDEPEND="
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 637463ae0f5f..5624459f9d26 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -2,7 +2,7 @@ AUX libfido2-1.7.0-cmakelists.patch 867 BLAKE2B ce559f70b1bc22731b16ddfd30b4a0be
DIST libfido2-1.10.0.tar.gz 591372 BLAKE2B a4144ede774b90700f4cb1371b2acdba9d3ca8e6e0d68c5670986a1825635ebeb75f03c930da14a4539a9e075bcc5f7cfde7fbcc05e1fa383902ac6739225789 SHA512 ba03e25d3f42f11cec74dee48c853ae35d03600f24ca06d2b751840408a132290fe22461372ae42ae31419061a63d9908c20a2c0cf3c0c9c8dbc46c34916784f
DIST libfido2-1.8.0.tar.gz 535947 BLAKE2B 48ca29fc1b582b4c915ce3dac2b3c24b1c71b144681f77f13059a599eb5e38b263442abecacad495e28a6fea63fc98c142a32939bb49a521b6a6a8d4ad0f1ff0 SHA512 dbea52a80068323e9945ef7a6e93ab1438bc4347390fc91694a94669900d4ce4abe95e1b6df90fe8b6b2dde6b5d28d9dc0c6b022c24ccb661f28c30c33417999
DIST libfido2-1.9.0.tar.gz 576088 BLAKE2B 19d2933178011aebf11b44e12550518937b204a40b781ade565bd2852de6d1bbb88dda90f612e852e4561b7a9db6927df9d0a9f0b4c511208f3ab648b2cf1a9f SHA512 99edf9c52a871ed5dc3ab41ac07ca8a22670e7527c48ed69c096f001651e1e714bc3f1f55e22003cb66670fa4e851095834c2acd0e5b31887fad46bfb9f4b089
-EBUILD libfido2-1.10.0.ebuild 1000 BLAKE2B f1eea78f4ce96ea19e1cad14cf37b225492c155c6c3d05a847a70861bde468941327ee18d614660c314823e5ebdc2cbfc2891a8a699825540eaff47b58050583 SHA512 3bac7d4fd67186bd36ef7c6d2fa1ad5865ce7b39e83f462e6e2b60a94331b3a4d8ef55013213ee1001041247518e6d82598959cb23b850784bbd31f24f644e9c
+EBUILD libfido2-1.10.0.ebuild 1007 BLAKE2B 785a20506432e84e5a868327ce7b9953556fc6a96efdcf17609c513fb5676b3b45a81dd1efb05a66a9a42346178ae70c92eee11163855e6bac545b906127abfd SHA512 7d1be3650c7b09ef3d888022664eff9c2610bf767338529eed6ff48344e42a80c4abb4d79908761c9520985b0935fa55035359753554455b3308195f1b99d5cc
EBUILD libfido2-1.8.0.ebuild 995 BLAKE2B f072b7bb688f75979af0fab6e848c8e6c654e87112a2cd899663eb06bcce7ed9df8ca902fe534300ad8e111c1f1c49c3612cc6eb44fc34ffb5b4f51e6e648e4d SHA512 85a8f6da7d4c485a1d8495f97866aedb9c5f2b63f2f91c8eb13801bb4b233a8038b6f78af05123d890187c2d2c182e3a1807f8e6c8a7eba8c5be025134a4281a
EBUILD libfido2-1.9.0.ebuild 1008 BLAKE2B 72b7acb5728033a9254856404e7f6b34e0c61a57a4b88e90297c9a92b9fbf1aa7e66aa9d4b3a1d011f7cd4c4b4aa42898ab4b8fe526da42852710246c799ae66 SHA512 a74fa35fb706e77e353a94c73242db6f733e62a8d98fdbab428a173e8f36cf5685133308b165aa91cd3690559e8085c90ca9326d2eadf51fbb8abab955382dc4
MISC metadata.xml 331 BLAKE2B dbe587eb713db674febdaa58494979a44bee5a40345ef37ce67fad22e629e73948fd7e66c3109e010a7f2a51c769f5079f70ee3812098b4673eb9a5b7e70e6fe SHA512 355fd46051ca69fa79ea4953a361f8981cc75c0eb77d1e4b9315ffb3de75662660e7072211967d452dbf2ed3d3ba31baa355cafd8dae1c13e245620b0c1e7f86
diff --git a/dev-libs/libfido2/libfido2-1.10.0.ebuild b/dev-libs/libfido2/libfido2-1.10.0.ebuild
index c33a15058ad3..97e040b99ca4 100644
--- a/dev-libs/libfido2/libfido2-1.10.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="nfc static-libs"
DEPEND="dev-libs/libcbor:=
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 13616be25e59..46bc67af4543 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -3,6 +3,6 @@ AUX libnl-3.6.0-test-fixes-sandbox.patch 5394 BLAKE2B 96f4c5f9f0eab96f164aa04a68
DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
DIST libnl-3.6.0.tar.gz 981921 BLAKE2B 4fbc1f6284dfbf0aaa855dfc3bb9774327254718257cf162c14574ece6b0da20f03a587830b21a2481d1da6e9c90482d71d8f9308f1eeafa605c90d0847a838c SHA512 7d1190ce94f43f5b18b1f7909221ca034d4ea5c8ed5735dbd27224d03e7f95d3c4e8ccdb611e33b58007729a21bfc0e23adc8758b112c712355664d87a81ce1b
EBUILD libnl-3.5.0.ebuild 2381 BLAKE2B e054756ad522c3cfe593baf45854e6e4a8e669d26ec2027adf30cb537442f14d77b06493fdab911503d4e08045b1c2c9c4302ce9f892e17e221e77d82eabf2b5 SHA512 c99854fbf768e9e5f140fa8f4c88a1549272ba3c9a8200318016b1dbcaa03502527caeb1d26ed917c38958216eb0f3141a722bfc543c9a969e477fc7febd68a1
-EBUILD libnl-3.6.0-r1.ebuild 2630 BLAKE2B 6afda5bb02642a2f7a57eb502a518d24577c8345d3ec6b78b29c8f092b6ffb6da09c186267a79cc8a87be47224157846db2af1a210428278046329429be2e729 SHA512 398b835a8fb7bd3860dffc6fbbd64678d22a7207ced7c950b8e0f91b80ad36da4dfadd462056569f6c774c6f215675b1a1fa1e6bf75145bea0e5058852d27e41
+EBUILD libnl-3.6.0-r1.ebuild 2637 BLAKE2B 147ee4f4e9e1aa98757c25118761bb2ca9910ee0b07c3452c026d177c0e4a71ac70a55fca49fe77b6d3ff6d1c9074277e1116593ce4a9bc9d349ab58da0111c5 SHA512 e926f00e85bdfa2f115a55ec22f8de09f842dad726c8b0298c445258fb173f2e66c3d54bd7ede5266f248b33037c9b19c0a08ad01fb2a0d61ba3947d78bd1d7c
EBUILD libnl-99999999.ebuild 2387 BLAKE2B a353e62759550ccf4ef6423c72679aa9a233f202cee3bb0f96579d8fb69347a1c29ededa8facc67989c852c746307bf3fef6adb1d846c10b74ee91a36c8164f6 SHA512 284f5f2425994144ee479f64a99560b398c77771ba4c747bc1648411d8d68b345cce7c0fe578965910c18eedccb9e245660a8983bae8db49c9744cb2a0fcf8ed
MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387
diff --git a/dev-libs/libnl/libnl-3.6.0-r1.ebuild b/dev-libs/libnl/libnl-3.6.0-r1.ebuild
index 57e88da16908..9d5b621e07b0 100644
--- a/dev-libs/libnl/libnl-3.6.0-r1.ebuild
+++ b/dev-libs/libnl/libnl-3.6.0-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${LIBNL_P}"
LICENSE="LGPL-2.1 utils? ( GPL-2 )"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="+debug python test utils"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 108140260a52..8d43d85949f0 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -16,5 +16,5 @@ EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b
EBUILD openssl-1.1.1n.ebuild 9296 BLAKE2B 49772a36ac8fcb336c1b4b6effa42447c0d2b5d4fcdb018ec852f2a79d7e48e026b4c313b76d2adaefdb38f1277d5d972af1c9bfa9b1ff44ff29df7a23ab4438 SHA512 cfd85bf40c59048231d5a302ebefb1ca9888e6f619c91ac28b4e7c26a1f4cff3e2c3a652bdf8cf8cb113347b0bf49db7ad82e76908fbd4e149f1ed971dba298b
EBUILD openssl-1.1.1o.ebuild 9304 BLAKE2B 72ebe4db297705ddd4b1e997758daf8bc80f3198cca0ec17f7f18b6880ee84a332c91f72b703c788b0ba6840a02d76bfa30510233e37908112c2fdc14544433c SHA512 bc183565e800c1e1f18df35836bdb20b5f26e21734fe4cf77d218cf161ce8b614af68ec3e85f824d0baab45936c0700333a2146874490647f0db7c1ba0ea0556
EBUILD openssl-3.0.2.ebuild 8461 BLAKE2B da0438ee498a7c718678596c00517bbbd15af8350d7d9fe5c0ca7cf5b0009019022a6aac19ee9ddc77b46089262778098633a2360d52b1d7aec1865da0394844 SHA512 18ca4c6e0944fbe12afa68b21475d947a7145b874c6a7a336e564b18f3688e45af2941ce1008e800eb053f1a7133b748bb6d99ccdee8f0dbf3c839ce1c4aa417
-EBUILD openssl-3.0.3.ebuild 8461 BLAKE2B da0438ee498a7c718678596c00517bbbd15af8350d7d9fe5c0ca7cf5b0009019022a6aac19ee9ddc77b46089262778098633a2360d52b1d7aec1865da0394844 SHA512 18ca4c6e0944fbe12afa68b21475d947a7145b874c6a7a336e564b18f3688e45af2941ce1008e800eb053f1a7133b748bb6d99ccdee8f0dbf3c839ce1c4aa417
+EBUILD openssl-3.0.3.ebuild 8770 BLAKE2B 9d0f113b0921f15e45b3e17b0d07aa8094a481f03d39d4ac35d6a4d2775123d7a6ee419f0c97d01a4b87e02d8534b634cfa8d8c956ac7d76760567ca3e0275da SHA512 41957dea5b1d49eca541d52070fefb738a7d373a44337fe322a2ec09481bff71f0d11935b0e64212d892f3b410249187ec1131cdc21dabc094712ddeae06374f
MISC metadata.xml 1585 BLAKE2B 104cd90ff54c6789edddb7f433252731754cb600ea663c6da66b28ee988541b9fa5f8b3086684841946ca8c4928c8768a1ed11d39419a26c039da840912a66ae SHA512 13cf734d5d1685135e0f1c488af0e4a2f1295eac33c45d65b1dbdd1b04100b1ca5f3d5d1c9938f4100f8df548ba739c9ade56c72176de92cb7f9c2cc2da818cc
diff --git a/dev-libs/openssl/openssl-3.0.3.ebuild b/dev-libs/openssl/openssl-3.0.3.ebuild
index 2ef0aaed3200..514ea991ddcc 100644
--- a/dev-libs/openssl/openssl-3.0.3.ebuild
+++ b/dev-libs/openssl/openssl-3.0.3.ebuild
@@ -3,27 +3,28 @@
EAPI="7"
-inherit flag-o-matic linux-info toolchain-funcs multilib-minimal verify-sig
-
-MY_P=${P/_/-}
+inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
HOMEPAGE="https://www.openssl.org/"
-if [[ ${PV} == "9999" ]] ; then
+MY_P=${P/_/-}
+
+if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/openssl/openssl.git"
inherit git-r3
else
SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
- VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
fi
+S="${WORKDIR}"/${MY_P}
+
LICENSE="Apache-2.0"
SLOT="0/3" # .so version of libssl/libcrypto
-
IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
RESTRICT="!test? ( test )"
@@ -31,7 +32,6 @@ COMMON_DEPEND="
>=app-misc/c_rehash-1.7-r1
tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
"
-
BDEPEND="
>=dev-lang/perl-5
sctp? ( >=net-misc/lksctp-tools-1.0.12 )
@@ -43,17 +43,18 @@ BDEPEND="
verify-sig? ( sec-keys/openpgp-keys-openssl )"
DEPEND="${COMMON_DEPEND}"
-
RDEPEND="${COMMON_DEPEND}"
-
PDEPEND="app-misc/ca-certificates"
-S="${WORKDIR}/${MY_P}"
-
MULTILIB_WRAPPED_HEADERS=(
/usr/include/openssl/configuration.h
)
+PATCHES=(
+ # General patches which are suitable to always apply
+ # If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
+)
+
pkg_setup() {
if use ktls ; then
if kernel_is -lt 4 18 ; then
@@ -69,7 +70,7 @@ pkg_setup() {
[[ ${MERGE_TYPE} == binary ]] && return
- # must check in pkg_setup; sysctl don't work with userpriv!
+ # must check in pkg_setup; sysctl doesn't work with userpriv!
if use test && use sctp ; then
# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
# if sctp.auth_enable is not enabled.
@@ -81,11 +82,11 @@ pkg_setup() {
}
src_prepare() {
- # allow openssl to be cross-compiled
+ # Allow openssl to be cross-compiled
cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
chmod a+rx gentoo.config || die
- # keep this in sync with app-misc/c_rehash
+ # Keep this in sync with app-misc/c_rehash
SSL_CNF_DIR="/etc/ssl"
# Make sure we only ever touch Makefile.org and avoid patching a file
@@ -93,21 +94,21 @@ src_prepare() {
rm -f Makefile
if ! use vanilla ; then
- if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
- [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
- fi
+ PATCHES+=(
+ # Add patches which are Gentoo-specific customisations here
+ )
fi
- eapply_user
+ default
if use test && use sctp && has network-sandbox ${FEATURES} ; then
einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
rm test/recipes/80-test_ssl_new.t || die
fi
- # make sure the man pages are suffixed #302165
- # don't bother building man pages if they're disabled
- # Make DOCDIR Gentoo compliant
+ # - Make sure the man pages are suffixed (bug #302165)
+ # - Don't bother building man pages if they're disabled
+ # - Make DOCDIR Gentoo compliant
sed -i \
-e '/^MANSUFFIX/s:=.*:=ssl:' \
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
@@ -118,15 +119,15 @@ src_prepare() {
Configurations/unix-Makefile.tmpl \
|| die
- # quiet out unknown driver argument warnings since openssl
+ # Quiet out unknown driver argument warnings since openssl
# doesn't have well-split CFLAGS and we're making it even worse
- # and 'make depend' uses -Werror for added fun (#417795 again)
- [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+ # and 'make depend' uses -Werror for added fun (bug #417795 again)
+ tc-is-clang && append-flags -Qunused-arguments
append-flags -fno-strict-aliasing
append-flags $(test-flags-CC -Wa,--noexecstack)
- # Prefixify Configure shebang (#141906)
+ # Prefixify Configure shebang (bug #141906)
sed \
-e "1s,/usr/bin/env,${EPREFIX}&," \
-i Configure || die
@@ -138,7 +139,7 @@ src_prepare() {
-i Configure || die
fi
- # The config script does stupid stuff to prompt the user. Kill it.
+ # The config script does stupid stuff to prompt the user. Kill it.
sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
./config --test-sanity || die "I AM NOT SANE"
@@ -146,24 +147,28 @@ src_prepare() {
}
multilib_src_configure() {
- unset APPS #197996
- unset SCRIPTS #312551
- unset CROSS_COMPILE #311473
+ # bug #197996
+ unset APPS
+ # bug #312551
+ unset SCRIPTS
+ # bug #311473
+ unset CROSS_COMPILE
tc-export AR CC CXX RANLIB RC
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
- echoit() { echo "$@" ; "$@" ; }
local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
local sslout=$(./gentoo.config)
- einfo "Use configuration ${sslout:-(openssl knows best)}"
+ einfo "Using configuration: ${sslout:-(openssl knows best)}"
local config="Configure"
[[ -z ${sslout} ]] && config="config"
+ # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
local myeconfargs=(
${sslout}
+
$(use cpu_flags_x86_sse2 || echo "no-sse2")
enable-camellia
enable-ec
@@ -179,19 +184,21 @@ multilib_src_configure() {
$(use_ssl ktls)
$(use_ssl rfc3779)
$(use_ssl sctp)
+ $(use test || echo "no-tests")
$(use_ssl tls-compression zlib)
$(use_ssl weak-ssl-ciphers)
+
--prefix="${EPREFIX}"/usr
--openssldir="${EPREFIX}"${SSL_CNF_DIR}
--libdir=$(get_libdir)
+
shared
threads
)
- CFLAGS= LDFLAGS= echoit \
+ CFLAGS= LDFLAGS= edo \
./${config} \
- "${myeconfargs[@]}" \
- || die
+ "${myeconfargs[@]}"
# Clean out hardcoded flags that openssl uses
local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
@@ -219,24 +226,24 @@ multilib_src_compile() {
# depend is needed to use $confopts; it also doesn't matter
# that it's -j1 as the code itself serializes subdirs
emake -j1 depend
+
emake all
}
multilib_src_test() {
- emake -j1 test
+ # VFP = show subtests verbosely and show failed tests verbosely
+ # Normal V=1 would show everything verbosely but this slows things down.
+ emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
}
multilib_src_install() {
- # We need to create $ED/usr on our own to avoid a race condition #665130
- if [[ ! -d "${ED}/usr" ]] ; then
- # We can only create this directory once
- mkdir "${ED}"/usr || die
- fi
+ # We need to create ${ED}/usr on our own to avoid a race condition (bug #665130)
+ dodir /usr
emake DESTDIR="${D}" install
# This is crappy in that the static archives are still built even
- # when USE=static-libs. But this is due to a failing in the openssl
+ # when USE=static-libs. But this is due to a failing in the openssl
# build system: the static archives are built as PIC all the time.
# Only way around this would be to manually configure+compile openssl
# twice; once with shared lib support enabled and once without.
@@ -252,7 +259,7 @@ multilib_src_install_all() {
dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
- # create the certs directory
+ # Create the certs directory
keepdir ${SSL_CNF_DIR}/certs
# Namespace openssl programs to prevent conflicts with other man pages
@@ -267,15 +274,16 @@ multilib_src_install_all() {
mv ${d}/{,ssl-}${m} || die
- # fix up references to renamed man pages
+ # Fix up references to renamed man pages
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
ln -s ssl-${m} ${d}/openssl-${m} || die
- # locate any symlinks that point to this man page ...
- # we assume that any broken links are due to the above renaming
+ # Locate any symlinks that point to this man page
+ # We assume that any broken links are due to the above renaming
for s in $(find -L ${d} -type l) ; do
s=${s##*/}
rm -f ${d}/${s}
+
# We don't want to "|| die" here
ln -s ssl-${m} ${d}/ssl-${s}
ln -s ssl-${s} ${d}/openssl-${s}
@@ -283,7 +291,8 @@ multilib_src_install_all() {
done
[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
- dodir /etc/sandbox.d #254521
+ # bug #254521
+ dodir /etc/sandbox.d
echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
diropts -m0700
@@ -291,7 +300,7 @@ multilib_src_install_all() {
}
pkg_postinst() {
- ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+ ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)"
c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
eend $?
}
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index e8f8f5446c09..75584d6ffb86 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,4 +1,6 @@
AUX pkcs11-helper-1.27.0-nss.patch 614 BLAKE2B 68db71f025aebd620d278fa3847b1ead5645220c6a1b0f16f98b2e9f22ca6153b133ab5d8c236a24bbc6527a4e2ae084ea58a1c3c9cce7feb20a32861859a56b SHA512 9e6787822d003e0f6d959ce02308e23231dfb75e711cbf1887684e8dd479f10da5d123e47ed48ace84d6d8eb04754f0729c3847080074f34a49a4c484ad1a618
DIST pkcs11-helper-1.27.0.tar.bz2 422425 BLAKE2B a9fd7ef04dce1abbae57b09a12b4be560465ae0cf2910443332882967d00b6380c62944820aa9580e101459d1c35edaae68cd7abbafa308a8b152921ac32f04c SHA512 5799342cb755dae8b7ba0880d652e9d4b4f1e52a74043015e1185e1e059326cb2689bb51957db98060ac2257dee34e2f047dcf3d52ad59fd49b91fedcfc5332b
+DIST pkcs11-helper-1.29.0.tar.bz2 422549 BLAKE2B fec72ac82f1545fc50f80b5b28db12906df32fa3bc65f80541d8bee7f1d1c8062f1f0516344237424022c01d4f390e8a72e3e0262250f3b6c51df92c768d81ee SHA512 c530f5a4b5826a02bfe787a1293a7595d5a0d6348daa16675bd10c6d6734b1f24a3cc73b5b89433cf1edf8815f8b7298fdfd1ed686f096bb5edfb425e9430eb2
EBUILD pkcs11-helper-1.27.0-r1.ebuild 1071 BLAKE2B 4d0d25826aa7d793940481c06936db32c76079afc1a070b13f076fe7f04ac1d6aeb3087f3fe3866b239083ed85a97c3fcd92c4457bc9aef2ba08eb3935a0616b SHA512 d99c56df4a2d9c652cf14edca110f8c43c496bbee70e85f1206e4d670739985b63216427f586e7309e4d35b5e71db298b71556dfde176fdc429cd545f31cfa23
+EBUILD pkcs11-helper-1.29.0.ebuild 971 BLAKE2B a918ddab756b30c0850765cef5a50c5dd745061852de581c19a8e35e0dd32ae177790b345b0fb18c306b136d8edb50dd368529773b97736d89286e4841456a83 SHA512 4eb9576ebdad75f71d4fd4b5ae3229c6d240549ac9fe982d9b7065e9c8716fd0a0dc5348851c151f27f4f14986473220c5e18afad1e2fe5c881776f7eaa4ec5c
MISC metadata.xml 435 BLAKE2B 7740f428a33cecd516c6cfb96de878c8080b2cba0b42c78cc34bac42d128619cf4a42b966aafe30bfc13a045ad0017285ecff9d60d237eadd715fcdf6029c8b8 SHA512 2a9c9d99cfcac14b7c201d5d931f5d1fe0d544328f32db5048a9cd15f0a99ef4016e4b5ec4391500cb5a9e3c00205c72211c61c1fc13cda330faf6b7eb9eeea9
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0.ebuild
new file mode 100644
index 000000000000..c8b02fd6835d
--- /dev/null
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="PKCS#11 helper library"
+HOMEPAGE="https://github.com/OpenSC/pkcs11-helper"
+SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc gnutls nss"
+
+RDEPEND=">=dev-libs/openssl-0.9.7:=
+ gnutls? ( >=net-libs/gnutls-1.4.4:= )
+ nss? ( dev-libs/nss )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ doc? ( >=app-doc/doxygen-1.4.7 )"
+
+src_configure() {
+ econf \
+ --disable-crypto-engine-polarssl \
+ --disable-crypto-engine-mbedtls \
+ $(use_enable doc) \
+ $(use_enable gnutls crypto-engine-gnutls) \
+ $(use_enable nss crypto-engine-nss)
+}
+
+src_install() {
+ default
+
+ # bug #555262
+ rm "${ED}"/usr/share/doc/${PF}/COPYING.{BSD,GPL} || die
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index aecafe812f9f..c24f59a0792f 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -1,7 +1,6 @@
AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43fdf1db53cb0139f3cab5eb8ca67ca30dfa97058e4db4618d27ab2cd642e205349f5f70970fd2a4961a018aa7e1c5dac SHA512 1a155b10e98cdce8659a9308ac70e8114361a0062a1af469dc774b5d32bc00b5f1aa0e873fa5061625527ddeb006fdf29939b1899939a193d8724e491dedba10
-AUX poco-1.7.2-iodbc-incdir.patch 321 BLAKE2B 640c0b69e8c925d48da6f2bfc59cd2c77a02662ad1d8d447bb8c7ca23234ca1859c4aa9497d5703ef5f675d9096606254a9142770c6fffa4334cf71b1ca6953f SHA512 f3a0b4032fd4f71f0281d58c00241b1cd2f92da1a23a8501c420949621167d1fc7e2a2ed3ec48b6f75d35569f6443e3391eaf19a8c8fbd17e24d1cbd9ffd892d
DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73
-DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
+DIST poco-1.11.2.tar.gz 10935312 BLAKE2B 66b4cdb6cb4b5dd4f5f0eee744e1d147d66e98561ec4286ed09693b638d565fbf084c3e40eff3f6a9a88cff167b1d774da08e8c8424986aefe13d029a540afe2 SHA512 3f9e46dbfb0a85f19389b269725cb6272172d993d8239f13da8110c0c6ce9ed2b6595708d5dba91a027292c74358c87da988e22587a74011e84707816a6a277c
EBUILD poco-1.10.1.ebuild 3785 BLAKE2B ca9eeac5cedc288c23fef5400d2428704b09aa707fcdbe02d12d9905caf3d72beed144a1588e6a440c66f59751f7b7e3d9e81cbcc86acbfaee0dd27222e54028 SHA512 f67bb94b6b08ed7f5d17d3c3b6f7186d7d7bd834bb8eedf1db045e001d683ac8ddc3be94ef3e2e1e0a27c65ee5b88525e46208907dfda88c7b17fa5d4c1261d6
-EBUILD poco-1.9.0-r2.ebuild 3763 BLAKE2B aba656a0393b241efaa6f94568d799b75a6a1aa2b65157b59bb2ef3f74e2cac2a587ecdc989d994050aaadcb9e5ec3febdbd685deb3556ffad07dfe6aacc950b SHA512 0bd3e60116ee8aeae272edb85a5e16134ad4e4b529b5008ef9d522dc46977340d54b3cc11b2a35b173d6b5b234c7d8c7329b733069eae3bbec04e3403531d3e7
-MISC metadata.xml 2584 BLAKE2B 666f63e00f654571eece88d1d4679673323570c5b68e4dda840ec94413461307a1b2eade7acd89852e0bf5163cafce9ed7d75c55fa3be7071a2d9445ffcbdca4 SHA512 c6526c758b0d06cc5b2b57b56f6e61f92950f88f62e38967948edcaa2b3fc618836b667ff57dc9b8c52e71e5921b14181376c79a8cfead7e607cfbc554f73dfd
+EBUILD poco-1.11.2.ebuild 3848 BLAKE2B ca6fe9af50bd946320f9b23a15291fa06c814ec4126164d5f2fe35a1c97d7dfbbb3abe4f4fdf933eda26308ccd235aa491a3b132b175fd47c46555f07db6b444 SHA512 dd13641573bcb59c18976eedc4ec09effe01211a5ef474365c6ca42ece500f2562e7084a67f4d4e693dbedff27a8174f8550a34e40e5819c9270e4a60698216f
+MISC metadata.xml 2644 BLAKE2B 397adfc4fd51bebcd784cea4e8cb99f7eef7013ccb5b391202d22816bd5831641ba7e22f2a5350fd8cf6103d810c1553e279ef37b23d99135fe9637c8ef46308 SHA512 2d6cfc831e51575aac6f6ad43bb70c7e71c39ea8623d05042afa34496213df2016977c962cfc65e215a3fc698e12cfdd60e9badeafdc2832bb30e830741a5efb
diff --git a/dev-libs/poco/files/poco-1.7.2-iodbc-incdir.patch b/dev-libs/poco/files/poco-1.7.2-iodbc-incdir.patch
deleted file mode 100644
index e41d8f390d9f..000000000000
--- a/dev-libs/poco/files/poco-1.7.2-iodbc-incdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/FindODBC.cmake b/cmake/FindODBC.cmake
-index 9e229ed..5d79c7e 100644
---- a/cmake/FindODBC.cmake
-+++ b/cmake/FindODBC.cmake
-@@ -16,7 +16,7 @@
- find_path(ODBC_INCLUDE_DIRECTORIES
- NAMES sql.h
- HINTS
-- /usr/include
-+ /usr/include/iodbc
- /usr/include/odbc
- /usr/local/include
- /usr/local/include/odbc
diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml
index e87aecd0e1e0..fca24ff1efb4 100644
--- a/dev-libs/poco/metadata.xml
+++ b/dev-libs/poco/metadata.xml
@@ -31,6 +31,7 @@ done quickly and working on the features that make their application unique.