diff --git a/Manifest b/Manifest
index c4aaf8627d63..23af8c691843 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29586 BLAKE2B e1dd3563898199a7d3dd8213e531f3063d5a51026273fb29328fa073073f680aee49aa830a8667c73c8a554d32b24ad3e1ce68e702450cc0d959bea746d77d9c SHA512 a949422042f11efe5eaa2ded286b1e9d89619612f5d9218194479f82990c42d58ad546f7c4b8e3419cc9364f0ec840749c49b9f1e1823c063f0c7419c085dffe
-TIMESTAMP 2022-07-12T04:39:47Z
+MANIFEST Manifest.files.gz 29625 BLAKE2B 3cff2c99f4717f9ba4711a228adfe6d9c4279dab2a11f24b560c9508151e8994cc5cd53e9adcaa7f86224cc57a76bb4b8580e2c0a17a41e7dbb50d50aa4bab7c SHA512 c17464355ab37e88ecb515838a08c92695028df053e37fd1c971b53ddd9d545e65cd60278814b4c72dd909d0dc54b49108197119b8e0da7960d3894f2214b406
+TIMESTAMP 2022-07-14T17:09:58Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLM+xNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQTeZfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAkxg//eKjoN8oQTsf9NYBXbFiOSN5pQH0G5VcZjAjKZXP4ve+Mbk306N9cmvAQ
-GaJ2uFQhUFOTm+9miJ9/b37iqQeRyuKJGnpDuRyrUlQnGOk9xRRf+LHbaiNRnR/D
-4XyMs6ehm/1Qu0mWqCpoc/cODMPWS0cpumWiVQhqaCAHpKT0UaoU9l9GMld2kfuf
-M3ciMBg7zTfQIVkVHY1+zeDH+rKLixmkex94F7Sch8hb8aMPatZ+Zwiex6BR2Ld8
-jWV/BGsUEkGWZ17HdvPyYf9mlQdySZqBNpyK1CjvqH78UFbUFrNxRhowIMLsJZb/
-o5jLJQH4qiI7y/6esZd74NhXQzVgZ5IF6p4NtqZSf/s2p4MqLEmj6BBT0lxu8egw
-Rtg8+PPVUwdn5ZcgVEVc1DX/v+XKK84ezIFxE/QhyNCFZjZDhy2guCmZ+tKVFfT2
-yiN9Yp6L2+FYnT8pHskUJWZfZeEmrU4d46+MnBXJDXzeCHhv3mOVPTIgiDPVr9D1
-gsi5MmI2I5aI3jupNGgbZccMY23COwhDFPzbJxeX0C5wfSmgY4qj0tC0Rg2z5bTo
-4KE80120QUg+tOT4Ef3lKKrveq/TbrOEgcB7sbn+b8ZFbZcVUHLR2knDGjAq1ggk
-LM9INtkdGZuCcNPr3QwgKEH+ye1u8DmdqT6zNEXghSJDbbKm8x8=
-=4Yb8
+klAacQ//fkahkB5uyFp1TCGf6gITtFEh4utptZrWD/ML7J1HBab8diSQrBieXG6I
+aUfa/NW2W0QuPy9ikcqJIMJn0dwfUsYSNWXVrLzou3J155Y5vaVd8AGYFjtkqr6B
+Cki9cBqdYQvERGyBlsnj2aZtgfwumoM9Hy6V71BN8Qs+O8nEssWsgY1xPJV4bJ5Y
+y/9wuyMJ17XKClzWF9XXgEK3mi++XWSOuTSASLPpoZWraB8+8V/zP3nZY+INidb7
+kHKXf6Dpbup4qbY3K2CUHritUGTVpn+ZWgI3f9JsO2tf4cCGNhxFBooqyX4RA0Sy
+zJlJ+yJLBzKFbXe/sPTdBUDVnvI7iECQmAAjxQpuPe10bo8D78xsN/HtJEzDvSw2
+RzI2UIMp90LIRZrslBnDojSYk+lTsudEiL+mQRuapwb5m8CssSbcpWn2JWQDpdYd
+NnsFiy7UuYu6NcbjWMZKZnkQjvkLLdoLb3gRSKCYUOmMMGyTxBQYzKE13R0ttMeX
+2tPcLHBGbTj9AQQVbL9Hrv16zSAuTYHMrE3sVedswlOQNZr4YwAgeD2OZXMrf4QE
+80opusmSReNsxnjmyrv5sgaQLcrIQVRBHT+ywlTBOQRvHkIMS3v7aVW03/I+0NIj
+QqjlWzIO2aCNqosyuQEUGJQtezgM29StyJLzxItmFVSmIHnjJ/8=
+=MkzV
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 9783fbfcc3dc..111e5e4dae26 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 616d7db9a4fd..f9e47c69af15 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest
index 3b4bc2975fdc..058b5a2f2f57 100644
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@@ -1,5 +1,5 @@
DIST kontrast-21.12.3.tar.xz 125760 BLAKE2B b72d78961d22fc0eb51c0a64f9a7381ef9e87709d9fc24a08c3b08c60ad8102eadbc97943e72b1153f950654f442f97190d1e34c3beb24f4f8ea070f923dba55 SHA512 36d084f0801d393a0d7bdd771d23163a192e6d0e50f6499b9080e3928f5f3982dcee81c3e3453f8de2ece721c508479928fdff4a971cfef945acadd917e19581
DIST kontrast-22.04.3.tar.xz 125860 BLAKE2B 78b87ebfb0958ce7bf2abf7a70ada000f959aa2cd648ebaf70ffef5500458bf1f9c42433176caa1ac29ab5b0ed51452092c796f679d7c56e4188e2a746169a05 SHA512 e77b2b129f115d2cf319a2a5f6b56bc576c00c506b542cc6239098245da17b966a71caf05f0868af7d5f3807be033bfc552b9fd1856046889363d1012bf13efe
EBUILD kontrast-21.12.3.ebuild 770 BLAKE2B 19f1755af31903f1c391c4ab4e0c15d12db3e3746804540500362d5d756ad040506411529e1d2bf57006e4b06836b4d55f08007558174f314ebabab81934b9b0 SHA512 e4769b4221d09ba72d5c0f4020f10785e463833f4af43847beb7500c852eba18b3e0e4b2284a7fde325801d9d174360802ccae64db4cccb042e471f87483dc22
-EBUILD kontrast-22.04.3.ebuild 773 BLAKE2B 01d8e6de8145c28430bf3c7672d289c35478686d762e7277fa39244b33f20c044416a216ef4eda4a620165f6a21d2290565b1d2c7aa81a75244e58c5d6ee73bb SHA512 cc334b996a49b310ef9cbfa41fd8005d119baced29442bd9e28aca6f2e646d621fdfcc80b2b1f0e95db47e4a76ffd8ef5109aa7ac9b87f3de0d15d7ef39ce343
+EBUILD kontrast-22.04.3.ebuild 778 BLAKE2B 3649faca8a063b7c6900acef07185f697c195e07ee11362bffd72a320be5509a1d14a3a30021a0de3826d22218e1d1fab2f78e114fcdd77c225c964a44765887 SHA512 9c691be7cba2e5dbd378bde67f4aff2aac09fb0f329d930e7e20217db053a68e68464c6f6ce904d7d95d566b5f4ed203eab2ca693e83bde430f6c9acfaec8f4e
MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-accessibility/kontrast/kontrast-22.04.3.ebuild b/app-accessibility/kontrast/kontrast-22.04.3.ebuild
index ca3b51371946..28131472e570 100644
--- a/app-accessibility/kontrast/kontrast-22.04.3.ebuild
+++ b/app-accessibility/kontrast/kontrast-22.04.3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
KDE_GEAR="true"
KFMIN=5.92.0
QTMIN=5.15.4
-inherit ecm kde.org
+inherit ecm gear.kde.org
DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible"
HOMEPAGE="https://apps.kde.org/kontrast/"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 957089bce1fc..54923cc644c5 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 b5727f4fd71a..f411ca3699f0 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,12 @@ DIST aws-cli-1.25.17.gh.tar.gz 2226115 BLAKE2B d07a9c7a8e13019fd728489d27465497b
DIST aws-cli-1.25.22.gh.tar.gz 2228459 BLAKE2B e9ca58f6be9d5836b2b4d8ce51154ecd9dca3e443a120ff6ab3475b0777ca5e50c17a3c30641c57df1df63cc065fc0316b1e847b695bdfbe49a0a5b330912a74 SHA512 328303792a75c9f44c7e37e825ffb81aa2a071d4ae18b21c31f2c9abc5e0ae8f3ec079725847cd731d4cc49b5064a0244129176789f4ce0865e6d8cae0dda1e8
DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92d93d831301b0a46ec7dab1ac4b1bdeda9d43f9f6cf20de153f9df3d6b66b0d9ed9754ee4c27b79aacf9d9b8d7e11c2f SHA512 56f9d02d54d20624944c8749860d3e92e7c0887b1c6f524545394ad590ad5ab63752abf25ecba400cfcb9273bdecbae110e4811804e287f15bdfde0d8638adff
DIST aws-cli-1.25.27.gh.tar.gz 2230639 BLAKE2B 80101fe2e2b58e7b626c546178ccab45108985d827db2b162d86e4271d5cb105dad2dfe36b807e88372af9cf14b706fda8928c0ccbbd97a49f2f1cf73bbff74f SHA512 2e88950c40dcf64b6911ca02ede7d9790a0ff3f3beb4c4fe3d4087b82100d49df00a90e254c9ff58e09132e4ab79ac3861480eeb1a3603c95aba0093fdb90554
+DIST aws-cli-1.25.28.gh.tar.gz 2231756 BLAKE2B b10d54b79bf16d88c4bd0256a970a640e9d64f903cdd250899f86a73cf6bb4de43d6ad83bddb24fa87684cb50b6c8f286553a609a0a04e8f18dd3428efa1f577 SHA512 a6a1f0ccefc4d9a6dde9efe8908f74b0ba72edcaec1955ebef7d0f7ce8cf4f3cc71fc298ce5120e02173553a22383bcc68fe965c77b77299fbc6e8353ec7cdb6
+DIST aws-cli-1.25.29.gh.tar.gz 2231889 BLAKE2B d487859c3b8ec6cc75f5c8ee54f9b0adf0bf0fdec8f36262533b98454c580692566f49daea867453a7f2b240228149e8d031d903b56809adf4d8f60525e25a08 SHA512 913273355f1907d08bac0b1c3f74aeb13966c1bc44c6499a1655c74048e6e711fe9442f5592344478ee4cf292b9fbe573a91c74c4fcf7481f24249e1001d9247
EBUILD awscli-1.25.17-r1.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
EBUILD awscli-1.25.22.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
EBUILD awscli-1.25.26.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
EBUILD awscli-1.25.27.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.28.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.29.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.28.ebuild b/app-admin/awscli/awscli-1.25.28.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.28.ebuild
@@ -0,0 +1,72 @@
+# 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.6.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
+"
+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-admin/awscli/awscli-1.25.29.ebuild b/app-admin/awscli/awscli-1.25.29.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.29.ebuild
@@ -0,0 +1,72 @@
+# 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.6.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
+"
+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-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 6d8ef9baa4e7..da5c74f20f63 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,6 +1,8 @@
AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
DIST sysstat-12.5.4.tar.gz 1474379 BLAKE2B 73bd4ebc44cc57cd3dba4fecbcd45026929bdbeab6b99c5b13db7d37252dff8da987ee5ac00d545aebdc72f924d0100166e9e876f6684e064f7020f3fa7a7cb5 SHA512 c051f136d404684a21b11e968968e34f0f114b4568369c6449c64b7745269065a3dc492039ded7c415fe39970aca54cc81646589b0959ade43e9be6f6cd4c0dc
DIST sysstat-12.5.5.tar.gz 1481620 BLAKE2B baf4d57eb369d75787e3fce48b29909f90ad5e981996930538ff0a60e668853457440bcea8323cfa10d86f7069b0f4e24e27d62aa09572bd1c9535c2bd730451 SHA512 66ccbf0fbaf783fac3cf2b52daf53a8d5bc6d182a66fa0b2965717cf5afc5e54590f08711948f18806b9b95c9f06a45376a1d18b5081d63a5214bc55f81f5696
+DIST sysstat-12.6.0.tar.gz 1454167 BLAKE2B 84213e1d63e6d44e889e9763c9f47c769805baf65715199b1ddb3472ce68c37b3b46229af43ecf0cd85d6c09be85273e90b96a975304cf2f6695298b3e552630 SHA512 f4d0e0dead0cce84782e985c8074871c45e77949c2bcfefd5642280e961f39e9eaa9f9fc93c013d79deba6e3703626894dd665ff64db72550d1c24f404780a5f
EBUILD sysstat-12.5.4.ebuild 1881 BLAKE2B 1f285b96455f80ebfd841afec6ef75d483e26e1e91ef3987bd39bccf01cb26d4b28492c7aa368a7666dca3b80e7584f94c0749115a91b89e423a661c9568a1bb SHA512 5350bb48dd51622d5e6acb9b72b50531f34e046380af4547e4f232087a41a72aaeafdafad0a63a12c818363931293d2161db0fd085a672d66db760f6d9816367
EBUILD sysstat-12.5.5.ebuild 1888 BLAKE2B 6ed7a47394309e13538fb0253b3adf0b4990d0257eb40df0cc565f295a8e9a6c3eb21c2260c99875fb2797385d58127bb29b3c8ef286ed5f73951a6d927aa699 SHA512 27d6fc1e19ebda59a8b580c567efa9f9552acc6ca93a29182cae934a34fb15d49bd29979389831a822ae04674da0e10c512eb35982516963b9c81e0a3ee45c85
-MISC metadata.xml 469 BLAKE2B 53490577d19dc7183909c56b546aa1bdd4052fab6f7133b31e3d805e3b30c59f83624900a35f85dd6500ba727f3822189ed3f404df4ba144749ca9f3b362dd25 SHA512 3f46f10260fe8e5912cc941286f423e0e554dc94e5f3ad086ff900d84b1e3e0112c4a3a07c2c976b6e3c008c73fa85993f7df736413f96e8fa8d7990ed9d60b6
+EBUILD sysstat-12.6.0.ebuild 1716 BLAKE2B 5d6c5144cf7a00cec9b847339b56238a5871e58d4f3ab59d79a6bc996e10593c9d8873f88e51b8fe013da35d73990269ca9cc0dfef8ff06d467524897e77dee1 SHA512 feceecf862c4537282c0a53f92de03446778c21e8afdf3dc8c27781aa3f316abfc022a88df41e410d6d3cefe70b7cc85223672fb148c9e5394eca5b3d1aed016
+MISC metadata.xml 537 BLAKE2B 96a62a60f2e483414fdbe7c2d2e11c25528e5c3301b50079a32fa91deaeae37f63f7e78c73a4b749c3cbca6d438aaf0387edc655fe0575fd15ee641619529d02 SHA512 57724ab12c814c17c3c44c234409fcca149058ae678d4dd26fac4fdc11eb4234885948862880db038e82190d665a664d6449a22da49f2fe08b42106aac2058e6
diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml
index 2ca06a59ea2a..fb441b90a240 100644
--- a/app-admin/sysstat/metadata.xml
+++ b/app-admin/sysstat/metadata.xml
@@ -11,5 +11,6 @@
diff --git a/app-admin/sysstat/sysstat-12.6.0.ebuild b/app-admin/sysstat/sysstat-12.6.0.ebuild
new file mode 100644
index 000000000000..f3e73e2c3c77
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.6.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="dcron debug nls lm-sensors lto selinux systemd"
+
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="
+ nls? ( virtual/libintl )
+ lm-sensors? ( sys-apps/lm-sensors:= )
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ !dcron? ( !sys-process/dcron )
+ selinux? ( sec-policy/selinux-sysstat )
+"
+
+REQUIRED_USE="dcron? ( !systemd )"
+
+src_prepare() {
+ if use dcron; then
+ sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die
+ fi
+ default
+}
+
+src_configure() {
+ tc-export AR
+
+ sa_lib_dir=/usr/lib/sa \
+ conf_dir=/etc \
+ econf \
+ $(use_enable !systemd use-crond) \
+ $(use_enable lm-sensors sensors) \
+ $(use_enable lto) \
+ $(use_enable nls) \
+ $(usex debug --enable-debuginfo '') \
+ --disable-compress-manpg \
+ --disable-stripping \
+ --disable-pcp \
+ --enable-copy-only \
+ --enable-documentation \
+ --enable-install-cron \
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+ LFLAGS="${LDFLAGS}" default
+}
+
+src_install() {
+ keepdir /var/log/sa
+
+ emake \
+ CHOWN=true \
+ DESTDIR="${D}" \
+ DOC_DIR=/usr/share/doc/${PF} \
+ MANGRPARG='' \
+ install
+
+ dodoc -r contrib/
+
+ newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+ systemd_dounit ${PN}.service
+
+ rm "${D}"/usr/share/doc/${PF}/COPYING || die
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 88c7c80f4b17..2e94acb978e3 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/par2cmdline/Manifest b/app-arch/par2cmdline/Manifest
index 3168ed3ed1a5..a92ca8ecf49b 100644
--- a/app-arch/par2cmdline/Manifest
+++ b/app-arch/par2cmdline/Manifest
@@ -1,5 +1,4 @@
-DIST par2cmdline-0.8.0.tar.bz2 3130388 BLAKE2B acaa366288720d87115ed2b4470ada276ccdff8bc23d7cc8f7c8aab03f9dc992777fd0d67e39b877ed94b77cca679f5c9d2824c778f6481e71c7120a90b45cc0 SHA512 af91024dc80a4af0935c2fc0b867e57a8d3879d93146f52ab62d8bb105f2c637abe46c762302515417691d12144818446932c970d1018d2f10c0d4e1fa455020
+AUX par2cmdline-0.8.1-big-endian.patch 2911 BLAKE2B 749e0f955997d52da1b676d750057724e78302cdf70bff777b1bbf68945faedabbd050339950a96121a4aa197af0b0520a4e9665f3d3767fbacdf60a6baa2f55 SHA512 4186f8b3506dab8128abae28549fd2af4200aa656c65682fe68f02c04c1b0bc45144d24851ff54ef82ac4d40d7f1eb3ae9fae31d426a1092447cee339e3c0016
DIST par2cmdline-0.8.1.tar.bz2 3213343 BLAKE2B 4778fd32012c61739e04a4e564eaedf48527c04b0d83c5467c34808913e81cd5459a6a5bfabe79ca74f520761ebd3592e80b714f3ef45cc98866da919757a176 SHA512 b33ee654bd14269afb02d48175abf183281270c3e0dad9ffcaa0aa69c4271715a85e550d6d56fe5460ebfe9a37dc53b7d2210cd79a6f55d3921dc5dd5972c846
-EBUILD par2cmdline-0.8.0.ebuild 768 BLAKE2B 884c01c68cf08b345dee94c4db74f15648f01d5b14c6e211937dc6d79b5c64ca28feda23179bf148c73fd65eed1a4ac3fa7215b155ccac202afe1db86ae6b1a9 SHA512 e98ad86ee881a190855fdaf263cda584e7de277960d31b3b7bf0d80c8944adf5ba6c6a7d916168e7a158c9daf344136d0ea34b0d2395c1932f8bfb07401bf918
-EBUILD par2cmdline-0.8.1.ebuild 769 BLAKE2B 0d722cb256b03cd112124caed0cbefcdd6e2d6b23c8293f76bc40141146315324509fa0a0f3c2d73ff4aa6f2d69c0408c804c4bc55853cf3d6c6989d11b7ca07 SHA512 14e8681dc4ba4bda303da238e215065be0932e9c9924776a17071b528444bf2989ceeb697a2bc13e247522725fd1370aafdde0ffd72ecd37d4e7db97f9539447
+EBUILD par2cmdline-0.8.1-r1.ebuild 730 BLAKE2B 5f65c18c03a8a1328b09a302dd176d9ca01b03e78d0b1722b03b8559aa78ba6559fab139afafdf2f6ea0a4daf496d9099a80a371a96e8488e123f620b41258bb SHA512 cefef3a28ee98a32c0370a5931d63bcf8cea3412ab612d5a4742e8679805c6fde9722e51040e46764ed5c2db61c0a4463123ee5e9a8dec9e5fd9c4c538dc6b03
MISC metadata.xml 313 BLAKE2B 13e31cd90dad938be801aba6086fa8234878f9b691decd84e1fb56108a10e368c6442098b8574874f5c405f33d85c6236eb30e21e8f57e7e7c09deefe541a1d8 SHA512 88cd31f008359d686c66f9813f498c5c4c3f7662a5acfe5c7eac7c244bc0688fc544b36dd711c1949624c186e143f0d46e9c636b7ff54f401f67d95f3d33d69d
diff --git a/app-arch/par2cmdline/files/par2cmdline-0.8.1-big-endian.patch b/app-arch/par2cmdline/files/par2cmdline-0.8.1-big-endian.patch
new file mode 100644
index 000000000000..e45f8f3235d1
--- /dev/null
+++ b/app-arch/par2cmdline/files/par2cmdline-0.8.1-big-endian.patch
@@ -0,0 +1,70 @@
+# backport upstream pr #144, fixes test failure on big endian archs;
+# see https://github.com/Parchive/par2cmdline/issues/143
+From 4f3576a314d7169912842ec9dc1e595e61e52653 Mon Sep 17 00:00:00 2001
+From: Michael Nahas
+Date: Tue, 11 Feb 2020 22:42:08 -0600
+Subject: [PATCH] Fix for Github issue #143. Test did not account for
+ endianness correctly.
+
+---
+ src/reedsolomon_test.cpp | 30 +++++++++++++++++++++++++++---
+ 1 file changed, 27 insertions(+), 3 deletions(-)
+
+diff --git a/src/reedsolomon_test.cpp b/src/reedsolomon_test.cpp
+index 1285b3c..c8d26e9 100644
+--- a/src/reedsolomon_test.cpp
++++ b/src/reedsolomon_test.cpp
+@@ -433,6 +433,23 @@ int test3() {
+
+
+ // Check that the correct constants are being used for Par2
++
++//The test pretends there are 10 input blocks ("NUM_IN") and 1
++//recovery block ("NUM_REC"), each 1024 bytes long ("BUF_SIZE"). These
++//are all stored in data[11][BUF_SIZE], with the input blocks
++//occupying data[0] through data[9] and the recovery block in
++//data[10].
++
++//The test zeroes out the input blocks and then writes a 1 into the
++//first location of the first input block, and into the second
++//location of the second input block, etc. It then generates the
++//recovery block using many calls to ReedSolomon. When that happens,
++//those 1s are multiplied by the coefficients for each input block. So
++//the first location of recovery block holds the coefficient for the
++//first input block, the second location has the coefficient for the
++//second input block, etc. Those values are checked against the
++//expected values passed to the function.
++
+ template
+ int test4(int NUM_IN, int *expected_bases) {
+ //const int NUM_IN = 10;
+@@ -448,8 +465,9 @@ int test4(int NUM_IN, int *expected_bases) {
+ for (int k = 0; k < BUF_SIZE; k++) {
+ data[i][k] = (u8)0;
+ }
+- // EXCEPT put a 1 in a different place for each file
+- ((gtype *)(&(data[i][0])))[i] = (utype) 1;
++ // EXCEPT write a (little endian) 1 in a different place for each file
++ // In the i-th file, it is written into the i-th location
++ data[i][sizeof(utype)*i] = (u8) 1;
+ }
+ // zero recovery
+ for (int j = 0; j < NUM_REC; j++) {
+@@ -488,7 +506,13 @@ int test4(int NUM_IN, int *expected_bases) {
+ // The recovery file has exponent 1 and should
+ // contain each base to the power 1.
+ for (int i = 0; i < NUM_IN; i++) {
+- int base = (utype) ((gtype *) &(data[NUM_IN+0][0]))[i];
++ // read little-endian value
++ utype v = 0;
++ for (int byte_index = 0; byte_index < sizeof(utype); byte_index++) {
++ u8 byte = data[NUM_IN+0][sizeof(utype)*i + byte_index];
++ v |= (((utype)byte) << (byte_index*8));
++ }
++ int base = v;
+ if (base != expected_bases[i]) {
+ cerr << "base at location " << i << " did not match expected." << endl;
+ cerr << " base = " << base << endl;
+--
+2.17.1
+
diff --git a/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild b/app-arch/par2cmdline/par2cmdline-0.8.1-r1.ebuild
similarity index 83%
rename from app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
rename to app-arch/par2cmdline/par2cmdline-0.8.1-r1.ebuild
index 9432c3b8930f..2c68a78dc0f9 100644
--- a/app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
+++ b/app-arch/par2cmdline/par2cmdline-0.8.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="openmp"
-DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
+PATCHES=( "${FILESDIR}"/${P}-big-endian.patch )
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/app-arch/par2cmdline/par2cmdline-0.8.1.ebuild b/app-arch/par2cmdline/par2cmdline-0.8.1.ebuild
deleted file mode 100644
index e12295b12951..000000000000
--- a/app-arch/par2cmdline/par2cmdline-0.8.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A PAR-2.0 file verification and repair tool"
-HOMEPAGE="https://github.com/Parchive/par2cmdline"
-SRC_URI="https://github.com/Parchive/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="openmp"
-
-DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_test() {
- # test22 fails when run in parallel
- emake -j1 check
-}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 15ebbb1a3d04..71e75349c046 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest
index bf30b7a168f4..56f7faadae1d 100644
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@@ -1,5 +1,5 @@
DIST dolphin-plugins-21.12.3.tar.xz 254696 BLAKE2B e669a8acbf8b5559a602dd3ae646e2384b89a672bb0ed42d2f094b75a1eaefd6994644daaa70d17f9baba8ea491cef632090050b93e0f5e0b50f203a6166338e SHA512 3dad72b6e0283a8c825aded82e9d15bc5e03303bbfc6dd8f1e6af2cb3892ec9b04a3c97f01246e20abe6d86e5a91fa1c4f8fff48ed24186a3780009a78298d23
DIST dolphin-plugins-22.04.3.tar.xz 257356 BLAKE2B e3d084e628920a08c9e1173c754002f6b0ecfad07bd4d89a64f5b29a7e93362a814ead6aeff80412b01e7198adce78c36f36428560a1ea9e555027113f7d8e6f SHA512 1b96511fbf8ec93b03a5f204c2e4cff232ca0d09e4d1599c89d4d514deb3fb889dfd3050a5cabe4e35b6e65a5283ad09635a13931c8484eebc98a22ba9057b42
EBUILD dolphin-plugins-mountiso-21.12.3.ebuild 1512 BLAKE2B 39104e1cc19cb8b853fc10a32f1f515163516cea40cfe307067b6bf91c4367e2bb809789bb3dc123968c9aea92c6cd5bb52b530f14b985fccaca691a560cb8cc SHA512 0deeeb509daf1806d95a21062e05121fbba73472ead78ef439300286cb414438b1bdde7e68574544d6240ed25ba558c8fbfaa3fd2d7b51731f1857717ed99c3c
-EBUILD dolphin-plugins-mountiso-22.04.3.ebuild 1515 BLAKE2B d1d973a0e1e4626c0b3e851a380c1de78e6dd52066b264b65585a32bb5c7fe968985a822a28bf1bbbce3e225390a1679ebcb810cda148ff0d8f053981d849a07 SHA512 965a017b4b3c95e2587e09798df8aff9c73aa675c1335980bd9c56f316a256f2a349c19526750c7fc0b2a6d93e8c3704cf808826ddccaeebf852b2c0475c54df
+EBUILD dolphin-plugins-mountiso-22.04.3.ebuild 1520 BLAKE2B c40186759279c008ea46077402013e1d0d35f97b18a44fef83fa61a209752482006df554f6af88dd1b18d9fc9e6f5dbe513cee41497df4d021c61a7072fa53c4 SHA512 3e463eb14b4212e71833661a3a4fa4f26f95baf502e2448a3805483d82216f2a63c47c24db047f61f2d299722c4c4381b0396fb76ba489f5a1838e3a8f3f9db2
MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.04.3.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.04.3.ebuild
index 70a3a319442f..1811b392b9a1 100644
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.04.3.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.04.3.ebuild
@@ -11,7 +11,7 @@ MY_PLUGIN_NAME="mountiso"
KFMIN=5.92.0
PVCUT=$(ver_cut 1-3)
QTMIN=5.15.4
-inherit ecm kde.org
+inherit ecm gear.kde.org
DESCRIPTION="Dolphin plugin for ISO loopback device mounting"
HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 69be9106e4b4..d296ad6bde29 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/apptainer/Manifest b/app-containers/apptainer/Manifest
index 4ec27b4379f3..8b4aba030a5b 100644
--- a/app-containers/apptainer/Manifest
+++ b/app-containers/apptainer/Manifest
@@ -1,4 +1,6 @@
AUX apptainer-1.0.2-trim_upstream_cflags.patch 1142 BLAKE2B 7238229b70a8ac37f3401a163d19dc705adb6a4ab6355e4eaa386ad5c639bfc1443cf61507112a53b66816399ca5fe2c32de964dd602ea16c5dfbf9003343f8c SHA512 1351ee000274567bb5a63aa740fbc43510d84ccad42c9af0c555943b99d93d86a2b036801c1681b93548a874bda1bab3304c2bf0da83bbca102a71e82574a032
DIST apptainer-1.0.2.tar.gz 11984629 BLAKE2B 56ed18bf86fe51e3bb27605f2c87a2c20fd9f3457594f1e0628b00d8616befa275b76bc4aba2a4306c854217e03662aab7eb7022c6ca5db418537df011b2398b SHA512 c29d04eff3a2ee7126c9bbb65664540a446fe695efc9c4662a6da151b2e809d55c1f5a7b5bddb82ba4fdd41a49ceb538c00a72778a4ed1d0306ff5f49d2f4d53
+DIST apptainer-1.0.3.tar.gz 11972174 BLAKE2B 7fb0602184d9d78ef0de224ec888a01e046d3d44cd79a3233bbb8eab276d9ee360810356a25f4ef05612e337b5a905334f528d5aa5bfa489d9910538719afd2c SHA512 93ebe5abce32f35d56fe7d0f818703961cb7f7115965bad387fc895a275d45b569efeecf57ab5778457732233caa57651cd011a3bcac5ed5aaf2dd665082d959
EBUILD apptainer-1.0.2.ebuild 1521 BLAKE2B 3b0303215058e2df69679003f9f1a0770a279a3b229a18ea92dabdf04e983be13504d6da0356dd4cc429b01adbd23168613ca5f37a604797d7bef52e4cb27f81 SHA512 03389ed0da23dd05a98d126dabf30f6f3154052aa03bc25f81607318d4e4cf190ed6d7425d01a8c3e043951952eb6e56ea401933e5b518abcf1eaf4dad31752c
+EBUILD apptainer-1.0.3.ebuild 1522 BLAKE2B 6ceaa823f2718812bdadc901cacf9cb6f90289b80c7ceea20c3cd6fe3e1133d13804e3620e23b1d4d8f3b3e332df148dac6a9b52e0a1ad95cd220a2d2b43997f SHA512 ff966e8f2dd66eb998cad08efa1b12bafa33549276e652cb2e5ccac392a43a59f936e1827a85c4e298b043a2e0f14bee949c7788564f700c8c19a51351a7d9e9
MISC metadata.xml 454 BLAKE2B 7891b6acae30424b8b6877166b856c1113a13e40ebec9051935df10a0650bf941f52d75bdb6a4258795e07b080082979469b8b8242d2ddd56c52f9c5b6759f0e SHA512 ef53c2dee45734f36403ab71549494f3c24707bc183353e4bd9c548a97b3ab5d7877f4fc9d311d9e86ab249cbdb379f0a1a211ee36afda99fd552f0a5cac30bb
diff --git a/sys-cluster/singularity/singularity-3.8.7.ebuild b/app-containers/apptainer/apptainer-1.0.3.ebuild
similarity index 55%
rename from sys-cluster/singularity/singularity-3.8.7.ebuild
rename to app-containers/apptainer/apptainer-1.0.3.ebuild
index 2fe146707d54..56b48324770c 100644
--- a/sys-cluster/singularity/singularity-3.8.7.ebuild
+++ b/app-containers/apptainer/apptainer-1.0.3.ebuild
@@ -5,8 +5,8 @@ EAPI=8
inherit linux-info toolchain-funcs
-DESCRIPTION="Application containers for Linux"
-HOMEPAGE="https://github.com/apptainer/singularity"
+DESCRIPTION="The container system for secure high-performance computing"
+HOMEPAGE="https://apptainer.org/"
SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz"
SLOT="0"
@@ -17,20 +17,25 @@ IUSE="examples +network +suid"
# Do not complain about CFLAGS etc. since go projects do not use them.
QA_FLAGS_IGNORED='.*'
-COMMON="sys-libs/libseccomp"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${COMMON}
- >=dev-lang/go-1.16.12
- app-crypt/gpgme
+DEPEND="app-crypt/gpgme
+ >=dev-lang/go-1.17.6
dev-libs/openssl
sys-apps/util-linux
- sys-fs/cryptsetup"
-RDEPEND="${COMMON}
+ sys-fs/cryptsetup
sys-fs/squashfs-tools
- !app-containers/apptainer"
+ sys-libs/libseccomp"
+RDEPEND="${DEPEND}
+ !sys-cluster/singularity"
+BDEPEND="virtual/pkgconfig"
CONFIG_CHECK="~SQUASHFS"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.2-trim_upstream_cflags.patch
+)
+
+DOCS=( README.md CONTRIBUTORS.md CONTRIBUTING.md )
+
src_configure() {
local myconfargs=(
-c "$(tc-getBUILD_CC)" \
@@ -53,19 +58,9 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" -C builddir install
- keepdir /var/singularity/mnt/session
-
- # As of version 3.5.3 this seems to be very much broken, affecting
- # commands which have got nothing to do with singularity (example:
- # completion on 'udisks mount -b /dev/' rejects all files from that
- # directory other than 'autofs'). Moreover, this should go into
- # $(get_bashcompdir) (from bash-completion-r1.eclass) rather than /etc.
- # Hopefully temporary, which is why we delete this at install time
- # instead of patching build scripts not to generate bash-completion
- # data in the first place.
- rm -rf "${ED}"/etc/bash_completion.d || die
+ keepdir /var/${PN}/mnt/session
- dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
+ einstalldocs
if use examples; then
dodoc -r examples
fi
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 4b6057d38282..29e2abc2f28e 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index ff4a51cb4c71..ec50a213b7f9 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,6 +1,7 @@
AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
AUX gnupg-2.2.35-status-messages-garbled.patch 1453 BLAKE2B 44f90eac5e9669c39f31eff654b29540175a67c97bd0da673e594986ef6cd1c560225a4ee53cd994183fc83cf09418bba1687beb2504fd0b9e62709f64163694 SHA512 6f7abe2b8270a7297590a1b0c6323ef49f76750a24384a1fea4a5e452eb6bc3c6201399c015dde8c965f5c66874489c7f849d62fe89bf1d35d94ddd01316f7c4
AUX gnupg-2.3.6-status-messages-garbled.patch 1501 BLAKE2B 1f2631eb090a4e7de2b3e16929433a7dd0d3feadc0a9ed35049edb10b1c396136e024315fc928d97f1c74e21b2c3492cf8a8e2eebb5ad48f7bf6dfa821d8e357 SHA512 4b2e2e9aa24ad3ca1ebffae2b928a76c925b6d7f74fe3d18ba666f0ad2b06947bc138b889656bd1aeab30a0477cfdfebc560b1ed98709d9979a0d9d8de109c9b
+AUX gnupg-2.3.7-yubikey-workaround-fix.patch 2010 BLAKE2B 9baaa3781e7fcdc7379eb838c965078127dba25eb90285504110bc4e81cc3d5018c0a391a065c33f0b3e29d48b5acbee79e47d4b6b281f11f083b7f44d5b7be1 SHA512 3a59955582af9abc576d533f548c9d6670a089415afbb23de9131d4c8cfab0a285ca71efcc7a423bcff0ec2b759d9428146b90a86413d7c6be6b1b0bbca41056
DIST gnupg-2.2.35.tar.bz2 7262687 BLAKE2B 18b5965151ded3b3f28d139824e14d7a6f1673c5192ec5f5a80366a6d5f2e04ed7fa035e2bff105e1752753584f992626ccc9ea8840c2bfa39ffe7ca39b81f7f SHA512 ad9f8d10890b7fafb15a7422e2cebaf0f85ce7cf5f880f4edd8d1dec46aa73c01f9096e601f6edd665f8684d1f5892634991a400e00b3185e6b201f549004d3e
DIST gnupg-2.2.35.tar.bz2.sig 119 BLAKE2B d95323703c12c9474b21fa91ddb70d4d4d464c794223e21f6ae5d4de955f07a5cabde50612e977168ea6071c4b12be3262cbafe9bcaa8e9a0b009318c0ff6718 SHA512 9043894730520e974e7bc17e0f95419c319fbcd514f102faf644e2f5580e238719cecb8b5e778ecf20f9212ee2554206eb0686e8b5fce7f8c556146657660fe2
DIST gnupg-2.2.36.tar.bz2 7273805 BLAKE2B 82f26f48380632ddffedacb5e7cff653aec7bea2cf90d88184e0ddeb4053bd2b0ed1ee7addeceb684ffcbf07ccc2cba699172d78e5ab023af2e3d777fbb702b0 SHA512 2d14000a0e8b36688d5e89372a1ef5f8a526b2724715377323d1f9abd23122aa9d0ab2c0988063c397f969afefbf205aedb7205915fd751c539336e680d8462a
@@ -14,5 +15,5 @@ EBUILD gnupg-2.2.35.ebuild 5055 BLAKE2B b5be9e19cafb6e6a65aa219df93d818e0d298da4
EBUILD gnupg-2.2.36.ebuild 5063 BLAKE2B 05e91116a94f2fc3f7540a3f57a6c08fb5e29998903ca64431a9fb173f3b5b01504506e3c8ba87917f5029daa7c57c5a734ebcea4012343d28ff8883169a5110 SHA512 9bd19ba34eedfb4a8273b41834322bfd745b339fb4ce7aab60bfee047c76cbe148380d8f494fc2f43bd1e68c8bd8f7d5b65aed2423755937448d5f36577017ed
EBUILD gnupg-2.3.6-r1.ebuild 5282 BLAKE2B 349733f8f10abd11c1daeb66eb01b948e81d61adb1f03da525db00e9150b985bff22f57ad3c94e67e23b1fcf5efae54f634a3d48149611cdb0809eb51c9faf06 SHA512 8fa60fca7896fb2e04ef841572c567dbc16b7da4ba4c3643826f140351dfe47806fdc08af197aeb2fe06ddd935cf2a41594f960e2e0db57131176a3540a869c2
EBUILD gnupg-2.3.6.ebuild 5232 BLAKE2B 0d5a372da5867eef0a78cb46050281e7d1ed5385b6bdfd0a4df9ba5cefabf92f5cd7c363b1f5bebe7919e0114b258833be39a41f3c8b0f6b370239123d0ae3f2 SHA512 eb8b033a34b9cb2509213cb03f1c1c47a823e3009ff334ec294037fd7236ccc0a90eb035849ba7e03feb7c562997c12edf805d83be08d93616c299953009e93f
-EBUILD gnupg-2.3.7.ebuild 5232 BLAKE2B bbdc799422ff3b7b3aa2797c1df8d89b7364e614c30f04ca9a947e0d9c007f38b170ef78f4c7fc866553008a254332419612bc5ba25898ca5ffba0fa089fb0f8 SHA512 d271716f0f96a6bd769c234f2067f2205bb091b0a8cfafa690aee571362b354e162ec4a9634841312a561076ab2af2c1ddf55b9e8fa8b9fad0859a7c2878d314
+EBUILD gnupg-2.3.7-r1.ebuild 5281 BLAKE2B 9cb14f821923b65c297b52744c518cab90b34257b931473363ea505fcd050237d36b180eb8f0090c4f382fd83b517f41a3b846321cd60c92bc9f7d7b62c3f662 SHA512 1813774ef7e7f5fff6274cdd4ce555e5030dcca97ae79a0dafc41698c82c8a04befd9f04e46eac18d5a44eb1782dc286bb709f6b298b629baf08bfbf7761762a
MISC metadata.xml 1297 BLAKE2B 2d1b2b6f7e6fdf5b73797347e9a3bf7758f1efc86e53d0d0f4b2c0012152ebc50630ff4f3b2c965063f608cf03b3da2794978a3e3659957970d91d3a735ad604 SHA512 0e9f3d5255ac70d6a08b251bfd20f13ff25f63e763ab9385924fb2cb5ac233b0ae97cc43e8a2d950b9662f088ef65af87f9af4dbb355e122e3fcb118bee1c0de
diff --git a/app-crypt/gnupg/files/gnupg-2.3.7-yubikey-workaround-fix.patch b/app-crypt/gnupg/files/gnupg-2.3.7-yubikey-workaround-fix.patch
new file mode 100644
index 000000000000..94062c885b5b
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.3.7-yubikey-workaround-fix.patch
@@ -0,0 +1,53 @@
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=f34b9147eb3070bce80d53febaa564164cd6c977
+
+From f34b9147eb3070bce80d53febaa564164cd6c977 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka
+Date: Wed, 13 Jul 2022 10:40:55 +0900
+Subject: [PATCH] scd:openpgp: Fix workaround for Yubikey heuristics.
+
+* scd/app-openpgp.c (parse_algorithm_attribute): Handle the case
+of firmware 5.4, too.
+
+--
+
+GnuPG-bug-id: 6070
+Signed-off-by: NIIBE Yutaka
+--- a/scd/app-openpgp.c
++++ b/scd/app-openpgp.c
+@@ -6259,15 +6259,28 @@ parse_algorithm_attribute (app_t app, int keyno)
+ app->app_local->keyattr[keyno].ecc.algo = *buffer;
+ app->app_local->keyattr[keyno].ecc.flags = 0;
+
+- if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY
+- || buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
+- { /* Found "pubkey required"-byte for private key template. */
+- oidlen--;
+- if (buffer[buflen-1] == 0xff)
+- app->app_local->keyattr[keyno].ecc.flags |= ECC_FLAG_PUBKEY;
++ if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY)
++ {
++ /* Yubikey implementations vary.
++ * Firmware version 5.2 returns "pubkey required"-byte with
++ * 0x00, but after removal and second time insertion, it
++ * returns bogus value there.
++ * Firmware version 5.4 returns none.
++ */
++ curve = ecc_curve (buffer + 1, oidlen);
++ if (!curve)
++ curve = ecc_curve (buffer + 1, oidlen - 1);
++ }
++ else
++ {
++ if (buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
++ { /* Found "pubkey required"-byte for private key template. */
++ oidlen--;
++ if (buffer[buflen-1] == 0xff)
++ app->app_local->keyattr[keyno].ecc.flags |= ECC_FLAG_PUBKEY;
++ }
++ curve = ecc_curve (buffer + 1, oidlen);
+ }
+-
+- curve = ecc_curve (buffer + 1, oidlen);
+
+ if (!curve)
+ {
diff --git a/app-crypt/gnupg/gnupg-2.3.7.ebuild b/app-crypt/gnupg/gnupg-2.3.7-r1.ebuild
similarity index 99%
rename from app-crypt/gnupg/gnupg-2.3.7.ebuild
rename to app-crypt/gnupg/gnupg-2.3.7-r1.ebuild
index 6f376da7aafd..54821c7edea1 100644
--- a/app-crypt/gnupg/gnupg-2.3.7.ebuild
+++ b/app-crypt/gnupg/gnupg-2.3.7-r1.ebuild
@@ -57,6 +57,7 @@ DOCS=(
PATCHES=(
"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+ "${FILESDIR}"/${P}-yubikey-workaround-fix.patch
)
src_prepare() {
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e55064cde66d..ef8ed2186ccb 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7ab413503cb1..19fbb2ee08df 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -18,8 +18,9 @@ EBUILD emacs-24.5-r11.ebuild 10781 BLAKE2B 436f02959a1aa71165682f8e133dc0d7964cf
EBUILD emacs-25.3-r11.ebuild 11091 BLAKE2B 02e66e0142e1fe4a5bd262548ee01bc399328d3b3cfeaf81bf67ad76dd10405bac1013de66d648f0e3cf5aa09b46ec69989130b514ad9989c5962a06d465bc68 SHA512 1ec9fdc1c130274277da7dd689640c48b9f3e439bf948dada9d4b79d6f2dee74e22d53e2854c1a2bd223da4b81916f2217efb9dd788e344004d50a28ba9f2b7d
EBUILD emacs-26.3-r7.ebuild 11779 BLAKE2B 69ef04e1707478913d6d574cc9569e1b7eece4152f68c70112e9caf1e192b6b2d5f74fff7e0e89f4d730429861c1b4e1d70a0c1e6b9cb42565fefe740085f8d3 SHA512 6757269a4fdd86292b107d138d8ac39f44f055858d017e988ce005dcb4985ed3b49ce58b61335aa61fb031865f8a15bd1cbb46c402ae5466529adcee6280b552
EBUILD emacs-27.2-r5.ebuild 14310 BLAKE2B 8875ffdd3002c88240d58891d67c840ea67bba108009e7fbf5963050a36b9e4f1cc4903e38c37a7456c3becf9a5c42c29bb910e8797940b9389b3fad8747948d SHA512 e47f5035c3d687b7a58ef3a05952ec301a00d17ae7633a9d5055c15f8fe9631d7d60927966eaf0b3e9fb1a3f0d892e3830269dc995efc2ff3400aad23815df1c
-EBUILD emacs-28.1.90.ebuild 14797 BLAKE2B 1e781ab85ddfd1ac3e699c89ebf5ca08f127437a0a1fdb254ce85fa0a550abc2e650d2e81829b61d96dcc2567228e5bc0a083651af4a5a0dda8e4454da77a458 SHA512 d286a760d36d98ea0b445384e28049d519959b716fc85a5bbf6ff2b1d07fbf793b7238cc7fbed58463992ad0cd47dc89d47f5d750a58d71cf0a621eb2a40a210
-EBUILD emacs-28.1.9999.ebuild 14795 BLAKE2B 9c3e4056feb08a72443cae30db1a1bbe555b7b454964bd5e6ba7663e0b92a4276641c19018f117f7fdf6548d18872a32956aeb727bf25e9530aa7179b1d91581 SHA512 447012b92de8f4ae909e2a8233e8ff02353095960300a9a31d2edc6ccb536f1a2b69f65d09b30f6d26ca19bf990081181f68ea82b785da754d4565f54cb6c049
+EBUILD emacs-28.1-r2.ebuild 15037 BLAKE2B 985440b0c7b7f30e52127e8938da63af03d69a172a32490ba87f15e0d4b3baeeb9086a0d2121c1d61efd423f6b8935657c820e3790fdbd4964894aa3140bee54 SHA512 a43637d2d466a5a687874646b6b897e0fb00c24e5ea09e6d051cdc9029df0aa810d2b9e8a17699b93dae32f5402e5980dde23cdd486341df0e61cd38e71437c6
+EBUILD emacs-28.1.90-r2.ebuild 15037 BLAKE2B 61cbff92ed83808be6868a4451f6e7f4064474da368f7e93295a3b23ff8a9f3a6ceb6c78ebc3955a3aa506ccf01e096b6a906b0ae4225c532b649b7492c865dd SHA512 37e7756db860b4564557b7f93c6a46e3b390dd899568802296ea2416cf9b23c408843192e5f9793a2968eff9bf622138c09858210efb85f16da0f006a912693d
+EBUILD emacs-28.1.9999.ebuild 15037 BLAKE2B 61cbff92ed83808be6868a4451f6e7f4064474da368f7e93295a3b23ff8a9f3a6ceb6c78ebc3955a3aa506ccf01e096b6a906b0ae4225c532b649b7492c865dd SHA512 37e7756db860b4564557b7f93c6a46e3b390dd899568802296ea2416cf9b23c408843192e5f9793a2968eff9bf622138c09858210efb85f16da0f006a912693d
EBUILD emacs-28.1.ebuild 14790 BLAKE2B 9555b8b3d692fd33b9575e5666a63345369070187799e1a33556565c15a4f1c07b91197223e9db311911ca9ee4e797e9840b525fe8a2e8a9255f153c1bb541a5 SHA512 22757ca82108d2a47ee187119e82460a33c1df1d7b6cfd543a7bedd87e22aaff63083b2dffe47bcbb795430fa40e0a43477d0ef415a0de6e8b6bc5aaae425670
-EBUILD emacs-29.0.9999.ebuild 16277 BLAKE2B 1c2ac9eca96417bd14d115d060411fb3d0999f9b0c9cd77afaa65163b7eab525e4ff816d2c90253bbd9304955ddd600f965df97c4d6520c12dfae1ff46e12443 SHA512 e9794123c564caf3bec05ac041e5ebb73622c073fa1f2c8a04f9a900aa259d65a33d5f4260bc4004282e9477535c3b9b02eb171e163b02a40dd8f5bf18f02ff4
+EBUILD emacs-29.0.9999.ebuild 16519 BLAKE2B ad8023a343f5b3809ac1a1b361c6213921931c2afa9eeca1d57d77b925f56c319ca10880ab7d70a33488e44c35969475b14442989c50147b7722e3d9cf44ee03 SHA512 50c3e8308f7627dd0da511104fcf3dc93e6095ad8334fa425de17b597e44e6feba58e0851cf15a8e1deb280b4957fce2ae173688f519b5e27bd4be25c42ffcb7
MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee
diff --git a/app-editors/emacs/emacs-28.1-r2.ebuild b/app-editors/emacs/emacs-28.1-r2.ebuild
new file mode 100644
index 000000000000..29813e2a063f
--- /dev/null
+++ b/app-editors/emacs/emacs-28.1-r2.ebuild
@@ -0,0 +1,454 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+ EGIT_BRANCH="emacs-28"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+ S="${EGIT_CHECKOUT_DIR}"
+ SLOT="${PV%%.*}-vcs"
+else
+ # FULL_VERSION keeps the full version number, which is needed in
+ # order to determine some path information correctly for copy/move
+ # operations later on
+ FULL_VERSION="${PV%%_*}"
+ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+ S="${WORKDIR}/emacs-${FULL_VERSION}"
+ # PV can be in any of the following formats:
+ # 27.1 released version (slot 27)
+ # 27.1_rc1 upstream release candidate (27)
+ # 27.0.9999 live ebuild (slot 27-vcs)
+ # 27.0.90 upstream prerelease snapshot (27-vcs)
+ # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs)
+ if [[ ${PV} == *_pre* ]]; then
+ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+ S="${WORKDIR}/emacs"
+ elif [[ ${PV//[0-9]} != "." ]]; then
+ SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+ fi
+ SLOT="${PV%%.*}"
+ [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+RESTRICT="test"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+ sys-libs/ncurses:0=
+ acl? ( virtual/acl )
+ alsa? ( media-libs/alsa-lib )
+ dbus? ( sys-apps/dbus )
+ games? ( acct-group/gamestat )
+ gmp? ( dev-libs/gmp:0= )
+ gpm? ( sys-libs/gpm )
+ !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+ jit? ( sys-devel/gcc:=[jit(-)] )
+ json? ( dev-libs/jansson:= )
+ kerberos? ( virtual/krb5 )
+ lcms? ( media-libs/lcms:2 )
+ libxml2? ( >=dev-libs/libxml2-2.2.0 )
+ mailutils? ( net-mail/mailutils[clients] )
+ !mailutils? ( acct-group/mail net-libs/liblockfile )
+ selinux? ( sys-libs/libselinux )
+ ssl? ( net-libs/gnutls:0= )
+ systemd? ( sys-apps/systemd )
+ zlib? ( sys-libs/zlib )
+ gui? ( !aqua? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libxcb
+ x11-misc/xbitmaps
+ gsettings? ( >=dev-libs/glib-2.28.6 )
+ gif? ( media-libs/giflib:0= )
+ jpeg? ( media-libs/libjpeg-turbo:0= )
+ png? ( >=media-libs/libpng-1.4:0= )
+ svg? ( >=gnome-base/librsvg-2.0 )
+ tiff? ( media-libs/tiff:0 )
+ xpm? ( x11-libs/libXpm )
+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+ xft? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/libXrender
+ cairo? ( >=x11-libs/cairo-1.12.18 )
+ harfbuzz? ( media-libs/harfbuzz:0= )
+ m17n-lib? (
+ >=dev-libs/libotf-0.9.4
+ >=dev-libs/m17n-lib-1.5.1
+ )
+ )
+ gtk? (
+ x11-libs/gtk+:3
+ xwidgets? (
+ net-libs/webkit-gtk:4=
+ x11-libs/libXcomposite
+ )
+ )
+ !gtk? (
+ motif? (
+ >=x11-libs/motif-2.3:0
+ x11-libs/libXpm
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ !motif? (
+ Xaw3d? (
+ x11-libs/libXaw3d
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ !Xaw3d? ( athena? (
+ x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ ) )
+ )
+ )
+ ) )"
+
+DEPEND="${RDEPEND}
+ gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+ virtual/pkgconfig
+ gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+ if [[ ${PV##*.} = 9999 ]]; then
+ FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+ configure.ac)
+ [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+ einfo "Emacs branch: ${EGIT_BRANCH}"
+ einfo "Commit: ${EGIT_VERSION}"
+ einfo "Emacs version number: ${FULL_VERSION}"
+ [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+ || die "Upstream version number changed to ${FULL_VERSION}"
+ fi
+
+ if use jit; then
+ # These files ignore LDFLAGS. We assign the variable here, because
+ # for live ebuilds FULL_VERSION doesn't exist in global scope
+ QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+ # gccjit doesn't play well with ccache or distcc #801580
+ # For now, work around the problem with an explicit LIBRARY_PATH
+ has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
+ && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+ | sed -n '/^libraries:/{s:^[^/]*::;p}')
+ fi
+
+ default
+
+ # Fix filename reference in redirected man page
+ sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+ # libseccomp is detected by configure but doesn't appear to have any
+ # effect on the installed image. Suppress it by supplying pkg-config
+ # with a wrong library name.
+ sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
+ AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ if use alsa; then
+ use sound || ewarn \
+ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+ myconf+=" --with-sound=alsa"
+ else
+ myconf+=" --with-sound=$(usex sound oss)"
+ fi
+
+ if ! use gui; then
+ einfo "Configuring to build without window system support"
+ myconf+=" --without-x --without-ns"
+ elif use aqua; then
+ einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+ myconf+=" --with-ns --disable-ns-self-contained"
+ myconf+=" --without-x"
+ else
+ myconf+=" --with-x --without-ns"
+ myconf+=" --without-gconf"
+ myconf+=" $(use_with gsettings)"
+ myconf+=" $(use_with toolkit-scroll-bars)"
+ myconf+=" $(use_with gif)"
+ myconf+=" $(use_with jpeg)"
+ myconf+=" $(use_with png)"
+ myconf+=" $(use_with svg rsvg)"
+ myconf+=" $(use_with tiff)"
+ myconf+=" $(use_with xpm)"
+ myconf+=" $(use_with imagemagick)"
+
+ if use xft; then
+ myconf+=" --with-xft"
+ myconf+=" $(use_with cairo)"
+ myconf+=" $(use_with harfbuzz)"
+ myconf+=" $(use_with m17n-lib libotf)"
+ myconf+=" $(use_with m17n-lib m17n-flt)"
+ else
+ myconf+=" --without-xft"
+ myconf+=" --without-cairo"
+ myconf+=" --without-libotf --without-m17n-flt"
+ use cairo && ewarn \
+ "USE flag \"cairo\" has no effect if \"xft\" is not set."
+ use m17n-lib && ewarn \
+ "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+ fi
+
+ local f line
+ if use gtk; then
+ einfo "Configuring to build with GIMP Toolkit (GTK+)"
+ while read line; do ewarn "${line}"; done <<-EOF
+ Your version of GTK+ will have problems with closing open
+ displays. This is no problem if you just use one display, but
+ if you use more than one and close one of them Emacs may crash.
+ See and
+ .
+ If you intend to use more than one display, then it is strongly
+ recommended that you compile Emacs with the Athena/Lucid or the
+ Motif toolkit instead.
+ EOF
+ myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+ for f in motif Xaw3d athena; do
+ use ${f} && ewarn \
+ "USE flag \"${f}\" has no effect if \"gtk\" is set."
+ done
+ elif use motif; then
+ einfo "Configuring to build with Motif toolkit"
+ myconf+=" --with-x-toolkit=motif"
+ for f in Xaw3d athena; do
+ use ${f} && ewarn \
+ "USE flag \"${f}\" has no effect if \"motif\" is set."
+ done
+ elif use athena || use Xaw3d; then
+ einfo "Configuring to build with Athena/Lucid toolkit"
+ myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+ else
+ einfo "Configuring to build with no toolkit"
+ myconf+=" --with-x-toolkit=no"
+ fi
+ ! use gtk && use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+ fi
+
+ if tc-is-cross-compiler; then
+ # Configure a CBUILD directory when cross-compiling to make tools
+ mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+ ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+ popd >/dev/null || die
+ # Don't try to execute the binary for dumping during the build
+ myconf+=" --with-dumping=none"
+ elif use m68k; then
+ # Workaround for https://debbugs.gnu.org/44531
+ myconf+=" --with-dumping=unexec"
+ else
+ myconf+=" --with-dumping=pdumper"
+ fi
+
+ econf \
+ --program-suffix="-${EMACS_SUFFIX}" \
+ --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+ --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+ --localstatedir="${EPREFIX}"/var \
+ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+ --without-compress-install \
+ --without-hesiod \
+ --without-pop \
+ --with-file-notification=$(usev inotify || usev gfile || echo no) \
+ --with-pdumper \
+ $(use_enable acl) \
+ $(use_with dbus) \
+ $(use_with dynamic-loading modules) \
+ $(use_with games gameuser ":gamestat") \
+ $(use_with gmp libgmp) \
+ $(use_with gpm) \
+ $(use_with jit native-compilation) \
+ $(use_with json) \
+ $(use_with kerberos) $(use_with kerberos kerberos5) \
+ $(use_with lcms lcms2) \
+ $(use_with libxml2 xml2) \
+ $(use_with mailutils) \
+ $(use_with selinux) \
+ $(use_with ssl gnutls) \
+ $(use_with systemd libsystemd) \
+ $(use_with threads) \
+ $(use_with wide-int) \
+ $(use_with zlib) \
+ ${myconf}
+}
+
+src_compile() {
+ if tc-is-cross-compiler; then
+ # Build native tools for compiling lisp etc.
+ emake -C "${S}-build" src
+ emake lib # Cross-compile dependencies first for timestamps
+ # Save native build tools in the cross-directory
+ cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+ # Specify the native Emacs to compile lisp
+ emake -C lisp all EMACS="${S}-build/src/emacs"
+ fi
+
+ emake
+}
+
+src_install() {
+ emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+ mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+ mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+ mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
+
+ # move info dir to avoid collisions with the dir file generated by portage
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+ # movemail must be setgid mail
+ if ! use mailutils; then
+ fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+ fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+ fi
+
+ # avoid collision between slots, see bug #169033 e.g.
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{applications,icons} || die
+ rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+ rm -rf "${ED}"/var || die
+
+ # remove unused /site-lisp dir
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+ # remove COPYING file (except for etc/COPYING used by describe-copying)
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+ if use systemd; then
+ insinto /usr/lib/systemd/user
+ sed -e "/^##/d" \
+ -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+ -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+ etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+ assert
+ fi
+
+ if use gzip-el; then
+ # compress .el files when a corresponding .elc exists
+ find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+ -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+ assert "gzip .el failed"
+ fi
+
+ local cdir
+ if use source; then
+ cdir="/usr/share/emacs/${FULL_VERSION}/src"
+ insinto "${cdir}"
+ # This is not meant to install all the source -- just the
+ # C source you might find via find-function
+ doins src/*.{c,h,m}
+ elif has installsources ${FEATURES}; then
+ cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+ fi
+
+ sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+ X
+ ;;; ${EMACS_SUFFIX} site-lisp configuration
+ X
+ (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+ Y (setq find-function-C-source-directory
+ Y "${EPREFIX}${cdir}")
+ X (let ((path (getenv "INFOPATH"))
+ X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+ X (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+ X (and path
+ X ;; move Emacs Info dir before anything else in /usr/share
+ X (let* ((p (cons nil (split-string path ":" t))) (q p))
+ X (while (and (cdr q) (not (string-match re (cadr q))))
+ X (setq q (cdr q)))
+ X (setcdr q (cons dir (delete dir (cdr q))))
+ X (setq Info-directory-list (prune-directory-list (cdr p)))))))
+ EOF
+ elisp-site-file-install "${T}/${SITEFILE}" || die
+
+ dodoc README BUGS CONTRIBUTE
+
+ if use gui && use aqua; then
+ dodir /Applications/Gentoo
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+ mv nextstep/Emacs.app \
+ "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+ fi
+
+ local DOC_CONTENTS="You can set the version to be started by
+ /usr/bin/emacs through the Emacs eselect module, which also
+ redirects man and info pages. Therefore, several Emacs versions can
+ be installed at the same time. \"man emacs.eselect\" for details.
+ \\n\\nIf you upgrade from a previous major version of Emacs, then
+ it is strongly recommended that you use app-admin/emacs-updater
+ to rebuild all byte-compiled elisp files of the installed Emacs
+ packages."
+ if use gui; then
+ DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+ Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+ machine would satisfy basic Emacs requirements under X11.
+ See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+ for how to enable anti-aliased fonts."
+ use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+ \"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+ symlink it into /Applications by yourself."
+ fi
+ tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+ a portable dump file due to being cross-compiled.
+ To create this file at run time, execute the following command:
+ \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+ \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ # move Info dir file to correct name
+ if [[ -d ${ED}/usr/share/info ]]; then
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+ fi
+}
+
+pkg_postinst() {
+ elisp-site-regen
+ readme.gentoo_print_elog
+
+ if use livecd; then
+ # force an update of the emacs symlink for the livecd/dvd,
+ # because some microemacs packages set it with USE=livecd
+ eselect emacs update
+ else
+ eselect emacs update ifunset
+ fi
+}
+
+pkg_postrm() {
+ elisp-site-regen
+ eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-28.1.90.ebuild b/app-editors/emacs/emacs-28.1.90-r2.ebuild
similarity index 97%
rename from app-editors/emacs/emacs-28.1.90.ebuild
rename to app-editors/emacs/emacs-28.1.90-r2.ebuild
index 7875c15c2dcd..ce9357f531fc 100644
--- a/app-editors/emacs/emacs-28.1.90.ebuild
+++ b/app-editors/emacs/emacs-28.1.90-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
if [[ ${PV##*.} = 9999 ]]; then
inherit git-r3
@@ -165,7 +165,12 @@ src_prepare() {
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
- #AT_M4DIR=m4 eautoreconf
+ # libseccomp is detected by configure but doesn't appear to have any
+ # effect on the installed image. Suppress it by supplying pkg-config
+ # with a wrong library name.
+ sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
+ AT_M4DIR=m4 eautoreconf
}
src_configure() {
diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild b/app-editors/emacs/emacs-28.1.9999.ebuild
index a3ba699d12bc..ce9357f531fc 100644
--- a/app-editors/emacs/emacs-28.1.9999.ebuild
+++ b/app-editors/emacs/emacs-28.1.9999.ebuild
@@ -165,6 +165,11 @@ src_prepare() {
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+ # libseccomp is detected by configure but doesn't appear to have any
+ # effect on the installed image. Suppress it by supplying pkg-config
+ # with a wrong library name.
+ sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
AT_M4DIR=m4 eautoreconf
}
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild
index 571ff6e3636c..0fde98bc4137 100644
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild
@@ -187,6 +187,11 @@ src_prepare() {
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+ # libseccomp is detected by configure but doesn't appear to have any
+ # effect on the installed image. Suppress it by supplying pkg-config
+ # with a wrong library name.
+ sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die
+
AT_M4DIR=m4 eautoreconf
}
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index d798604e5fd7..1c845dd82218 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -11,7 +11,11 @@ DIST vscode-1.67.2-arm64.tar.gz 110649454 BLAKE2B 0ecb552ce956dc4d5aaaf5b1c8c26a
DIST vscode-1.68.1-amd64.tar.gz 116922965 BLAKE2B cb48e2589f0603b4594add3c5c28d6e8a1c3e6f53eb7e5139c6b1ac0aa9b742250c881f2d212219441db74bff94c05ae281a18b9e89be781a055acdf6adf5a2b SHA512 9945f0a6db93c9ee84a2729d5da18d6b41d370abecb3c1e78033889b9ee5093463c16403b93eefc703710783823458caf3f1c0ed4af297fa0dc49a903c3ec466
DIST vscode-1.68.1-arm.tar.gz 97909261 BLAKE2B 248d573ffa0562ea62190fe5d04362baa6076cf3919b8f8df6ea09e0f0756b5d6de85f1e0ea2b472835ce77c3cf5883eb49dd1db2f81f727fc75164b4895942b SHA512 16f9d0c1817e893c15807f720af56bd33a1469e1494b72a7345d05a882a2c3ebc3395dc6d07d78a9effc045eba6e3f34317172937c34cc0f18036c8954ce5f92
DIST vscode-1.68.1-arm64.tar.gz 111812916 BLAKE2B 64d442ee86ed41025775ebbde8fe675afd0fe1cac5d437e04ab5dc1c9fe3d9d0409d14fb8e2544e891c3fc0b6abe4dac3247b9d096585c1d2ff6ca1de0ede9e1 SHA512 1c16684bdd9f0980b7b6d2ee112987e21539a63a0bd635654edcd0404cc661b3d2c06c916fe63172ce107ca89f78ac58abd2be43a2f60b0f71a700a596b9b59f
+DIST vscode-1.69.0-amd64.tar.gz 121607378 BLAKE2B 4812b13c31840d4444fd128b9e8e0d19bd48b29ef56f9ba760331401c71a29a13b5821c571249b5d70fca111ac9b70681db871193fb87328e8bbe55a56f798d6 SHA512 50eecd6d25c5f33db8bde67b362d675b5b69dd1eb4c1a88baa577b444d6f1fa26ebac050d474850880758caf3fc3cbcfa9bf62d20428a2a66eca66fb03566310
+DIST vscode-1.69.0-arm.tar.gz 102579780 BLAKE2B c9d1e0ab5df228c12349c015320101ec93a036939b149e8089d5d52c197641baa97735205fdf58cc838a3ccce9b859bb737bcfd2e914dc96c14fb9c11773431f SHA512 97cd19c07789a35c8d9f3e35b5da3b70fe2fa4cf804618640061722f434f2fbb499330936b893bad8f04ce7cd4c35e4e4f0cba2f44a1c83301c78d497224ff09
+DIST vscode-1.69.0-arm64.tar.gz 116689514 BLAKE2B 8b9859158da4d610704915a7eeeb7f77f9f9c2aa568d3a2f01b455c2177387cf2a97d5cabde3198881b36c85736b02e87a1c4e114d181a68e5654ec57c35ca6f SHA512 26ba8e7e316d21b03cf8110a0296b39b674c9bcd03c22a368623628767a58a19f2e3900ebf3d25707bc7b3c126b2bccd85832bcaa2bf118754b7abef23e4a868
EBUILD vscode-1.66.2.ebuild 3454 BLAKE2B 23b031a450a72926262df56e00de3604b26651185fb94faf8c86dde4878a88cb92b4549ed715f251f4607e96caa58435e8ce934a23e1fcbd3e88ae59b45cbd83 SHA512 3bb3fba747cd024ec14630d1379921979bdf54eafb62193f8a701de46aa78c16c2952ca10b02c05cf97d79f2fd858035e5d28dc6ee85adc05647817c14903944
EBUILD vscode-1.67.2.ebuild 3121 BLAKE2B 5afdf9f9b4e29cc308a4e3d56b079bcdf7f2f8d7e6b6f46c5881cad6d988cd759c6d0006ba73ba16c111f679de3388fc662caf6968d0e06c284e32406b011414 SHA512 02d74dab0a9df33f37744f95bc97ae824d5d60092f2c41f2b24018260ae31a8c649639a49ac268b931d2412f88c04e4975817add6f29ec86cbd558e2dd8ab233
EBUILD vscode-1.68.1.ebuild 3121 BLAKE2B 5afdf9f9b4e29cc308a4e3d56b079bcdf7f2f8d7e6b6f46c5881cad6d988cd759c6d0006ba73ba16c111f679de3388fc662caf6968d0e06c284e32406b011414 SHA512 02d74dab0a9df33f37744f95bc97ae824d5d60092f2c41f2b24018260ae31a8c649639a49ac268b931d2412f88c04e4975817add6f29ec86cbd558e2dd8ab233
+EBUILD vscode-1.69.0.ebuild 3121 BLAKE2B 5afdf9f9b4e29cc308a4e3d56b079bcdf7f2f8d7e6b6f46c5881cad6d988cd759c6d0006ba73ba16c111f679de3388fc662caf6968d0e06c284e32406b011414 SHA512 02d74dab0a9df33f37744f95bc97ae824d5d60092f2c41f2b24018260ae31a8c649639a49ac268b931d2412f88c04e4975817add6f29ec86cbd558e2dd8ab233
MISC metadata.xml 947 BLAKE2B d2c522407289299e1398799f6187e1c0d6621dfe29c1dd0e9d88281eafe44f4b4b3a0edad920268d220375f9330f0a62c015fb1e5085decf5ca5e485a92cc204 SHA512 6b27ac42f3d67203c46996388f6700c007a299557808505179cfa42deeb71098bf3a257f23c11835389fd7a59180f3536e420ed6cdb93b274d47e4c84a25f738
diff --git a/app-editors/vscode/vscode-1.69.0.ebuild b/app-editors/vscode/vscode-1.69.0.ebuild
new file mode 100644
index 000000000000..8ab1bd247c0a
--- /dev/null
+++ b/app-editors/vscode/vscode-1.69.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+ amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+ arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+ arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+ Apache-2.0
+ BSD
+ BSD-1
+ BSD-2
+ BSD-4
+ CC-BY-4.0
+ ISC
+ LGPL-2.1+
+ Microsoft-vscode
+ MIT
+ MPL-2.0
+ openssl
+ PYTHON
+ TextMate-bundle
+ Unlicense
+ UoI-NCSA
+ W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+
+RDEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-accessibility/at-spi2-core:2
+ app-crypt/libsecret[crypt]
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/mesa
+ sys-apps/dbus
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libxshmfence
+ x11-libs/pango
+"
+
+QA_PREBUILT="
+ /opt/vscode/chrome_crashpad_handler
+ /opt/vscode/chrome-sandbox
+ /opt/vscode/code
+ /opt/vscode/libEGL.so
+ /opt/vscode/libffmpeg.so
+ /opt/vscode/libGLESv2.so
+ /opt/vscode/libvk_swiftshader.so
+ /opt/vscode/libvulkan.so*
+ /opt/vscode/resources/app/extensions/*
+ /opt/vscode/resources/app/node_modules.asar.unpacked/*
+ /opt/vscode/swiftshader/libEGL.so
+ /opt/vscode/swiftshader/libGLESv2.so
+"
+
+src_install() {
+ if use amd64; then
+ cd "${WORKDIR}/VSCode-linux-x64" || die
+ elif use arm; then
+ cd "${WORKDIR}/VSCode-linux-armhf" || die
+ elif use arm64; then
+ cd "${WORKDIR}/VSCode-linux-arm64" || die
+ else
+ die "Visual Studio Code only supports amd64, arm and arm64"
+ fi
+
+ # Cleanup
+ rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die
+
+ # Install
+ pax-mark m code
+ insinto "/opt/${PN}"
+ doins -r *
+ fperms +x /opt/${PN}/{,bin/}code
+ fperms +x /opt/${PN}/chrome_crashpad_handler
+ fperms 4711 /opt/${PN}/chrome-sandbox
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
+ fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+ fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
+ dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
+ dosym "../../opt/${PN}/bin/code" "usr/bin/code"
+ domenu "${FILESDIR}/vscode.desktop"
+ domenu "${FILESDIR}/vscode-url-handler.desktop"
+ domenu "${FILESDIR}/vscode-wayland.desktop"
+ domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
+ newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ elog "You may want to install some additional utils, check in:"
+ elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index 528fc218df7b..2b385a041365 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -10,7 +10,11 @@ DIST vscodium-1.67.2-arm64.tar.gz 113531559 BLAKE2B 74a5a2dbbb3775861195beca0283
DIST vscodium-1.68.1-amd64.tar.gz 116928237 BLAKE2B 82bb393fcb0f3d1ce63cee1ba927fd564d1bf2a8aa4283a518d8f40860e52d93d32b9e1e50bbc33b3ec53630a1cd1de457499f91d637b69043dcb818ef03e714 SHA512 f30c066d970530c462f027f3e94e06e4d62ca50e6093f3164f2a21b57d34c5a36823bea5f70f56beda87c27dcfc40f21ecd9d9da16353a78489246ef63419346
DIST vscodium-1.68.1-arm.tar.gz 98741049 BLAKE2B 76dcb5c5fce1c80fdfe9b21aab389ca13d5983c278e2594bc7aae1588cff4227d316257198407f049e58461161a13533008c0181cfc31fd33bf01978c4379968 SHA512 06d1d7814a4d85c23caefd345fb42c40ef4488333f1fcd2edee65c296e11892e758ea5d197de51f2fb59dac98f9f8c108849c45bdc5dbcd8cd49afe2afad5805
DIST vscodium-1.68.1-arm64.tar.gz 114632027 BLAKE2B 48cf6a5566817e0ae9a9b33f98a3eeb5385b303a200efc5704b8003e78c62e3865ce49fe425b9bb1a7deea9434c4cbb99550f0d73789c6123bb5ab307ef36fe9 SHA512 7c977a3aeef886583b48aa6882792811caee0661c73cbcc9cf3d98f7399dc7c7b3378be9e1848263211c2e71fbfab6b3a72debf92618c12781f0172522eff16f
+DIST vscodium-1.69.0-amd64.tar.gz 121304528 BLAKE2B 924154aab29347e9a7d1183dc6d94b0c7a5df8803b543cdf895fb9633aa8df752b767d071bf5495933ae7c9e35e104c8a31d6df77af0bace0d96b739b338ca76 SHA512 66fa63fd72199f3f0c8b7c3b975f16a4ee40ff6e1cbc2d6e14a4bf6d2e1095dce5b4653ca03ce47acae1e6926d849ab7fa3550916c38072892aab6736fffff9a
+DIST vscodium-1.69.0-arm.tar.gz 103126651 BLAKE2B 4b1bb9b00b3233e0eaa2f12ee41ed49fa9962e1fa6cbe206cc195d320eb702f87dd675e2a016434e1c003d41fefff0b981494c9545f2bedfab6f9c89aeae5f32 SHA512 3c744fba6caca4063f53e7e8b986ad38410887a9fe4c20c31ee553e909f778bb48a9eddaeeb12fd03a71f0993b042fc7309c8a2cb95e4ba6e1fd216f01c525d9
+DIST vscodium-1.69.0-arm64.tar.gz 119158600 BLAKE2B 80d35736350313104910010b0929977c1b7ba19484338593848b86195d52552d2f950fef5b41f5d515c2752f4e2efd45cd6829ef30aa981ef520606be7137bd7 SHA512 f79d048efcfd9302b3aa70442e6f2aad715341191ed703ed4b13eeddf2472df0fb3069382f09a786b622a2726fc72a68a3f0a8c47a50115d679d28990814112e
EBUILD vscodium-1.66.2.ebuild 3321 BLAKE2B 403e3548d2be58c998f72039fb32c7c4e64a5c6b79505b6c29c780b5bb81ce2c2b54abbae4b45891eaaa8c1532db5c3185f3d3c670b50feed6313460c32b1e52 SHA512 e3cfd41801a2301c4976a71e742c9c43c0f29bb00834f447b832fe40c88fce557e1bfce6c8a64890378e89ff835130fb44e5a35af1f34fd149842bd955420258
EBUILD vscodium-1.67.2.ebuild 2860 BLAKE2B 116ee8922aad22e774f7927ec4c9bc9e27c05f86a58dac7f625f24d695038822b75ab6c5d6f4a2d66a63c0bf2d6b5bc0255b234af52901542e7640a7908c30f3 SHA512 860f0ec6528856383c821537f20b42acf25a6ae6ff4b1f86a9395e73e8cb51cbf62c4256ae01175e39d6901ddb1ad77ef42a37a3b6ff6191f8a8bd7e42b5831f
EBUILD vscodium-1.68.1.ebuild 2986 BLAKE2B 27b3231f1622c4eb2bcdf77a9dc441e842c3fa66c9796c09b3f6b7fb7aaf203fd99f761f20ad039902a79810d4dcc9e6bcb33fb9093862858543c1831ca3338b SHA512 21e133441a2a29dd492f3c078ade823303417c2ca5b34ffe58a87cd29d98fd54f8dc31b8758b803aebb4563a05abfc707716b182ab429bb29f6174491edee8b9
+EBUILD vscodium-1.69.0.ebuild 2986 BLAKE2B 27b3231f1622c4eb2bcdf77a9dc441e842c3fa66c9796c09b3f6b7fb7aaf203fd99f761f20ad039902a79810d4dcc9e6bcb33fb9093862858543c1831ca3338b SHA512 21e133441a2a29dd492f3c078ade823303417c2ca5b34ffe58a87cd29d98fd54f8dc31b8758b803aebb4563a05abfc707716b182ab429bb29f6174491edee8b9
MISC metadata.xml 1191 BLAKE2B ac8f365247fc710ade8a690da2a409352c20a886ad96b529ab0fc3f200dda28c2c7ca62fa78a922689373fa483e0a789836b887c8fccf2729ca6aa4c0e06aefe SHA512 e5b56663a757cdfff13ddc25c5d4f118f22d194fb051ae0bbe3264a4721c196a8820db1bfbd5a992827d8c97a81edfc30a97ca9610961ee46684a253d186449c
diff --git a/app-editors/vscodium/vscodium-1.69.0.ebuild b/app-editors/vscodium/vscodium-1.69.0.ebuild
new file mode 100644
index 000000000000..2a4ae874205a
--- /dev/null
+++ b/app-editors/vscodium/vscodium-1.69.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg
+
+DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
+HOMEPAGE="https://vscodium.com/"
+SRC_URI="
+ amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
+ arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
+ arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
+"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+ Apache-2.0
+ BSD
+ BSD-1
+ BSD-2
+ BSD-4
+ CC-BY-4.0
+ ISC
+ LGPL-2.1+
+ MIT
+ MPL-2.0
+ openssl
+ PYTHON
+ TextMate-bundle
+ Unlicense
+ UoI-NCSA
+ W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE=""
+
+RDEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-accessibility/at-spi2-core:2
+ app-crypt/libsecret[crypt]
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/mesa
+ net-print/cups
+ sys-apps/dbus
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libxshmfence
+ x11-libs/pango
+"
+
+QA_PREBUILT="
+ /opt/vscodium/chrome_crashpad_handler
+ /opt/vscodium/chrome-sandbox
+ /opt/vscodium/codium
+ /opt/vscodium/libEGL.so
+ /opt/vscodium/libffmpeg.so
+ /opt/vscodium/libGLESv2.so
+ /opt/vscodium/libvk_swiftshader.so
+ /opt/vscodium/libvulkan.so*
+ /opt/vscodium/resources/app/extensions/*
+ /opt/vscodium/resources/app/node_modules.asar.unpacked/*
+ /opt/vscodium/swiftshader/libEGL.so
+ /opt/vscodium/swiftshader/libGLESv2.so
+"
+
+S="${WORKDIR}"
+
+src_install() {
+ # Cleanup
+ rm "${S}/resources/app/LICENSE.txt" || die
+
+ # Install
+ pax-mark m codium
+ insinto "/opt/${PN}"
+ doins -r *
+ fperms +x /opt/${PN}/{,bin/}codium
+ fperms +x /opt/${PN}/chrome_crashpad_handler
+ fperms 4711 /opt/${PN}/chrome-sandbox
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
+ fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+ fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
+ dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
+ dosym "../../opt/${PN}/bin/codium" "usr/bin/codium"
+ domenu "${FILESDIR}/vscodium.desktop"
+ domenu "${FILESDIR}/vscodium-url-handler.desktop"
+ domenu "${FILESDIR}/vscodium-wayland.desktop"
+ domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
+ newicon "resources/app/resources/linux/code.png" "vscodium.png"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ elog "When compared to the regular VSCode, VSCodium has a few quirks"
+ elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 9f3f56bd543d..ccbf61b493eb 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ebib/Manifest b/app-emacs/ebib/Manifest
index 3a3cb6a5e73f..2b14d12e97e7 100644
--- a/app-emacs/ebib/Manifest
+++ b/app-emacs/ebib/Manifest
@@ -1,8 +1,8 @@
AUX 50ebib-gentoo.el 175 BLAKE2B 6e790273be0d32b188bf4e429da221e1a0f71036dccb521edb43340a88faf70046b27bc70128a05a81437dbd856f5966ad343f4aef2dffa72b44a1901d3199e8 SHA512 9be24ffce7327c3db49dbec7a1f3cc3610fdc4aac40c25da06906df25123173f3a4b05ec2d96d9ca2a1fc785bdd471ffba73654ee3b642be93c93b412f230fcb
-DIST ebib-2.35.1_p20220501.tar.gz 1043749 BLAKE2B 937b3e00f4f52c5b63949ae993e40ff340477c374914ce308256018d0c86fafb52cbacde74dab552303b6635ff87d57c29661a62971b0649f58a67e3b916a9c8 SHA512 d822edb2584effc6f385e2e71bf57d72e5763129fe84fec60bf1a9841822e3d59cc53a05cab293014dee7c63d14cbae43734a2070746f5c512e417a4085f3ef6
DIST ebib-2.36.1.tar.gz 1044522 BLAKE2B c280b1123594e10a3cc1dbb67d4db5687d3042b8366b05cc6ab95deb7edc1cf50f6dc516028339d44502c8b1c91503672a511030ff6a895180d1b325566e1874 SHA512 48a54cee6f9ab5e2785c8a4b0f6dcce0ca8fc1f017ea6eb043717d22b326ccff077104fa2907fd9c29eeaafc38fc176e352ad3ca000bfbe2deafa46c54352318
+DIST ebib-2.38.1.tar.gz 1043749 BLAKE2B 937b3e00f4f52c5b63949ae993e40ff340477c374914ce308256018d0c86fafb52cbacde74dab552303b6635ff87d57c29661a62971b0649f58a67e3b916a9c8 SHA512 d822edb2584effc6f385e2e71bf57d72e5763129fe84fec60bf1a9841822e3d59cc53a05cab293014dee7c63d14cbae43734a2070746f5c512e417a4085f3ef6
DIST ebib-2.38.tar.gz 1040337 BLAKE2B 97a61ecf5d4334dd39be287feaa44206d52d3d6687593b8eb2210427901890254b2cefa9cf37e9292f8ae2651c7c11ac0af2938f9a2854b98c3ee81ed6cfc7c4 SHA512 4a6b611759700e8181c09fa80cb631a024bf1d38d6950e040c3e476a194d02e893fe1fe9b749dd737a7eaf7fd9d4b8ecfe4d09be56e788b7692a4253dbbe838d
-EBUILD ebib-2.35.1_p20220501.ebuild 840 BLAKE2B 43d041da367e849ff2ae6883f417c48ac2ca5ec64036e3acca19fc6ece38f4ebb7a2364f2d31b756bd758986087d0e8b4027165fe68474d59edbf912dc755adb SHA512 d7d272bbe9b49950767d140507a2c215ecb963369c77e3ab2f0aa84daeb40e2dc97abf2269aeef71dae1bcbe72f121814673d53a3da59662461194516530b603
EBUILD ebib-2.36.1.ebuild 772 BLAKE2B fed054ff141b43f06d810c343e8763a0538f0caebc1d20d5bc6cbdf51799e65126c8692336f5e41c21ae1004418c6cdd930fb55fb18c3fb72075a289a19c4f9b SHA512 4226453f712100f1c9378468f5b0fcfcd0cef670836b8b97311ef9514d15a1203c83c707c1dd57b96932d722800943ed11a64000c59eef7a180b5c1be6130e60
+EBUILD ebib-2.38.1.ebuild 840 BLAKE2B 43d041da367e849ff2ae6883f417c48ac2ca5ec64036e3acca19fc6ece38f4ebb7a2364f2d31b756bd758986087d0e8b4027165fe68474d59edbf912dc755adb SHA512 d7d272bbe9b49950767d140507a2c215ecb963369c77e3ab2f0aa84daeb40e2dc97abf2269aeef71dae1bcbe72f121814673d53a3da59662461194516530b603
EBUILD ebib-2.38.ebuild 772 BLAKE2B fed054ff141b43f06d810c343e8763a0538f0caebc1d20d5bc6cbdf51799e65126c8692336f5e41c21ae1004418c6cdd930fb55fb18c3fb72075a289a19c4f9b SHA512 4226453f712100f1c9378468f5b0fcfcd0cef670836b8b97311ef9514d15a1203c83c707c1dd57b96932d722800943ed11a64000c59eef7a180b5c1be6130e60
MISC metadata.xml 730 BLAKE2B de17020c88b38b6d8e3753cbb4d554d1061fd73c39cf8e9e760f3de204c87bec6c3aca60213bc283a5d053da30225232100dadf711072a57b19863c55601fdca SHA512 d20f364400adcb23dc542cf08fed16b0b073fcd6ef7df27644f51d674215f51fc9520ad873ac6f2f783364471c7386d69f8d3ae88ecad8b6a1694e08e211f7b4
diff --git a/app-emacs/ebib/ebib-2.35.1_p20220501.ebuild b/app-emacs/ebib/ebib-2.38.1.ebuild
similarity index 100%
rename from app-emacs/ebib/ebib-2.35.1_p20220501.ebuild
rename to app-emacs/ebib/ebib-2.38.1.ebuild
diff --git a/app-emacs/pandoc-mode/Manifest b/app-emacs/pandoc-mode/Manifest
new file mode 100644
index 000000000000..62d0dd4a06d5
--- /dev/null
+++ b/app-emacs/pandoc-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50pandoc-mode-gentoo.el 254 BLAKE2B f979086ad1a06836f67c6fff750ef0a28f7e3a9fbbed996305d4b2c55e2f40ec5ba1c446680d9eaed499a400091000d02f397ab88949ec86ca4d95508b4a718f SHA512 dce6c925f16627fe1d572816a3304a5d605e0fbef9c3f4b5044c461d8ac0d5f47ee426d7b2faa1d6c163da7364f02255ee258e7aefc2c94e70e7430aabc95505
+DIST pandoc-mode-2.32.tar.gz 97596 BLAKE2B 2a1c8a6080fbba1cf278d78f9dbe4e6824daed52ad6422378d6b5c00fd4ec9466391474fdbaad5f1cd96d89080c24968b33c0911cb5f834ddd64dc1339b78c01 SHA512 6717bf238a9f71acce8135d5fa0542c23f2b48d78415f92dda2ef58aa0355ca0fe900e1015d0da674abf7780ed614bd7d4414519bf6d0d7f5aee7e3b7a7f447f
+EBUILD pandoc-mode-2.32-r1.ebuild 598 BLAKE2B 5f7120a6b9de6e35921e7a8368f47ddfd1888c86e61c13193828897d4b6ce70f2382634fe72ee596df158247ec4b8edf41b8fed687edd206235e1c9a25efa797 SHA512 1cad1707611e4b4cd3c48ea595bda4cd3dda8ca97a5203349cb448d3feeffa3f26d72f21edd23a204ee04ac8882e65ad2408997a222de44e4e7d9c82f01aa60c
+MISC metadata.xml 798 BLAKE2B 2925d06732675f3478e4a7e57f077b1878c94c3f7986aae722867bab0654ce1aa77cc8b00a6ec2a08cfd1a8066670699ad59fda1504f4f4dbfc2bb23ab0a1d36 SHA512 7e4d3a0fc951f1f18f117c42bbb9f37aa90adb9412dcfec2e1461550fe1310784ffde6bd7097cf0708e1dd685f75eb139cde0c4cd8cbe1e6dd698234bc63f3f2
diff --git a/app-emacs/pandoc-mode/files/50pandoc-mode-gentoo.el b/app-emacs/pandoc-mode/files/50pandoc-mode-gentoo.el
new file mode 100644
index 000000000000..7b5175907861
--- /dev/null
+++ b/app-emacs/pandoc-mode/files/50pandoc-mode-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'conditionally-turn-on-pandoc "pandoc-mode"
+ "Turn on pandoc-mode if a pandoc settings file exists.") ; non-interactive
+(autoload 'pandoc-mode "pandoc-mode"
+ "Minor mode for interacting with Pandoc." t)
diff --git a/app-emacs/pandoc-mode/metadata.xml b/app-emacs/pandoc-mode/metadata.xml
new file mode 100644
index 000000000000..2836a8a3bb27
--- /dev/null
+++ b/app-emacs/pandoc-mode/metadata.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ pandoc-mode is an Emacs mode for interacting with Pandoc. pandoc-mode is
+ implemented as a minor mode that can be activated alongside the major mode
+ for any of Pandoc's supported input formats. It provides facilities to set
+ the various options that Pandoc accepts and to run Pandoc on the input
+ file.
+
+
+ https://github.com/joostkremers/pandoc-mode/issues/
+ joostkremers/pandoc-mode
+
+
diff --git a/app-emacs/pandoc-mode/pandoc-mode-2.32-r1.ebuild b/app-emacs/pandoc-mode/pandoc-mode-2.32-r1.ebuild
new file mode 100644
index 000000000000..4d7d1760c9a9
--- /dev/null
+++ b/app-emacs/pandoc-mode/pandoc-mode-2.32-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="BibTeX database manager for Emacs"
+HOMEPAGE="https://joostkremers.github.io/pandoc-mode/
+ https://github.com/joostkremers/pandoc-mode/"
+SRC_URI="https://github.com/joostkremers/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0"
+
+BDEPEND="
+ app-emacs/dash
+ app-emacs/hydra
+"
+RDEPEND="
+ ${BDEPEND}
+ virtual/pandoc
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+ elisp_src_install
+ doinfo ${PN}.info
+}
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 8ba9bc2873a9..3bbde7703fea 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -3,7 +3,9 @@ AUX proofgeneral-4.4-desktop.patch 425 BLAKE2B fdefa2835502ded79bc08ffff79063159
AUX proofgeneral-4.4-images-dir.patch 358 BLAKE2B 8c06cd031ff3dca8d9537acb86245ba01ac06e505f0baf6146dbbe89c81dee9dc471b0103f6e2dd0ec5e1c80e72d1a3682393528ea262af187e2548e29c464ef SHA512 06fed75bf855d8cbd8938ca96f9e1cb61cdf01b7f68e58188d4ef287bab847156454dea0c2bc44adfd8979e900b58e5cc7a64b742606e694b3b0717b9a735151
AUX proofgeneral-4.5-paths.patch 762 BLAKE2B 77f7b828dfa1648b6d8818951fca297194192b4c2d6ef2f510c25f33a9cb8d9db8f11a1dbeda5a9235d60063fcaede1ad10efbd2e28e2cbe0f6485af9d90bbcf SHA512 89d7ea239e5530e7dc2b6520bfaeafd68cc77db58ba0786401dad57d52e5fdaa3efe83e9402449581f89c683d044401a2f4aec93dc69c7fcae972d423cab6594
DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f0482c0e1f6fc8d104b4de7506140d4d0491b5e23ddbf458bfa3aeb683b71f6e4deea31c2a46b902342fc686c2945162a SHA512 8be7f78b61a225fa4770698bbbb251424a0afe093efc3229f74f3a764317dc8cc00a72cb29e751f755dc5fdab59983906c9185f7828a1644a87d160265f12061
+DIST proofgeneral-4.5.tar.gz 1198535 BLAKE2B 24f93200d01752fb358ac88531b4b34392b7b968c7dbd7a7b3dcedfe71fa985ca893465bff503e3fc0efd267faeb3f5d8bd3d35f68847a4c90252e3a0bdd456b SHA512 ab2eed43053e3b6749e840a8d742058eaa91bfff7edbe12ea67bc492ffab07e1d77cf6a7772cb8c42ac73cae2cce65b48898b1cd10a77b906089768f8055b366
DIST proofgeneral-4.5_pre20220228.tar.gz 1195172 BLAKE2B fe128039d35a46035e3d266871e558e5a65879b04f979d32bd835842683b23645fdcaf2bbe88b62ead675fc7553f83a145a44b926cacf2ef75d8cd0276ea693b SHA512 630f869f8dee90cecd8b61f011d4d8b87681f153f82d8ceda062c234702c098ef9e90cb07590e2c33849103495f84529763084367d68712fe4672ac2f62c7fca
EBUILD proofgeneral-4.4.ebuild 1630 BLAKE2B f78e6be268f2576d5ca1e01cd1dd20fded60131ada2bc0983ae98a4e416b1ae8eb8692aa6a0bfa2068d639db956a268af4687b05d37e2f8a3ef186628f08a987 SHA512 b81141f5efadb662a269fac178248dede7b5eaeca7394538265ced397a7d9eb89354c87c6cfd8aece39ecadd0ec552e7568183c7e844e8b4fef7eb7edfe2a064
+EBUILD proofgeneral-4.5.ebuild 1448 BLAKE2B bcc46d806529c29a321dc77ea830a5c499c423d4de71745fc492326cd65e80701420cb85477aa0204b8b57115c13f91f130e30692882edc41c4d19c1d51704d3 SHA512 ad8cb31e6329ee698e217aac94d0132e2069c37849e293e0b6b130aad43358cd0925df9c377764f910df013edd86530d555a4f6ba88f2cac4050f8ae226ec794
EBUILD proofgeneral-4.5_pre20220228.ebuild 1490 BLAKE2B 0b9daae8ebf45d229562ec64ebc02b7ed9c1fc1d6f0d33f88f35750befc72997b94d0ca48bf0bf1698ed47fd491f9fc6794b9dea623910dbc9ab550ee61d7ca9 SHA512 b5aab05798a31bd4ceec59af1af429babf746b577b6167cea8c791f893daa491d0e49618f621d5661e61ca3c01ce32ba45001391e6618a346a6b2d0c3b6eb38f
MISC metadata.xml 656 BLAKE2B 5fde6e347ee778bf4ac7f46bd6b8928eb9fa1a6aaf02b8dff5b533f7dbf989799a6fa948161fccab5716ed7d61866750e8e8e8127a83258075009f2e1dd1a0e9 SHA512 481b819f3541c90b114f79eb831b0d1f0d7f3510e468f4b9d9ec7e98078dc4fc15c7fc983d25accd5a8ab3d588ff820af1d46d479bd11b6134fa1b0842072d2f
diff --git a/app-emacs/proofgeneral/proofgeneral-4.5.ebuild b/app-emacs/proofgeneral/proofgeneral-4.5.ebuild
new file mode 100644
index 000000000000..f662cbbface9
--- /dev/null
+++ b/app-emacs/proofgeneral/proofgeneral-4.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit wrapper elisp
+
+DESCRIPTION="A generic interface for proof assistants"
+HOMEPAGE="https://proofgeneral.github.io/"
+SRC_URI="https://github.com/ProofGeneral/PG/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+S="${WORKDIR}"/PG-${PV}
+
+LICENSE="GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.4-desktop.patch
+ "${FILESDIR}"/${PN}-4.5-paths.patch
+)
+DOCS=( AUTHORS BUGS CHANGES COMPATIBILITY FAQ.md INSTALL README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed -e "s|@EPREFIX@|${EPREFIX}|" \
+ -e "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" \
+ -i generic/proof-site.el || die
+}
+
+src_compile() {
+ emake compile doc.info
+}
+
+src_install() {
+ emake install-elisp install-bin install-desktop \
+ PREFIX="${ED}"/usr \
+ ELISP="${ED}${SITELISP}"/${PN} \
+ DEST_ELISP="${EPREFIX}${SITELISP}"/${PN}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ # move images out of elisp dir
+ mkdir -p "${ED}${SITEETC}"/${PN}/ || die
+ mv "${ED}${SITELISP}"/${PN}/images "${ED}${SITEETC}"/${PN}/ || die
+
+ # Create missing script, loosely translated from 4.4 version
+ make_wrapper ${PN} "${EMACS} \
+ -eval '(load \"${SITELISP}/${PN}/generic/proof-site.el\")' \
+ -f proofgeneral \
+ -f proof-splash-display-screen"
+
+ doinfo doc/*.info*
+ doman doc/${PN}.1
+ einstalldocs
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 3ee76561f47e..bddd9bb9169b 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 1100b6242c63..8ec3dceb4763 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -1,4 +1,6 @@
DIST dxvk-1.10.1.tar.gz 1188138 BLAKE2B e4c5c5052de3f0976581317b9e6de148735198d2545e961ed4540be8660fbba0bcd30f81a1b55f032a1e00e226993d1ab3e4017b104f2829bf37d2ee4fc4420a SHA512 8fd34d9f14a7013cdc1957f63bf60feb19748fddc1cd6ec40cf271005f636de62965efb42ddf2598dad3e37a4f59a870bf769387b2534db93451d1ea6aa65410
-EBUILD dxvk-1.10.1.ebuild 4354 BLAKE2B 7b82f950f5a0ad8183d24602c9786c932214166a911958b744fcb9705ed8f06eefa0699177a43c994386b5fed6a18b29c2e935ce65904667af6e29a95d3f9e54 SHA512 d022a9e6985433ad8542251fd38c4a6150cf2f1ef07a1c3f9b3227afa66e3dce31cbc203e08b69593cb6ca8568378f0657d8fc40cd77b8d316754daf7704ce85
-EBUILD dxvk-9999.ebuild 4354 BLAKE2B 7b82f950f5a0ad8183d24602c9786c932214166a911958b744fcb9705ed8f06eefa0699177a43c994386b5fed6a18b29c2e935ce65904667af6e29a95d3f9e54 SHA512 d022a9e6985433ad8542251fd38c4a6150cf2f1ef07a1c3f9b3227afa66e3dce31cbc203e08b69593cb6ca8568378f0657d8fc40cd77b8d316754daf7704ce85
+DIST dxvk-1.10.2.tar.gz 1199562 BLAKE2B 8605d80de3640845589727999da8d19f235eafd52dc693ddfc6a6c54da4525ab5a1418694767395e37cfd84ab55bfd33867cd8608ff2e34965759f68832f55ee SHA512 2a68ececd405e38b6a463637f98c871e53f83c0b232bbf45f08b6b2cac01637eecea90f9337d8ebc600e174a65fe2b10236b1b29afdbd0ad0a9d970a050678a4
+EBUILD dxvk-1.10.1.ebuild 4362 BLAKE2B bfaec727b86399ec9e1a62494f9817e72c1d8ef19c17a752e11789e412db396fe1d1b14de2e5d60dfabf608daad1ce03b03bca06b03a6e74ef72543ab3993bbd SHA512 7415fdee8daebee75269a7d344f23d4d6f6b771447e9f43528220b13f5081e7a9c04dd5dba4925773844a42dfb94029cbae137d22851eb20eb849b42a227effd
+EBUILD dxvk-1.10.2.ebuild 4362 BLAKE2B bfaec727b86399ec9e1a62494f9817e72c1d8ef19c17a752e11789e412db396fe1d1b14de2e5d60dfabf608daad1ce03b03bca06b03a6e74ef72543ab3993bbd SHA512 7415fdee8daebee75269a7d344f23d4d6f6b771447e9f43528220b13f5081e7a9c04dd5dba4925773844a42dfb94029cbae137d22851eb20eb849b42a227effd
+EBUILD dxvk-9999.ebuild 4362 BLAKE2B bfaec727b86399ec9e1a62494f9817e72c1d8ef19c17a752e11789e412db396fe1d1b14de2e5d60dfabf608daad1ce03b03bca06b03a6e74ef72543ab3993bbd SHA512 7415fdee8daebee75269a7d344f23d4d6f6b771447e9f43528220b13f5081e7a9c04dd5dba4925773844a42dfb94029cbae137d22851eb20eb849b42a227effd
MISC metadata.xml 818 BLAKE2B 88081c074b99329c925174de4b7ff9b2c220ffc67eb64a5324f4eaf2a35f98f06c9978ddc0e929ba76b341a389a8eff025b7aa0a2414e3f7ae496c44a023c65c SHA512 90d76ac3df3abe003371cd25b9cf0e6570a53b371349fb2e048cae1818e51f0482e17b3d5490eb82c57d891bb43c4a7cd41530101b888591719c33c566788e3b
diff --git a/app-emulation/dxvk/dxvk-1.10.1.ebuild b/app-emulation/dxvk/dxvk-1.10.1.ebuild
index cf84df747aaa..d260df14098d 100644
--- a/app-emulation/dxvk/dxvk-1.10.1.ebuild
+++ b/app-emulation/dxvk/dxvk-1.10.1.ebuild
@@ -103,7 +103,7 @@ multilib_src_install_all() {
}
pkg_preinst() {
- [[ -e /usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
+ [[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
}
pkg_postinst() {
diff --git a/app-emulation/dxvk/dxvk-1.10.2.ebuild b/app-emulation/dxvk/dxvk-1.10.2.ebuild
new file mode 100644
index 000000000000..d260df14098d
--- /dev/null
+++ b/app-emulation/dxvk/dxvk-1.10.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit flag-o-matic meson-multilib
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
+else
+ SRC_URI="https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
+HOMEPAGE="https://github.com/doitsujin/dxvk/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi"
+REQUIRED_USE="
+ || ( d3d9 d3d10 d3d11 dxgi )
+ d3d10? ( d3d11 )
+ dxgi? ( d3d11 )"
+
+BDEPEND="
+ dev-util/glslang
+ !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+ local tool=-w64-mingw32-g++
+ for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
+ if ! type -P ${tool} >/dev/null; then
+ eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
+ eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
+ use abi_x86_32 && use abi_x86_64 &&
+ eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
+ die "USE=crossdev-mingw is set but ${tool} was not found"
+ elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
+ eerror "${PN} requires GCC to be built with --enable-threads=posix"
+ eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
+ die "USE=crossdev-mingw is set but ${tool} does not use POSIX threads"
+ fi
+ done
+ fi
+}
+
+src_prepare() {
+ default
+
+ sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die
+}
+
+src_configure() {
+ use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+ # AVX has a history of causing issues with this package, disable for safety
+ # https://github.com/Tk-Glitch/PKGBUILDS/issues/515
+ append-flags -mno-avx
+
+ if [[ ${CHOST} != *-mingw* ]]; then
+ [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP
+
+ CHOST_amd64=x86_64-w64-mingw32
+ CHOST_x86=i686-w64-mingw32
+ CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
+
+ strip-unsupported-flags
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ # multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
+ # unset again so meson eclass will set ${CHOST}-gcc + others
+ use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP
+
+ local emesonargs=(
+ --prefix="${EPREFIX}"/usr/lib/${PN}
+ --{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2}
+ $(meson_use {,enable_}d3d9)
+ $(meson_use {,enable_}d3d10)
+ $(meson_use {,enable_}d3d11)
+ $(meson_use {,enable_}dxgi)
+ $(usev !debug --strip) # portage won't strip .dll, so allow it here
+ -Denable_tests=false # needs wine/vulkan and is intended for manual use
+ )
+
+ meson_src_configure
+}
+
+multilib_src_install_all() {
+ dobin setup_dxvk.sh
+ dodoc README.md dxvk.conf
+
+ find "${ED}" -type f -name '*.a' -delete || die
+}
+
+pkg_preinst() {
+ [[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
+}
+
+pkg_postinst() {
+ if [[ ! ${REPLACING_VERSIONS} ]]; then
+ elog "To enable ${PN} on a wine prefix, you can run the following command:"
+ elog
+ elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
+ elog
+ elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
+ elif [[ -v DXVK_HAD_OVERLAY ]]; then
+ # temporary warning until this version is more widely used
+ elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays."
+ elog "If you were using symbolic links in wine prefixes it may be necessary to"
+ elog "refresh them by re-running the command:"
+ elog
+ elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
+ elog
+ elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load"
+ elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs."
+ fi
+
+ # don't try to keep wine-*[vulkan] in RDEPEND, but still give a warning
+ local wine
+ for wine in app-emulation/wine-{vanilla,staging}; do
+ has_version ${wine} && ! has_version ${wine}[vulkan] &&
+ ewarn "${wine} was not built with USE=vulkan, ${PN} will not be usable with it"
+ done
+}
diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild
index cf84df747aaa..d260df14098d 100644
--- a/app-emulation/dxvk/dxvk-9999.ebuild
+++ b/app-emulation/dxvk/dxvk-9999.ebuild
@@ -103,7 +103,7 @@ multilib_src_install_all() {
}
pkg_preinst() {
- [[ -e /usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
+ [[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
}
pkg_postinst() {
diff --git a/app-emulation/libguestfs-appliance/Manifest b/app-emulation/libguestfs-appliance/Manifest
index 30da773299f1..8557216cf7e9 100644
--- a/app-emulation/libguestfs-appliance/Manifest
+++ b/app-emulation/libguestfs-appliance/Manifest
@@ -1,4 +1,4 @@
AUX env.file 47 BLAKE2B 2b9034e60acea9f2300ec234a7ccdd6b438d2370808f8c30c8470c735287d1ed5ee6f75f0c1fa05423a39e558ca5daa258de44b1125999ac47e289c7c4df332d SHA512 74b5c63ab4421238b4e2c54dfc9579dea719101c0b9066341ddf3aa64ff1ed739e6d38e837b388ded1f741bc57c47a52772bf22ee52318acc5cb34908f1df1fd
DIST appliance-1.46.0.tar.xz 145436856 BLAKE2B d9ed31f533a2772b0f506176b39bfdfdec1421fe4ff7934ccdb1db0cb2644d477211ec1a2d372d7e5dd0a8f278f47a39bff813b7bc4c9a038258a5f6358b4e91 SHA512 842119bdf95dbbd61328891e9bd0b557bed90ba79c6419ee18d1a79cd4a301ea6922339b9e80ac314ff3e16498e9d3c594861aebe8e0fc2db41d285eb8e5d578
-EBUILD libguestfs-appliance-1.46.0.ebuild 1273 BLAKE2B 1bbd1c3695ccb8dce8fc400d76960e0bcf704f4d2eec159a8a1be6f3eaf039237abfef2cf091676d51acbda019e3f0659426c28f807f61050356ff9ed8a8e34d SHA512 6ab5aee5bedabc46fa5a70475bb022a3204989a5e9d8b9e68a513b5bb0f4c897802c1b1a3911ec83951141827198123a4e510e24f394635eedb19a28c06cbce4
+EBUILD libguestfs-appliance-1.46.0.ebuild 1276 BLAKE2B 36f766718f99957d37c1e31a4737691877dae34309e0d42cebaf2e034c9d7bc719bdfbd3519bfcf9e227e302825c388ccd3dd7ec1b53253bf149d14a08f4e5fe SHA512 aae2a30862927485f5e8f4a1b72007442e2c3b8b88988321dd0dbc12ebc315cd1489393e9ef6e9cf8c7f6fb4b764174815b8373997f4387f9b7edeb1fe67b6df
MISC metadata.xml 358 BLAKE2B 5c53a4234d111074211770ddf29787389265ae3d1c4b9df049fbe9866eaf6d21d567f3174a1d7cf609f6058587fcc82baec92a89cbb77bc7223d4fdeccbe7905 SHA512 d6a65ffa0ef14230ff77b36edb0885781820f0be0a5ba915e805669539478cbd9cdf89532d621336a9189c443a3b9399d47502fdd87993ae0167eada9e95afee
diff --git a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
index a528cf39d52f..74e8430766b5 100644
--- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-# Bump with app-emulation/libguestfs and app-emulation/libguestfs (if any new release there)
+# Bump with app-emulation/libguestfs and app-emulation/guestfs-tools (if any new release there)
CHECKREQS_DISK_USR=500M
CHECKREQS_DISK_BUILD=500M
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 3d6d40c5c529..b9acc31ade55 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -1,6 +1,8 @@
AUX 1.44/0001-Check-for-caml_alloc_initialized_string-existence-ev.patch 991 BLAKE2B 213bea03f22a03f6cd7a82d310fcd106c1b06493e744a7bfb95b7820fe7813208e343170cf9d4322180528ea9e05ab94d54b1ba601bd0550388a33b1bf222211 SHA512 344729229c35e66d21911ae040b4a15ce9a5b37de0f1965272de1c85f21d3293182bbb7953cdd99bb8fe7909754ae462c5d7e973d369ff6d0b64c590fc1d2ee8
DIST libguestfs-1.48.0.tar.gz 18426132 BLAKE2B a0ace19998e6eb368fa8ad73242b7c35c72244e9b9881f3adb76dcc8ed6e9a77691012e5786a26680a944d0876091bbb1d0f9ac63c0f5046538acf4402f840ac SHA512 b2486f32a3958c2b3e68d3f547dcd192dc7f8c59e0efd8660cd27cae9c218ce4fc2a60480dcb6bb0d10d8abbc2d2f4796075aea1cfab5e3c7cd12c38d4352fe2
DIST libguestfs-1.48.3.tar.gz 19185249 BLAKE2B 1de07920c731a64ece9f1541752672a0251af73e455a3bd74fff6d512e96ef3a1b8182728080571fbf0f49ef072ed17029c6a5bd12f8171a1d2079bff0c22df2 SHA512 d88b7869e6098af1f7748dc2e8163b245ea251fcdf962a71e3735f5a1748c9e87a17be259802da3e0bb13569d7f7233b2c5a554b20a2a7758e1974a30a70b786
+DIST libguestfs-1.48.4.tar.gz 19189712 BLAKE2B 50a11254c21903caa62b40b43e3ab3cc9e740dd0c690055c245391d0a980279a897e727f0ff5b063b197b91a1e6fdadc08e257d5cd4ce3df254e5c42abc32ee3 SHA512 76b942de88fa6fb48db667054a2c4fc23dd17b0a6083cddd51f1a77fdac24c0c7acd6be5234ada955b4afa94b0d8023aab50aa152465a6bc65f0e21d4195d50c
EBUILD libguestfs-1.48.0.ebuild 5283 BLAKE2B 6ee79999c8f08b9049465794eba05b8032b3882e824ab62233bb02d4392c5afcbc8de44f6064ec08ec350022b1663c558d78d30743868472149ca22ad832b844 SHA512 1b87f8e4842279feb6a01255fab33273138a4f9355cae0aa22ce9b601dc8854995b4eae6134a7a0d64d2d7b1ada02cc513da8d8d4f0adbb98c0633d0c3481c59
EBUILD libguestfs-1.48.3.ebuild 5389 BLAKE2B 9005f8111fc6bf561feb5ac7bb0e4087a3b9e45b2cfb1b24760c0900a56dfc92c64687dea75d912dee3da06b37efdef77ad20726a8487b9ba2dc4316fca228aa SHA512 efd9cf5f32661a0057aa3f384ac47a90a4a1f719482606ca6dc9011b599b1b12e80209eb1b031b865e316896d330d660c201714e6fd1ce0af119be1505e22528
+EBUILD libguestfs-1.48.4.ebuild 5810 BLAKE2B f144df8a001829e7f4c202b34712f088d45f1ce39362fe9bc63606e9873d4ccce9a4f33560ee0c0aaf981a4a04eb73355ebfddfb6bcbacb852d677ea9e9c5857 SHA512 88487e6e6149b02522d429a0d282dc4720d2456cd63582cafd7e58c29727f5c4a2f1e7a49e07a1ad9033315cfca88a0bafd3f48fe9a53755b2a8b9efe5122412
MISC metadata.xml 612 BLAKE2B 434f61bf6376288a782f4d2781938b6d647b7c1fab5d598a8fdd96c380ecef5947bd326a2c4f0d09fa40b6d00b1d59b86b27bea92cef311d9eae411d31465c3c SHA512 3dc1ae8480b6d1c1e2a800d8f8bb0f4171f645c69a47c9319b6d7ccefc2434c2d57fbcd0b47d48008196d1d1835693ccef984219bf7a2b10c444ffd04ef55672
diff --git a/app-emulation/libguestfs/libguestfs-1.48.4.ebuild b/app-emulation/libguestfs/libguestfs-1.48.4.ebuild
new file mode 100644
index 000000000000..05b786614fa7
--- /dev/null
+++ b/app-emulation/libguestfs/libguestfs-1.48.4.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Bump with app-emulation/guestfs-tools and app-emulation/libguestfs-appliance (if any new release there)
+
+LUA_COMPAT=( lua5-1 )
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit autotools flag-o-matic linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs
+
+MY_PV_1="$(ver_cut 1-2)"
+MY_PV_2="$(ver_cut 2)"
+[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
+
+DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images"
+HOMEPAGE="https://libguestfs.org/"
+SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/${MY_PV_1}"
+KEYWORDS="~amd64"
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua +ocaml +perl python ruby selinux static-libs systemtap test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Failures - doc
+COMMON_DEPEND="
+ >=app-admin/augeas-1.8.0
+ app-arch/cpio
+ app-arch/lzma
+ app-arch/rpm
+ app-arch/unzip[natspec]
+ app-arch/xz-utils
+ app-forensics/yara
+ app-cdr/cdrtools
+ app-crypt/gnupg
+ >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
+ >=app-misc/hivex-1.3.1
+ dev-lang/perl:=
+ dev-libs/libconfig:=
+ dev-libs/libpcre2
+ dev-libs/libxml2:2=
+ dev-libs/jansson:=
+ >=dev-libs/yajl-2.0.4
+ net-libs/libtirpc:=
+ sys-libs/ncurses:0=
+ >=sys-apps/fakechroot-2.8
+ sys-apps/fakeroot
+ sys-apps/file
+ sys-devel/gettext
+ sys-fs/squashfs-tools:*
+ sys-libs/libcap
+ sys-libs/readline:=
+ virtual/acl
+ virtual/libcrypt:=
+ erlang? ( dev-lang/erlang )
+ perl? (
+ virtual/perl-ExtUtils-MakeMaker
+ >=dev-perl/Sys-Virt-0.2.4
+ virtual/perl-Getopt-Long
+ virtual/perl-Data-Dumper
+ dev-perl/libintl-perl
+ >=app-misc/hivex-1.3.1[perl?]
+ dev-perl/String-ShellQuote
+ )
+ python? ( ${PYTHON_DEPS} )
+ fuse? ( sys-fs/fuse:= )
+ gtk? (
+ sys-apps/dbus
+ x11-libs/gtk+:3
+ )
+ introspection? (
+ >=dev-libs/glib-2.26:2
+ >=dev-libs/gobject-introspection-1.30.0:=
+ )
+ inspect-icons? (
+ media-libs/netpbm
+ media-gfx/icoutils
+ )
+ libvirt? ( app-emulation/libvirt )
+ lua? ( ${LUA_DEPS} )
+ ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
+ selinux? (
+ sys-libs/libselinux:=
+ sys-libs/libsemanage
+ )
+ systemtap? ( dev-util/systemtap )
+"
+# Some OCaml is always required
+# bug #729674
+DEPEND="${COMMON_DEPEND}
+ >=dev-lang/ocaml-4.03:=[ocamlopt]
+ dev-util/gperf
+ dev-ml/findlib[ocamlopt]
+ doc? ( app-text/po4a )
+ ocaml? (
+ dev-ml/ounit2[ocamlopt]
+ || (
+ "${S}"/src/${PN}/_version.py || die "Failed to generate the version file"
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+
+ elog
+
+ if ! use gui; then
+ ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
+ ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
+ ewarn
+ fi
+
+ elog "Protontricks can only find games for which a Proton prefix already exists."
+ elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
+ elog
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-emulation/xcpc/Manifest b/app-emulation/xcpc/Manifest
index bfde16966709..be79e9068949 100644
--- a/app-emulation/xcpc/Manifest
+++ b/app-emulation/xcpc/Manifest
@@ -1,3 +1,3 @@
DIST xcpc-0.37.0.tar.gz 1094259 BLAKE2B 670de05f53d05d375c9cb252e672f8fa9027419302b521b88dc1904ec99571fa95b390bfdc5eea3eb2355730c02a955c10cbc2f29d7e4c52506173e8f5d6c540 SHA512 8579711595ac5234c1c8a6e9d0279950c97966a2a8919d4f0ba404c5bd5609f299ab0b5131d6973f5decfc12bff184facf3009522bef568a108b5cfb7e74be11
-EBUILD xcpc-0.37.0.ebuild 585 BLAKE2B 790bcce0cd13fcd5ba9dfd6e9b6478f3dfe597a3aeaeac55e781fecb18141373811c797ff1499f7b7e219470ed28ba31f43aa2ae10fa053e8ea9954e1ea8605e SHA512 adc95d07d1a76abb8b4c964ca762a669439585863c19dae746bbdaafb11aa524355b93c4fe6c32458942d48fa0b1a65be922f6162fbc33434f75353aee128945
+EBUILD xcpc-0.37.0-r1.ebuild 585 BLAKE2B 385c25b10c5be93dfc03333f9a84cab2d66eb96943a075f50b52b6c2cdb352031502b2c57ec20830f89ad05a4435a5bca45f6b9e09f2e55b2c8575c5fcdf444b SHA512 aef83c0966e608f088304485ad8acb9d0982ec11cd2c30f9e4bce73e565f4c488146f56b4e1470d633cfccaa2464a3d2836e6ebb5bec61b1d3c588c5033047dc
MISC metadata.xml 242 BLAKE2B 3019d549c7d2470f0023c341301eb3afefbaef9a88c11b8d298fe9c1ee00dd608aad08b82cbb541ca2c14e6d8552d8b8c5583417af222de78778493e16309e49 SHA512 636789cd124d40c7852b049194f9f0bfbe8904dadc5607186d50a6ca8ed4a2b1b16bedad56688cf093bf5d919728422f5d880afb3a66204f57054ec31761022f
diff --git a/app-emulation/xcpc/xcpc-0.37.0.ebuild b/app-emulation/xcpc/xcpc-0.37.0-r1.ebuild
similarity index 92%
rename from app-emulation/xcpc/xcpc-0.37.0.ebuild
rename to app-emulation/xcpc/xcpc-0.37.0-r1.ebuild
index eb524341b0bd..130b749e94db 100644
--- a/app-emulation/xcpc/xcpc-0.37.0.ebuild
+++ b/app-emulation/xcpc/xcpc-0.37.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit xdg
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 0ff8b1a23eb8..1e4908447621 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,3 +1,4 @@
+AUX README.gentoo 572 BLAKE2B 1284e49ac0bde0e1c1ad32b7dc200848c0837378224daed628036b5835998c9649574e2b91b4891a610188f01900922d3b2bb23fd6381682c3486bc83be9a9ef SHA512 d7312c11154b3446a66af5e11a9d8e1a30c29e42867b51a073f4460078c9a1b7acb94cea6d38bcd7fdafbb4384856cd11093f41eee1941ca43303a5e21765b03
AUX gentoo-patches.conf 2606 BLAKE2B 7fe706c365038bf0c21a3001cd5f6f73be05302eb947f18a471375059095b563a7a880894d39521bca1acc99b15e7b2ab3d6214cd1dccc9b3dc2844c68eac4a8 SHA512 4cc22817195d8a125c9ead62c7dc1354b797f06db2d18f5d14821d67ab9235d99ac432ba2e0402f92563b6262a706a4f2163f3972a00142a29bb92748851ce97
AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
@@ -27,7 +28,9 @@ DIST xen-4.15.3.tar.gz 40793144 BLAKE2B 33932d855a0502cfe2768a7c8ae19d7da285d70b
DIST xen-4.16.1.tar.gz 44964667 BLAKE2B 190d9c330b5dcdd47bae26b6ef42111c9c63b71b8b92e20eae268054c6b40aaabadef78c0c9634cb3c3b1bde32a746cbb1404b5eed2a82ab829ba10632103856 SHA512 eeabba9c263cd2425bca083e32b5ebfc6c716c00553759c144fd4b6f64a89836b260787fa25ba22c1f5c4ea65aaad7c95b8c2c1070d3377b1c43c9517aa7032a
DIST xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2 4681 BLAKE2B 59fe5c2d5f3b975f281778ee96f8771debde7ae738636fc8294e7e2578dffc40938d8c48e4e94f0341762b2ba8e1b6769f71b7783322fb3b2a0a187bbf2b5104 SHA512 8540aa3631277fb652f90c53f6f5b4e9d119a7ed267dec96d7aecca4eac2c465ec3be32b0b82057e79f858cc8115bfdfbf2af5c4879a0be3f98ed68cbe64fdae
DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
-DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B 198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584 SHA512 d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49
+DIST xen-upstream-patches-4.15.4-pre-patchset-0.1.tar.bz2 28980 BLAKE2B 5bdabed3bce4306fe5f656a965d1e537608c03b4706dc801a0b0b9649d001b875b1a2543c68c6b459483991570f0fbf2490a97ea1776761c9f61e9876f240fdf SHA512 4f6bbf0dab57ad58292f32fab55294b2eedd0442be7f62341a2df922a1d21880fe33cc29956ccbbb8b4aee4c10b38d4aa090e4db9496d6e0f5256e60999cad7d
+DIST xen-upstream-patches-4.16.2-pre-patchset-1.tar.bz2 56760 BLAKE2B 4c8030347f9e1ad3c2c4f440645656452daa1f087c34b8a3baba3cae1e7623a910e5727395e8c6f4a8573f3a37e58a318c485fa2f878c8e2f3240fb75cee0c03 SHA512 5e279845052addfbf7681ad5ccab9e692e4a1d69b73e51e1782e498f98217de77bfc4f5158307ee90164393edb023165e032b9f9f7123c0c614ee2336c021259
EBUILD xen-tools-4.15.3.ebuild 16673 BLAKE2B 5564ae42258c6eb413b4b29730d6fa5823f4479dd8b483d2ef093ab1d1ae9e234d3b42bcfd1fdb1667f0584604cc54fcef76be6f2bb03e862fc8302053e89999 SHA512 9c774445827cca9995f488e1bd5ae37a6a3402774e45c62a984fc3331ba53f5546f664504fb487474e4dd856f541263dc1de1ffbd909b6a1318db24916e0dc65
-EBUILD xen-tools-4.16.2_pre1.ebuild 16785 BLAKE2B fcb88e3b26c6fab27fa3f82c4f5684044087cb1479e470bdc5ed1985016cb3cf44c41733b7eb06f5bb9648d2c46dcbd456f0938439ab3eac357281c7e6dc66f9 SHA512 911c6e0731ddc7b6bc7a567e25155ab0d05ad537e970cdda961f3904b9ca73696698c7b5c9ae7d4669cd2e4fab8e9b40f2e7f22c85eae6e77c7e49c20fb2afca
+EBUILD xen-tools-4.15.4_pre.ebuild 16707 BLAKE2B abed0efd8aeafa933f1a94edefa27dcb0b0e4ff9537639742a4d492174ab14dd612329b125cdd561c5ff0b72d710c6d553ef8f1dde39824d24840271c9197bd1 SHA512 8c90c61f52e76b8d4ad2db5eb43a98f61868cf8dbb49bfb5bef3148368166191066c1874c7889ab5db6c92520b99fb7ac7fbe604592cd5025c08cf2677933ad7
+EBUILD xen-tools-4.16.2_pre2-r1.ebuild 16110 BLAKE2B f7f320b4a1bff2daf4a15af3f0014774b17c0da45baef1de66ba270480f78533738606bb4f1d1cdebb00a1836ed1700f69892ab2c6e42ecda5abd3f657d5e7d7 SHA512 7f72e87ae75123222f54731808117f26a50323fde8ae0de26fea2c1ba9735e1e6131e13da6f68b9bb8fdb574bd19f11f272a86ad38372ddd24dd7779b9f4d312
MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/files/README.gentoo b/app-emulation/xen-tools/files/README.gentoo
new file mode 100644
index 000000000000..e0c84a5f3359
--- /dev/null
+++ b/app-emulation/xen-tools/files/README.gentoo
@@ -0,0 +1,16 @@
+Official Xen Guide and the offical wiki page:
+- https://wiki.gentoo.org/wiki/Xen
+- https://wiki.xen.org/wiki/Main_Page
+
+
+If you use OpenRC:
+It is recommended to utilise the xencommons script to configure the system at
+boot time.
+
+
+If you use QEMU:
+The qemu-bridge-helper is renamed to the xen-bridge-helper in the in
+source build of qemu. This allows for app-emulation/qemu to be emerged
+concurrently with the qemu capable xen. It is up to the user to
+distinguish between and utilise the qemu-bridge-helper and the
+xen-bridge-helper. File bugs of any issues that arise.
diff --git a/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.15.4_pre.ebuild
similarity index 98%
rename from app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild
rename to app-emulation/xen-tools/xen-tools-4.15.4_pre.ebuild
index 1aa03defc2a3..6e8b7325cf79 100644
--- a/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.4_pre.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}"
else
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 x86"
SEABIOS_VER="1.14.0"
EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
@@ -23,9 +23,9 @@ else
EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
- XEN_PRE_PATCHSET_NUM=0
- XEN_GENTOO_PATCHSET_NUM=1
- XEN_PRE_VERSION_BASE=4.16.1
+ XEN_PRE_PATCHSET_NUM=0.1
+ XEN_GENTOO_PATCHSET_NUM=2
+ XEN_PRE_VERSION_BASE=4.15.3
XEN_BASE_PV="${PV}"
if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
@@ -68,7 +68,7 @@ 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 lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd"
+IUSE="api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -86,9 +86,7 @@ COMMON_DEPEND="
dev-libs/glib:2
sys-libs/pam
)
- zstd? ( app-arch/zstd )
app-arch/bzip2
- app-arch/zstd
dev-libs/libnl:3
dev-libs/lzo:2
dev-libs/yajl
@@ -245,11 +243,10 @@ src_prepare() {
# collisions with app-emulation/qemu.
sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
tools/qemu-xen/include/net/net.h \
- tools/qemu-xen/meson.build \
+ tools/qemu-xen/Makefile \
tools/qemu-xen/qemu-bridge-helper.c \
tools/qemu-xen/qemu-options.hx \
|| die
- mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
if use ovmf; then
mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
@@ -282,6 +279,8 @@ src_prepare() {
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
@@ -404,7 +403,6 @@ src_configure() {
$(use_enable ocaml ocamltools)
$(use_enable ovmf)
$(use_enable rombios)
- $(use_enable systemd)
--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored')
)
diff --git a/app-emulation/xen-tools/xen-tools-4.16.2_pre2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.16.2_pre2-r1.ebuild
new file mode 100644
index 000000000000..87a3b970d5b0
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.16.2_pre2-r1.ebuild
@@ -0,0 +1,526 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
+
+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"
+
+ SEABIOS_VER="1.14.0"
+ EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
+ EDK2_OPENSSL_VERSION="1_1_1j"
+ EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+ EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+ IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
+
+ XEN_PRE_PATCHSET_NUM=1
+ XEN_GENTOO_PATCHSET_NUM=1
+ XEN_PRE_VERSION_BASE=4.16.1
+
+ XEN_BASE_PV="${PV}"
+ if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+ XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+ fi
+
+ SRC_URI="
+ https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
+ https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+ ipxe? ( https://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
+ )
+ "
+
+ if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+ XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+ XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+ SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
+ XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+ fi
+ if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+ XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+ XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+ SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
+ XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+ fi
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://xenproject.org"
+DOCS=( README )
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+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 lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ipxe? ( rombios )
+ ovmf? ( hvm )
+ pygrub? ( python )
+ rombios? ( hvm )
+ system-ipxe? ( rombios )
+ ?? ( ipxe system-ipxe )
+ ?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+ lzma? ( app-arch/xz-utils )
+ qemu? (
+ dev-libs/glib:2
+ sys-libs/pam
+ )
+ zstd? ( app-arch/zstd )
+ app-arch/bzip2
+ app-arch/zstd
+ dev-libs/libnl:3
+ dev-libs/lzo:2
+ dev-libs/yajl
+ sys-apps/util-linux
+ sys-fs/e2fsprogs
+ sys-libs/ncurses
+ 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}]
+ ')
+ 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 ) )
+ arm64? ( sys-power/iasl
+ 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:=
+ dev-util/meson
+ 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/ovmf.bin
+ usr/libexec/xen/boot/xen-shim
+ usr/share/qemu-xen/qemu/hppa-firmware.img
+ usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+ usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+ usr/share/qemu-xen/qemu/s390-ccw.img
+ usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_EXECSTACK="
+ usr/share/qemu-xen/qemu/hppa-firmware.img
+"
+
+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/ovmf.bin
+ 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"
+
+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() {
+ # 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
+
+ if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+ eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+ fi
+
+ if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+ eapply "${XEN_GENTOO_PATCHES_DIR}"
+ fi
+
+ # Rename qemu-bridge-helper to xen-bridge-helper to avoid file
+ # collisions with app-emulation/qemu.
+ sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
+ tools/qemu-xen/include/net/net.h \
+ tools/qemu-xen/meson.build \
+ tools/qemu-xen/qemu-bridge-helper.c \
+ tools/qemu-xen/qemu-options.hx \
+ || die
+ mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+ if use ovmf; then
+ 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
+ fi
+
+ # ipxe
+ if use ipxe; then
+ cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz || die
+
+ # gcc 11
+ cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${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
+
+ # Fix texi2html build error with new texi2html, qemu.doc.html
+ sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/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 :=.*;BASH_COMPLETION_DIR := $(get_bashcompdir);" \
+ -i config/Paths.mk.in || 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
+
+ # Remove -Werror
+ find . -type f \( -name Makefile -o -name "*.mk" \) \
+ -exec sed -i \
+ -e 's/-Werror //g' \
+ -e '/^CFLAGS *+= -Werror$/d' \
+ -e 's/, "-Werror"//' \
+ {} + || die
+
+ default
+}
+
+src_configure() {
+ local myconf=(
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ --libexecdir="${EPREFIX}/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 rombios)
+ $(use_enable systemd)
+ --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
+
+ # bug #845099
+ if use ipxe; then
+ local -x NO_WERROR=1
+ fi
+
+ emake \
+ HOSTCC="$(tc-getBUILD_CC)" \
+ HOSTCXX="$(tc-getBUILD_CXX)" \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ LD="$(tc-getLD)" \
+ AR="$(tc-getAR)" \
+ OBJDUMP="$(tc-getOBJDUMP)" \
+ 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
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index d7ce29f24519..46017f6509bb 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -5,7 +5,9 @@ AUX xen-4.16-no-symlink.patch 1044 BLAKE2B 3f5cb93403e3cd606a5eabb8b0e7facb3c95a
DIST xen-4.15.3.tar.gz 40793144 BLAKE2B 33932d855a0502cfe2768a7c8ae19d7da285d70b4970d96fd703daf0ee24a77ad47a3d1b4bcf5f465aa81aa7eb7f9295bce96302b2149ca208fa662cd966d6af SHA512 c25903cc263891885ec76500488405226c8e025bb461d2bf0d590b9bd2d7ca5c2693de7ecc38b3655bfd6793cc96314826559f14a09cc139de8cfdbeb914cbd3
DIST xen-4.16.1.tar.gz 44964667 BLAKE2B 190d9c330b5dcdd47bae26b6ef42111c9c63b71b8b92e20eae268054c6b40aaabadef78c0c9634cb3c3b1bde32a746cbb1404b5eed2a82ab829ba10632103856 SHA512 eeabba9c263cd2425bca083e32b5ebfc6c716c00553759c144fd4b6f64a89836b260787fa25ba22c1f5c4ea65aaad7c95b8c2c1070d3377b1c43c9517aa7032a
DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
-DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B 198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584 SHA512 d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49
+DIST xen-upstream-patches-4.15.4-pre-patchset-0.1.tar.bz2 28980 BLAKE2B 5bdabed3bce4306fe5f656a965d1e537608c03b4706dc801a0b0b9649d001b875b1a2543c68c6b459483991570f0fbf2490a97ea1776761c9f61e9876f240fdf SHA512 4f6bbf0dab57ad58292f32fab55294b2eedd0442be7f62341a2df922a1d21880fe33cc29956ccbbb8b4aee4c10b38d4aa090e4db9496d6e0f5256e60999cad7d
+DIST xen-upstream-patches-4.16.2-pre-patchset-1.tar.bz2 56760 BLAKE2B 4c8030347f9e1ad3c2c4f440645656452daa1f087c34b8a3baba3cae1e7623a910e5727395e8c6f4a8573f3a37e58a318c485fa2f878c8e2f3240fb75cee0c03 SHA512 5e279845052addfbf7681ad5ccab9e692e4a1d69b73e51e1782e498f98217de77bfc4f5158307ee90164393edb023165e032b9f9f7123c0c614ee2336c021259
EBUILD xen-4.15.3.ebuild 4724 BLAKE2B d8cea46c30edb523780e7e6bcd2bfa0d45e5c3cd025341228aeaa24b8d5f26587f48a18372f3794f1bc635363391c793d77b63c14de574b239e19f74a4f3a17e SHA512 5167e60d83e9765391d6281cef6dab12145e71ed96a3f6f48139ae9e6d823dd1af0c0becd95d80e84a50a3e978416862232996b34213eaeec55544e0c21b57f3
-EBUILD xen-4.16.2_pre1.ebuild 4761 BLAKE2B fe2c436fca2d516c4ee588c265898b62278636609119768d7ec4319ad2a011cd91c8224d289384ea9fc2f38006437134a96b028d78846488badfea0a2313efe7 SHA512 600b693dd83b464fe57229b3ba3bd9acb42c88ea9b207f78694bf31d61e59ce407c675dd968e2222ffdfc7f8227f8a58a65be951dcb321481eb49eabd7818e75
+EBUILD xen-4.15.4_pre.ebuild 4679 BLAKE2B 8315ca4a195503e25c8ee6dfb693dae124e100285841ead6779a56cfb99500736a0ea53601fd6fc34d2e9381c9dc663452a95cb6370f8784cd45c877dea443a5 SHA512 352f9732a7f9181a52e3ba3296129142c3810325bc1322251afd08111cc4b4aac6b7a8e1ef87d80da83a9cf0d09e0f20a329338db9479051524829ba97a81bfd
+EBUILD xen-4.16.2_pre2.ebuild 4386 BLAKE2B 22dd2b553f0fb8c08e47989b7c911d1685ebe93ec523340e5f7c7fdfd954ab702df480f4314d9dabea366b286053e2ebde51a7bfec7c0fc31f7abd4dfebdc387 SHA512 a2057f44df2b7b52cee23a1e089ebf1e4830e1032329c9e3014580988ff431890d4d617d9f877433235cadc6bd3acb0ff0c075de30a18bc03a7ee59f5f7e3bca
MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/xen-4.16.2_pre1.ebuild b/app-emulation/xen/xen-4.15.4_pre.ebuild
similarity index 93%
rename from app-emulation/xen/xen-4.16.2_pre1.ebuild
rename to app-emulation/xen/xen-4.15.4_pre.ebuild
index 933fd041febc..c231b44c827f 100644
--- a/app-emulation/xen/xen-4.16.2_pre1.ebuild
+++ b/app-emulation/xen/xen-4.15.4_pre.ebuild
@@ -14,9 +14,9 @@ if [[ ${PV} == *9999 ]]; then
else
KEYWORDS="~amd64 ~arm -x86"
- XEN_PRE_PATCHSET_NUM=0
- XEN_GENTOO_PATCHSET_NUM=1
- XEN_PRE_VERSION_BASE=4.16.1
+ XEN_PRE_PATCHSET_NUM=0.1
+ XEN_GENTOO_PATCHSET_NUM=
+ XEN_PRE_VERSION_BASE=4.15.3
XEN_BASE_PV="${PV}"
if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
@@ -46,7 +46,7 @@ S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+boot-symlinks debug efi flask"
+IUSE="debug efi flask"
REQUIRED_USE="arm? ( debug )"
DEPEND="${PYTHON_DEPS}
@@ -88,12 +88,10 @@ src_prepare() {
eapply "${XEN_GENTOO_PATCHES_DIR}"
fi
- eapply "${FILESDIR}"/${PN}-4.16-efi.patch
+ eapply "${FILESDIR}"/${PN}-4.15-efi.patch
- # Symlinks do not work on fat32 volumes # 829765
- if ! use boot-symlinks || use efi; then
- eapply "${FILESDIR}"/${PN}-4.16-no-symlink.patch
- fi
+ # 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
diff --git a/app-emulation/xen/xen-4.16.2_pre2.ebuild b/app-emulation/xen/xen-4.16.2_pre2.ebuild
new file mode 100644
index 000000000000..3ce553a137d3
--- /dev/null
+++ b/app-emulation/xen/xen-4.16.2_pre2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~arm -x86"
+
+ XEN_PRE_PATCHSET_NUM=1
+ XEN_GENTOO_PATCHSET_NUM=1
+ XEN_PRE_VERSION_BASE=4.16.1
+
+ XEN_BASE_PV="${PV}"
+ if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+ XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+ fi
+
+ SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz"
+
+ if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+ XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+ XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+ SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
+ XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+ fi
+ if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+ XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+ XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+ SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
+ XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+ fi
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://xenproject.org"
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+boot-symlinks debug efi flask"
+REQUIRED_USE="arm? ( debug )"
+
+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}"
+
+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() {
+ if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+ eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+ fi
+
+ if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+ eapply "${XEN_GENTOO_PATCHES_DIR}"
+ fi
+
+ eapply "${FILESDIR}"/${PN}-4.16-efi.patch
+
+ # Symlinks do not work on fat32 volumes # 829765
+ if ! use boot-symlinks || use efi; then
+ eapply "${FILESDIR}"/${PN}-4.16-no-symlink.patch
+ fi
+
+ # 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
+}
+
+xen_make() {
+ # Setting clang to either 'y' or 'n' tells Xen's build system
+ # whether or not clang is used.
+ local clang=n
+ if tc-is-clang; then
+ clang=y
+ fi
+
+ # Send raw LDFLAGS so that --as-needed works
+ emake \
+ V=1 \
+ LDFLAGS="$(raw-ldflags)" \
+ HOSTCC="$(tc-getBUILD_CC)" \
+ HOSTCXX="$(tc-getBUILD_CXX)" \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ LD="$(tc-getLD)" \
+ AR="$(tc-getAR)" \
+ OBJDUMP="$(tc-getOBJDUMP)" \
+ RANLIB="$(tc-getRANLIB)" \
+ clang="${clang}" \
+ "$@"
+}
+
+src_configure() {
+ cd xen || die
+
+ touch gentoo-config || die
+ if use arm; then
+ echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die
+ fi
+ if use debug; then
+ cat <<-EOF >> gentoo-config || die
+ CONFIG_DEBUG=y
+ CONFIG_CRASH_DEBUG=y
+EOF
+ fi
+ if use flask; then
+ echo "CONFIG_XSM=y" >> gentoo-config || die
+ fi
+
+ # remove flags
+ unset CFLAGS
+
+ tc-ld-disable-gold # Bug 700374
+
+ xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig
+}
+
+src_compile() {
+ xen_make -C xen
+}
+
+src_install() {
+ # The 'make install' doesn't 'mkdir -p' the subdirs
+ if use efi; then
+ mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+ fi
+
+ xen_make DESTDIR="${D}" -C xen install
+
+ # make install likes to throw in some extra EFI bits if it built
+ use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 62dfe3040ffd..7498592f13f4 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/foremost/Manifest b/app-forensics/foremost/Manifest
index 96734459782d..eacd17645e69 100644
--- a/app-forensics/foremost/Manifest
+++ b/app-forensics/foremost/Manifest
@@ -1,7 +1,8 @@
AUX foremost-1.4-config-location.patch 462 BLAKE2B 7dadc7fd049b09992e9e3019aaaa27d53268a6b6cea03146d965bdd3f0ec3165fbde33c2ecd41a949758ff4b8d36259d048869d17b828e2f600ea9418e3d0bce SHA512 7b6dcc18cba4676ef4d54b87c9c31747754ecbebd9424340b2dd059495c9c6cec11513307fff802a336a99bc07c4bcd2ffcfad1c77ccdc49277ef7e40e30029e
AUX foremost-1.5.7-fno-common.patch 3330 BLAKE2B 0e99b6cd29cb6ef558d2d44ce62b38abcf03f0dffb0dbf302264cfe21255647c09e885ed0dd4726ce0708fae8c03c0bd2e3678906fe6aab0fb24b211442cfd6c SHA512 4a129e0bb97f2c8aa09d6861077e732886e1d26573cc8698abfb03b55ebcf73c7ba1fbd6de25c5a4d2ce8cd271ebf07aa277d823d54640e6922ebc72a6aaba46
AUX foremost-1.5.7-format-security.patch 680 BLAKE2B 5565dc9d255ccbb4b721cdb0b41fef4f86369c4965000e35678e6ece00acec5ead0b15d90bd71a2456b812ab74fa9283bdf70c2fc36003a3d659105bb04a139d SHA512 1c28ed1fceedec728a5060b195214fd3ec3b0fa529e87f7421ee72d73f71ecc0d48a69a5b5ff4c6179dd65781552fbd272437134498ec865bd5c620375b6f85b
+AUX foremost-1.5.7-musl.patch 2427 BLAKE2B 403aa6c8c6605a823f96948bf0c4667e8cd9563827f56924efb44d307667dd7c0f981489577ba86b9b79d327ea9eeb80315612c51ffdee38855c5780365f84de SHA512 bdec206ebdd7fbbdbed6b0bc1a7d0513bc3e1cbb673cb6cb31a217ded9dba142ca40e92cc20cbe8b47d6031d456fd86e0285bb9114f22115405019ae7ab70fca
AUX foremost-1.5.7-set-but-unused.patch 7720 BLAKE2B 047c4a31d26750706a9dad36078e848e68e89f0013a6572369dc42fa014234d37120bdb3c51ec7e83b7c99d4c497c541039e334af1d3bd144cf8250a1212f920 SHA512 1be57b3a63e38556b3a6758c1f24e5424076f11608dba148703c9cef16bac9954366a2540720912e8720d0e291f6d5933f2830b0f1b497a5f6feabc570231a52
DIST foremost-1.5.7.tar.gz 52352 BLAKE2B 5642c1afd86aab0a2f90986c3b030d37b37700c5d0e4b04e4f4a2004d69745280fabd4086a72c33b9eab05b57d125d6b11105c9e11b0112e30077f101eeab7ac SHA512 8827c29d52496783be26374f3943eb26a154d842f34e50fb489f87b3a5045bf85f1e44d7d8d8b12b2355ba3fe4b06a0db979cc22c0f431593c5976001eb931ab
-EBUILD foremost-1.5.7-r3.ebuild 980 BLAKE2B b77306199fc17969bb6f3d144518b0aa40706b6cbdabb7a734d62c9b875955be17cd6aba2d828517bd156a2372be06bfee614e35d5a9b8e57b28c7e74501d118 SHA512 5f6dd75a8b111562018e7b1c4885b54aacce99bad1a38563fd7d778386c750baa38a351d7d725f5bc916677d5bcbdce1589c32b81a32b601f3dd5e448b82344e
+EBUILD foremost-1.5.7-r3.ebuild 1031 BLAKE2B 38c23a88978eaf19735eec148d554f8f21a6a68b88a0466f8ba96b0e307cc7a07d21cbcca75c08415eb8ce2652901f9ef6e8b021442e3d8fa2ecd79c7be03896 SHA512 54257e554d9cf0d0c10a31bfaf2bb80a2909dd109394fd80cc3ddd8a6c4010b5551ccdbaf287e94e0eb9af38b82dbfaf4e20a40007480c3b3652ebeafb6fb14f
MISC metadata.xml 251 BLAKE2B 7ab029eb94dc8bc097d9d94165cf016e292bad9dccfa23c8e6119bf3fcd4737432e924000cfa12d5c77f62fb0e6265876cd6a0161a973f554b88ba7222ea9a0b SHA512 0ae1ad6cf7ab9fb8668d30f730a55cb6ee01ff27bc170058f15594d952441a7e8782d969cba56bd5e6d1228ce25d0d076ce8aa845a48b8deca1a497dc18c1bad
diff --git a/app-forensics/foremost/files/foremost-1.5.7-musl.patch b/app-forensics/foremost/files/foremost-1.5.7-musl.patch
new file mode 100644
index 000000000000..0f8994b2328f
--- /dev/null
+++ b/app-forensics/foremost/files/foremost-1.5.7-musl.patch
@@ -0,0 +1,81 @@
+--- a/cli.c
++++ b/cli.c
+@@ -4,7 +4,7 @@
+
+ void fatal_error (f_state * s, char *msg)
+ {
+- fprintf(stderr, "%s: %s%s", __progname, msg, NEWLINE);
++ fprintf(stderr, "%s: %s%s", program_invocation_short_name, msg, NEWLINE);
+ if (get_audit_file_open(s))
+ {
+ audit_msg(s, msg);
+@@ -16,7 +16,7 @@
+ void print_error(f_state *s, char *fn, char *msg)
+ {
+ if (!(get_mode(s, mode_quiet)))
+- fprintf(stderr, "%s: %s: %s%s", __progname, fn, msg, NEWLINE);
++ fprintf(stderr, "%s: %s: %s%s", program_invocation_short_name, fn, msg, NEWLINE);
+ }
+
+ void print_message(f_state *s, char *format, va_list argp)
+--- a/helpers.c
++++ b/helpers.c
+@@ -133,7 +133,7 @@
+ if (ioctl(fd, BLKGETSIZE, &num_sectors))
+ {
+ #if defined(__DEBUG)
+- fprintf(stderr, "%s: ioctl call to BLKGETSIZE failed.%s", __progname, NEWLINE);
++ fprintf(stderr, "%s: ioctl call to BLKGETSIZE failed.%s", program_invocation_short_name, NEWLINE);
+ #endif
+ }
+ else
+--- a/main.c
++++ b/main.c
+@@ -55,18 +55,18 @@
+
+ void try_msg(void)
+ {
+- fprintf(stderr, "Try `%s -h` for more information.%s", __progname, NEWLINE);
++ fprintf(stderr, "Try `%s -h` for more information.%s", program_invocation_short_name, NEWLINE);
+ }
+
+ /* The usage function should, at most, display 22 lines of text to fit
+ on a single screen */
+ void usage(void)
+ {
+- fprintf(stderr, "%s version %s by %s.%s", __progname, VERSION, AUTHOR, NEWLINE);
++ fprintf(stderr, "%s version %s by %s.%s", program_invocation_short_name, VERSION, AUTHOR, NEWLINE);
+ fprintf(stderr,
+ "%s %s [-v|-V|-h|-T|-Q|-q|-a|-w-d] [-t ] [-s ] [-k ] \n\t[-b ] [-c ] [-o ] [-i =sys-libs/libcap-2.24 )
+ python? ( ${_PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ caps? ( virtual/pkgconfig )
+ man? ( app-text/xmlto )
+
+ python? ( ${_PYTHON_DEPS} )
+"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( python )
+"
+RESTRICT="
+ !test? ( test )
+"
+
+pkg_setup() {
+ if use test || use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_configure() {
+ local emesonargs=(
+ "-Dlddtree_implementation=$(usex python python sh)"
+ $(meson_feature caps use_libcap)
+ $(meson_feature man build_manpages)
+ $(meson_use seccomp use_seccomp)
+ $(meson_use test tests)
+
+ # fuzzing is currently broken
+ -Duse_fuzzing=false
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/plod/Manifest b/app-misc/plod/Manifest
index b69c996a01ed..d5b709a4d86f 100644
--- a/app-misc/plod/Manifest
+++ b/app-misc/plod/Manifest
@@ -1,4 +1,4 @@
AUX plodrc 54 BLAKE2B 38a8751fb721690a46098b65f5cedff27cb4035124a4daeab32f2f76ea4f622718cf14915804e5b0d312d1432b521aee7dffbe3dbf79fb7dab66dce218317c28 SHA512 2ad257ddb80bc94cd53e83dbe861ada8ea583eb419472f4488b4b567effa33ea8ada8c450dcf08c42a84c8874e5db85f1c4076b96e2f6228d0b14937830bcec2
DIST plod-1.9.tar.gz 29551 BLAKE2B 6aa0a5857ab1f29263393c63d8b122d6197c75abaa1579ceea5709a61a62e007238caee9aa0513e1e7ee50d0c34e5d478c8ff4014fa47e7b2f27dc05123f590f SHA512 0cf1365963ee0f5a8db445c16ce37890429a4c951ce547560e845316950b4f485ecdc0885e2d35cb240bf9d7bec587c0d913774b05cfca8a145c1837281cad88
-EBUILD plod-1.9-r2.ebuild 765 BLAKE2B 50e4f6e948f04dd1e8b12b14081ccccce16e5f9c2afbb30a2d09bc5c7e346bc0b815c07a4125e4781be0f2c3b0fcd23d663f1de67864acd468b28391a39d17aa SHA512 9382457e075d3f48eebdc881b229d3605a768ef9217c286151fc850bd09bd24ea6c4442b1c53060df3aa205db062874363728c0fa3cdad3cd63605761d63cbab
+EBUILD plod-1.9-r3.ebuild 762 BLAKE2B e874112f3238bd4252c44127481f6b5a3148e8e80fd1769265088f8d89dfc7286c06d3629203ef28ea320b261f4d21c2c47c74e39dc3e495b2c6308ea8970bd9 SHA512 629a70b6dd7bcc0961f99b5f4d13ddfa3dd239152eb7c1a5357771d68076460562fbaa5139c807b90f594cc07c25c143ad9c5ae0e157a397c1dbf7afbaeccb00
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/plod/plod-1.9-r2.ebuild b/app-misc/plod/plod-1.9-r3.ebuild
similarity index 64%
rename from app-misc/plod/plod-1.9-r2.ebuild
rename to app-misc/plod/plod-1.9-r3.ebuild
index 10ebf32c09e9..5c24b32bc242 100644
--- a/app-misc/plod/plod-1.9-r2.ebuild
+++ b/app-misc/plod/plod-1.9-r3.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="A tool to help administrators keep track of daily activities"
-HOMEPAGE="http://www.deer-run.com/~hal/"
+HOMEPAGE="https://www.deer-run.com/~hal/"
SRC_URI="http://www.far2wise.net/plod/${P}.tar.gz"
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-DEPEND="dev-lang/perl"
+BDEPEND="dev-lang/perl"
src_unpack() {
default
- # Bug 619934. Change directories first to ensure that "unpack" outputs
+ # Bug #619934. Change directories first to ensure that "unpack" outputs
# to ${S} and not to ${WORKDIR}.
cd "${S}" || die
- unpack "${S}/${PN}.1.gz"
+ unpack "${S}"/${PN}.1.gz
}
src_prepare() {
default
+
sed -i -e 's#/usr/local#/usr#' "${PN}" || die
}
@@ -32,11 +33,11 @@ src_compile() {
}
src_install() {
- dobin "${PN}"
- doman "${PN}.1"
+ dobin ${PN}
+ doman ${PN}.1
insinto /etc
- doins "${FILESDIR}/${PN}rc"
+ doins "${FILESDIR}"/${PN}rc
dodoc README TODO
}
diff --git a/app-misc/razertool/Manifest b/app-misc/razertool/Manifest
index ee7890d4cb2c..ee8caa6cb807 100644
--- a/app-misc/razertool/Manifest
+++ b/app-misc/razertool/Manifest
@@ -1,4 +1,5 @@
-AUX razertool-0.0.7-ar.patch 347 BLAKE2B 8225103a88e2fbbdcbc23546c06b6052c4d148dbde8151648fa9b4aa563c815296a7801c8b10a5337aa762cd8e2eb76aff3329b261033dff0082a5d1df9a12f2 SHA512 70c570cf089bd165b76adc4242d39b484333931352406d32324db80746151f6722c5a4fcd718b875d9cfae34ffd0d17bf02c63c94cc0f0b1addf43028f0f1734
+AUX razertool-0.0.7-configure.patch 6844 BLAKE2B 6492b444ec681b9e88350855a98386ab26f11132f0fdb37a5eabaa4b16b707b12d826f43b478b53c600727064766fb08cdca02ac628cb51de67ed4c4385be1e5 SHA512 66dfdcc491d84af91e14cd28b984b83c888bf1da7d43717aaf3bfa973d2c928d31b5f4e2f0c79d49300b98cca0ced6182041f859de56c113e30e904788941ed7
+AUX razertool-0.0.7-rules.patch 685 BLAKE2B 466e7b2f8c1afe5d897bd477b0175f2f76a73de23109c30a813963e2cbca43f6ac25e6da1c43e8794584e7c23253da91ba1ab2a1d6496ab2efe4bfef461d5454 SHA512 25a084ae4bc9610f9388b29fbcfeecdf5ed19a13248216562e105cf40c084aef251382c25f4c6261931e983e155c8a81d6402b9d47baa3671ee8068b643e745f
DIST razertool_0.0.7.orig.tar.gz 192274 BLAKE2B 415896f9f6ebaf653be9ede84985b13149f27d4471a8aa53089d138f4f7d58a10ade2aa5f46ec88951572bc7ca1c222db5f88b3df6b37e3ef2ad544a2a7ff28e SHA512 0221ec90b55f4459f5a772eb651e9807423d9e3c82ebd680ee835167bcebf2552e1d7767d294c5392b1fbc58558084e7022cb67f529c033eaff33b4fb3eb1017
-EBUILD razertool-0.0.7-r4.ebuild 1762 BLAKE2B 8219eee8ab8ddbf25cddc3ff9d458a7cf7a2c4f7487fe90e0f5a0c41cc889d027826616808691bb5059aa5a7dd0c26fd24b1dc115a5125bc4fd3f8b2be44289b SHA512 3ad75bc24804ac6e0ffd72e186eaa6b0c352d510011eeb6ae23fce6b977ebf13f17c79818f2ba18cd49f0d5563bea3461f5c65701dd00513aca65e4f20ecd73b
+EBUILD razertool-0.0.7-r5.ebuild 1601 BLAKE2B 45502e28b15c4128bc6a0f56a3359a36b441e7b9875b9a72f4ba69222f18c0e6f848f629a20a14d5d55ab80a79ccd3b06e15f1781ca69d81212d5c98c2315b2d SHA512 21a684aa7138a323f3c64bd480ddebde3211a0a4984152aaf7888371ec3b19adb9b0e2eaeb340ac39ad7be19e3de006caa27e45f7270d7bb0b0989881eb4133b
MISC metadata.xml 558 BLAKE2B 471cbef3552e5828c5aaec305cf318a6d30f36491e12f777ac18b639d9c49db83a4f42c2f66f5d8c9ecb3282766f3ec13fdaaf3f2ae3be51f8fba229a40c02dc SHA512 484d5e869c03fb44d7d6f8248350319a869f963cdcfb15149b4c4277ce07ff0e4be4e763e5f59a8cd9a9ee942c9de9fb2010252284f1ec3e9a0d865546fd0f09
diff --git a/app-misc/razertool/files/razertool-0.0.7-ar.patch b/app-misc/razertool/files/razertool-0.0.7-ar.patch
deleted file mode 100644
index b585205b1b92..000000000000
--- a/app-misc/razertool/files/razertool-0.0.7-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur razertool-0.0.7.orig/configure.in razertool-0.0.7/configure.in
---- razertool-0.0.7.orig/configure.in 2006-08-13 21:57:35.000000000 +0200
-+++ razertool-0.0.7/configure.in 2020-09-03 12:53:51.991020189 +0200
-@@ -10,6 +10,7 @@
- dnl checks for programs
- AC_ISC_POSIX
- AC_PROG_CC
-+AM_PROG_AR
- AM_PROG_CC_STDC
- AC_PROG_RANLIB
- AC_HEADER_STDC
diff --git a/app-misc/razertool/files/razertool-0.0.7-configure.patch b/app-misc/razertool/files/razertool-0.0.7-configure.patch
new file mode 100644
index 000000000000..3fed676a28b3
--- /dev/null
+++ b/app-misc/razertool/files/razertool-0.0.7-configure.patch
@@ -0,0 +1,212 @@
+diff -Naur razertool-0.0.7.orig/configure.ac razertool-0.0.7/configure.ac
+--- razertool-0.0.7.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ razertool-0.0.7/configure.ac 2022-07-14 13:28:37.682934002 +0200
+@@ -0,0 +1,68 @@
++dnl Process this file with autoconf to produce a configure script.
++
++AC_INIT(configure.ac)
++AM_INIT_AUTOMAKE(razertool, 0.0.7)
++AM_CONFIG_HEADER(config.h)
++AM_MAINTAINER_MODE
++
++AC_ARG_ENABLE(gtk,[AS_HELP_STRING([--disable-gtk],[Don\'t build razertool-gtk])],[enable_gtk_force=yes],[enable_gtk_force=no;enable_gtk=yes])
++
++dnl checks for programs
++AC_ISC_POSIX
++AC_PROG_CC
++AM_PROG_AR
++AM_PROG_CC_STDC
++AC_PROG_RANLIB
++AC_HEADER_STDC
++PKG_PROG_PKG_CONFIG
++
++dnl checks for libraries
++PKG_CHECK_MODULES(libusb, [libusb >= 0.1.0])
++
++if test x$enable_gtk = xyes; then
++pkg_modules="gtk+-2.0 >= 2.8.0 librsvg-2.0 >= 2.0.0 cairo >= 1.0.0"
++PKG_CHECK_MODULES(GTKLIBS,[$pkg_modules],,[
++ AC_MSG_RESULT([no])
++ AC_MSG_WARN([
++Package requirements ($pkg_modules) were not met:
++
++$GTKLIBS_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables GTKLIBS_CFLAGS
++and GTKLIBS_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++])
++ if test x$enable_gtk_force = xyes; then
++ AC_MSG_ERROR([Aborting since --enable-gtk was used])
++ fi
++ AC_MSG_WARN([Not building razertool-gtk])
++ enable_gtk=no
++])
++fi
++
++dnl i18n
++GETTEXT_PACKAGE=razertool-gtk
++AC_SUBST(GETTEXT_PACKAGE)
++
++ALL_LINGUAS=`cat "${srcdir}/po/LINGUAS"`
++AM_GLIB_GNU_GETTEXT
++
++dnl output
++AM_CONDITIONAL(BUILD_GTK,test x$enable_gtk = xyes)
++
++AC_SUBST(libusb_CFLAGS)
++AC_SUBST(libusb_LIBS)
++AC_SUBST(GTKLIBS_CFLAGS)
++AC_SUBST(GTKLIBS_LIBS)
++
++AC_OUTPUT([Makefile src/Makefile gtk/Makefile po/Makefile.in])
++
++if test x$enable_gtk_force != xyes && test x$enable_gtk != xyes; then
++AC_MSG_WARN([
++
++*** NOT BUILDING RAZERTOOL-GTK ***
++])
++fi
+diff -Naur razertool-0.0.7.orig/configure.in razertool-0.0.7/configure.in
+--- razertool-0.0.7.orig/configure.in 2006-08-13 21:57:35.000000000 +0200
++++ razertool-0.0.7/configure.in 1970-01-01 01:00:00.000000000 +0100
+@@ -1,67 +0,0 @@
+-dnl Process this file with autoconf to produce a configure script.
+-
+-AC_INIT(configure.in)
+-AM_INIT_AUTOMAKE(razertool, 0.0.7)
+-AM_CONFIG_HEADER(config.h)
+-AM_MAINTAINER_MODE
+-
+-AC_ARG_ENABLE(gtk,[AS_HELP_STRING([--disable-gtk],[Don\'t build razertool-gtk])],[enable_gtk_force=yes],[enable_gtk_force=no;enable_gtk=yes])
+-
+-dnl checks for programs
+-AC_ISC_POSIX
+-AC_PROG_CC
+-AM_PROG_CC_STDC
+-AC_PROG_RANLIB
+-AC_HEADER_STDC
+-PKG_PROG_PKG_CONFIG
+-
+-dnl checks for libraries
+-PKG_CHECK_MODULES(libusb, [libusb >= 0.1.0])
+-
+-if test x$enable_gtk = xyes; then
+-pkg_modules="gtk+-2.0 >= 2.8.0 librsvg-2.0 >= 2.0.0 cairo >= 1.0.0"
+-PKG_CHECK_MODULES(GTKLIBS,[$pkg_modules],,[
+- AC_MSG_RESULT([no])
+- AC_MSG_WARN([
+-Package requirements ($pkg_modules) were not met:
+-
+-$GTKLIBS_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GTKLIBS_CFLAGS
+-and GTKLIBS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-])
+- if test x$enable_gtk_force = xyes; then
+- AC_MSG_ERROR([Aborting since --enable-gtk was used])
+- fi
+- AC_MSG_WARN([Not building razertool-gtk])
+- enable_gtk=no
+-])
+-fi
+-
+-dnl i18n
+-GETTEXT_PACKAGE=razertool-gtk
+-AC_SUBST(GETTEXT_PACKAGE)
+-
+-ALL_LINGUAS=`cat "${srcdir}/po/LINGUAS"`
+-AM_GLIB_GNU_GETTEXT
+-
+-dnl output
+-AM_CONDITIONAL(BUILD_GTK,test x$enable_gtk = xyes)
+-
+-AC_SUBST(libusb_CFLAGS)
+-AC_SUBST(libusb_LIBS)
+-AC_SUBST(GTKLIBS_CFLAGS)
+-AC_SUBST(GTKLIBS_LIBS)
+-
+-AC_OUTPUT([Makefile src/Makefile gtk/Makefile po/Makefile.in])
+-
+-if test x$enable_gtk_force != xyes && test x$enable_gtk != xyes; then
+-AC_MSG_WARN([
+-
+-*** NOT BUILDING RAZERTOOL-GTK ***
+-])
+-fi
+diff -Naur razertool-0.0.7.orig/gtk/Makefile.in razertool-0.0.7/gtk/Makefile.in
+--- razertool-0.0.7.orig/gtk/Makefile.in 2007-02-15 07:55:23.000000000 +0100
++++ razertool-0.0.7/gtk/Makefile.in 2022-07-14 13:27:46.765830454 +0200
+@@ -1,5 +1,5 @@
+ # Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# @configure_input@
++# @configure.acput@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ # 2003, 2004, 2005 Free Software Foundation, Inc.
+@@ -40,7 +40,7 @@
+ subdir = gtk
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+diff -Naur razertool-0.0.7.orig/Makefile.in razertool-0.0.7/Makefile.in
+--- razertool-0.0.7.orig/Makefile.in 2007-02-15 07:55:24.000000000 +0100
++++ razertool-0.0.7/Makefile.in 2022-07-14 13:27:46.765830454 +0200
+@@ -1,5 +1,5 @@
+ # Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# @configure_input@
++# @configure.acput@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ # 2003, 2004, 2005 Free Software Foundation, Inc.
+@@ -42,7 +42,7 @@
+ mkinstalldirs
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+diff -Naur razertool-0.0.7.orig/missing razertool-0.0.7/missing
+--- razertool-0.0.7.orig/missing 2006-11-27 03:51:30.000000000 +0100
++++ razertool-0.0.7/missing 2022-07-14 13:27:46.765830454 +0200
+@@ -39,7 +39,7 @@
+ if test -f configure.ac; then
+ configure_ac=configure.ac
+ else
+- configure_ac=configure.in
++ configure_ac=configure.ac
+ fi
+
+ msg="missing on your system"
+diff -Naur razertool-0.0.7.orig/src/Makefile.in razertool-0.0.7/src/Makefile.in
+--- razertool-0.0.7.orig/src/Makefile.in 2007-02-15 07:55:23.000000000 +0100
++++ razertool-0.0.7/src/Makefile.in 2022-07-14 13:27:46.765830454 +0200
+@@ -1,5 +1,5 @@
+ # Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# @configure_input@
++# @configure.acput@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ # 2003, 2004, 2005 Free Software Foundation, Inc.
+@@ -41,7 +41,7 @@
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/app-misc/razertool/files/razertool-0.0.7-rules.patch b/app-misc/razertool/files/razertool-0.0.7-rules.patch
new file mode 100644
index 000000000000..b04357e17029
--- /dev/null
+++ b/app-misc/razertool/files/razertool-0.0.7-rules.patch
@@ -0,0 +1,8 @@
+diff -Naur razertool-0.0.7.orig/razertool.rules.example razertool-0.0.7/razertool.rules.example
+--- razertool-0.0.7.orig/razertool.rules.example 2007-02-15 06:09:41.000000000 +0100
++++ razertool-0.0.7/razertool.rules.example 2022-07-14 13:23:13.519271582 +0200
+@@ -1,2 +1,2 @@
+-ACTION=="add", BUS=="usb", SYSFS{idVendor}=="1532", SYSFS{idProduct}=="0101", MODE="0660", GROUP="plugdev"
+-ACTION=="add", BUS=="usb", SYSFS{idVendor}=="1532", SYSFS{idProduct}=="0009", MODE="0660", GROUP="plugdev"
++SUBSYSTEMS=="usb", ATTRS{idVendor}=="1532", ATTRS{idProduct}=="0101", MODE="0660", GROUP="usb"
++SUBSYSTEMS=="usb", ATTRS{idVendor}=="1532", ATTRS{idProduct}=="0009", MODE="0660", GROUP="usb"
diff --git a/app-misc/razertool/razertool-0.0.7-r4.ebuild b/app-misc/razertool/razertool-0.0.7-r5.ebuild
similarity index 75%
rename from app-misc/razertool/razertool-0.0.7-r4.ebuild
rename to app-misc/razertool/razertool-0.0.7-r5.ebuild
index c4a446040f4f..d650ed16d3ba 100644
--- a/app-misc/razertool/razertool-0.0.7-r4.ebuild
+++ b/app-misc/razertool/razertool-0.0.7-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit autotools desktop
+inherit autotools desktop udev
DESCRIPTION="Unofficial tool for controlling the Razer Copperhead mouse"
HOMEPAGE="http://razertool.sourceforge.net/"
@@ -16,6 +16,7 @@ IUSE="gtk"
RDEPEND="dev-libs/glib:2
virtual/libusb:0
+ virtual/udev
gtk? (
dev-libs/atk
>=gnome-base/librsvg-2.0
@@ -28,20 +29,11 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
-PATCHES=( "${FILESDIR}"/${P}-ar.patch )
+PATCHES=( "${FILESDIR}"/${P}-configure.patch
+ "${FILESDIR}"/${P}-rules.patch )
src_prepare() {
default
-
- sed -i razertool.rules.example \
- -e 's:ACTION=="add", ::;s:BUS=:SUBSYSTEMS=:;s:SYSFS{:ATTRS{:g' \
- || die
-
- # plugdev group may not exist (created by hal), default to usb
- sed -i razertool.rules.example \
- -e 's:plugdev:usb:' \
- || die
-
eautoreconf
}
@@ -52,8 +44,7 @@ src_configure() {
src_install() {
default
- insinto /lib/udev/rules.d
- newins razertool.rules.example 90-razertool.rules
+ udev_newrules razertool.rules.example 90-razertool.rules
# Icon and desktop entry
if use gtk; then
@@ -63,6 +54,8 @@ src_install() {
}
pkg_postinst() {
+ udev_reload
+
elog "Razer Copperhead mice need firmware version 6.20 or higher"
elog "to work properly. Running ${PN} on mice with older firmwares"
elog "might lead to random USB-disconnects."
@@ -72,3 +65,7 @@ pkg_postinst() {
elog " /etc/udev/rules.d/90-razertool.rules"
elog "Then unplug and plug in the mouse."
}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 39aa1d0730ad..747e4af61ff3 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index b7aab4578d72..c6114aed788d 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -5,5 +5,5 @@ AUX 0.5-mouse-cursor-fixes3.patch 1431 BLAKE2B 887e3237d57623b12d3b94e67138aa083
DIST gtg-0.5.tar.gz 2229259 BLAKE2B e724cbd015a6f0b6fee62c52283b56244490efb7df4e57b2e30745f58fbc41442b008f5c81b53cfd001f04a92ff53a14e2117d6c12d0d5a35fe49158b5f736fa SHA512 631f5343301d7d72211398152fa081c0fa15154babc7ec900f13a39a2677d0edaf4fea534a83284207e8019926c9108dc1d8f25bdbeae85ef0665dfe1c7b768a
DIST gtg-0.6.tar.gz 2361876 BLAKE2B 48f4d589b19181c4e5586254a3411fe2e25126d0f16b2d1294b8bff3f7a86aee7a34762781d9819760ce2e6b36ebded225a478a1bc86aa4c17217b165dae2802 SHA512 68a5229c17b85b87a9a134a08e5e86fbf24d28d6ce55e848c17eef650620d6f56172ee495cb113f4279b34c19127ae03981e2feec5a39dc51be49e387e458600
EBUILD gtg-0.5.ebuild 1639 BLAKE2B 152dd75b80c101527f22f2acb42dc8269d9975d8123ccfff94897762de5d1d02577e36c3b121ac14dec25dd642b6aa294fa00081b91106c6f3923c3a0f5ea294 SHA512 b75fa1a30b64b8040d90aec7df0234768241adcb78fddb6b8bb55dda5ed3a4c384dfde8a000d5af3e5ce3a3a917cf1ae3f4eb115f4189deac36c9f2068843d9d
-EBUILD gtg-0.6.ebuild 1561 BLAKE2B f491483fc30e0f86fdc59bf886cd406ea9efd43e001237fd433b25c97bf6d598f4e24b8daa1abf67627ff2dc8d4cbde105cb81398f3417464fac2985e7993382 SHA512 404dff2ab52e3e1024a80232aba164dd71a71d2646378551252fcbb3c9bf74d017145f2683437ed80ea5c20fca64fea531633d90218ae096b10721aa8526d2e3
+EBUILD gtg-0.6-r1.ebuild 1602 BLAKE2B 70b4eef6c38adb1ecb9b8f5921a4da7e58e1490768981bca6d319fd60ff4a526e028aa5f2466764cf9e9aa05b958822fc5358820669d05ba476d9175b29422b6 SHA512 ea92f272d083215a21f01f1ab0a7db4bfa26d3c20bdcdd2ba7e68f86c29b98d99e683f0fdc5a820594b1079adc23114a6b651b8adc9188fca91795d8be051602
MISC metadata.xml 887 BLAKE2B dc510d2d5598d32acd9ab78b794618c2f16f25fb25c605fda6f0aa944d93d282c26cc2f39277bf313e4688025195baf13f5ab3e376fe5462c77f1af2bbd7dd93 SHA512 f41496c2e499341cd7f6c7538b27edb7a4c02ffbf5d36d6971d5bcb0b58076ae6f131dcfde499e80b21afea349cb4ca2b25e9d23b35af4ab6d7510136d6a785c
diff --git a/app-office/gtg/gtg-0.6.ebuild b/app-office/gtg/gtg-0.6-r1.ebuild
similarity index 97%
rename from app-office/gtg/gtg-0.6.ebuild
rename to app-office/gtg/gtg-0.6-r1.ebuild
index d4d376aab05b..4d5ae4e692d4 100644
--- a/app-office/gtg/gtg-0.6.ebuild
+++ b/app-office/gtg/gtg-0.6-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
x11-libs/pango[introspection]
x11-libs/gdk-pixbuf[introspection]
x11-libs/gtk+:3[introspection]
+ x11-libs/gtksourceview:4[introspection]
"
DEPEND="${RDEPEND}"
BDEPEND="
diff --git a/app-office/kalendar/Manifest b/app-office/kalendar/Manifest
index a2af744e9111..a831534d44b7 100644
--- a/app-office/kalendar/Manifest
+++ b/app-office/kalendar/Manifest
@@ -1,3 +1,3 @@
DIST kalendar-22.04.3.tar.xz 259068 BLAKE2B 34d1bd2c0d8a4f45518387586bbda74a850034c6bf1efe20fde991ef3c6a5681931e5501cb38a5a8cb6c9a3fb354167fee0d389331691c67f7ca82a7cb492097 SHA512 d8f9c0c5b4ac1047f21312f61123d1f54b71e3cf7711526fbc38591ba425ed1f76e5c5a715515216059d868fa82f8097b77afe74ee12a30ff7a6fa5c2873908f
-EBUILD kalendar-22.04.3.ebuild 1471 BLAKE2B 5828d58a6aa583790a32b624fdbe2042a873b31cd0802d2dac09c9b9bb65c6da345a84e37121bb030658b7c47bec7c475431a9cdb7a4193d597f0f528e2e7d52 SHA512 aff138e584dcb1c9c542e788e336d3601b72551dae393c617dd9a2edab1295fa5d0d1cf9dedfa1cb105345cb10cd128860759efb5d08cfd68be2c987104db872
+EBUILD kalendar-22.04.3.ebuild 1476 BLAKE2B 3891ce3781e574c7340750791e1ba5364fcc5d5355016814c970005e77a40392aec1f205bd519ab090fcdc1d080c55825d036594f21b561156b3c819c54dacaa SHA512 3a06f73cccc87523f8d02a2de8910593e42a9e359d6502328adf7787f3812c2ac4fde26e439ccb269300e9741338b9a496f7a0ef25b8475dad7ce5335471402e
MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-office/kalendar/kalendar-22.04.3.ebuild b/app-office/kalendar/kalendar-22.04.3.ebuild
index 2b7a479376ba..3a75788e0ce3 100644
--- a/app-office/kalendar/kalendar-22.04.3.ebuild
+++ b/app-office/kalendar/kalendar-22.04.3.ebuild
@@ -9,7 +9,7 @@ ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-3)
KFMIN=5.92.0
QTMIN=5.15.4
-inherit ecm kde.org
+inherit ecm gear.kde.org
DESCRIPTION="Calendar application using Akonadi"
HOMEPAGE="https://apps.kde.org/kalendar/"
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cc48515d5a55..e63d271eb7e9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -34,7 +34,7 @@ DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5ec
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
EBUILD libreoffice-7.3.3.2-r3.ebuild 20107 BLAKE2B f01ed187adb245332958ee530aa7c3a8d081c68df8a6e63a0969a5a0654611ea6e503d6d32551f560dfc36b06d3744ae3c13d909b0c7368f1158d4cd7e1e6c61 SHA512 fb4243c9018ff1764a54f1935bac1b18c4a6a5fae8c9b064f072fe27b042e1cff614546d876b660553b2d15609bc43c306792c543f54ec6f902f3892b870fc99
-EBUILD libreoffice-7.3.4.2.ebuild 20278 BLAKE2B e4389705e64299aad8bebb7029a023f07bd11898904508590fd02594a35952b96e282c0d8abcbe1c81f9f67779493431fc2e5a0e23368380626b3aa333e26fdd SHA512 3109f958d924d57392543d9f20f7b1fd1b4cbb02e3df7b4f254607a437c58d17aa22db88104f35a1896836b29b96a7ee1f5e4ff942ba50ea1617a7df1c362036
-EBUILD libreoffice-7.3.9999.ebuild 20001 BLAKE2B ca66a0dedda343d85dbadcaa25cd3938c41e2daff2b9dbf25a397eff51b3e1914bc5ec95fe9da36a650b30969236cacdcd5ef0c123b2d716bae20614e42db28d SHA512 1e9b27cc43d95b34730442a8ab3a1b9bafc5a05ca99b8ea0e81e7c6c2ba241d4f7e794cb615806764fe3b3085081744b58fc5b9a75040a22a714e220f82d857d
-EBUILD libreoffice-9999.ebuild 20004 BLAKE2B c6d988634d81b540cc7e6cbae6334438eb39dfd927183ba184aee35d3c7320f915721cbbe96ba3d0d1e91ab03008f3f4cad0d8c569536954d263ab5960c9507a SHA512 f1881490b3eb93a4296acb45bccc6c0f4c25abd82691999bd8af9ed3204123da3793bf413f37c93a5b2758ce5ad425fc75527cee8cecf311ef82b970baad7c1b
+EBUILD libreoffice-7.3.4.2-r1.ebuild 19441 BLAKE2B 6898da68ce80888663ee1ede0e6f476bf20848f7d741707a0226f1e5ff92a55fb7abbae89067119b587de297db7a81bd96bd5c2cf813f67b0b8e933d61572a68 SHA512 d733cddd2b3c8dc351677aba014ccc57b9f770bce61679e4865964ada7e4c57a8a2fa758c20536214475360b65ad48c604156f43bc0b348c015fbf7fb62d444c
+EBUILD libreoffice-7.3.9999.ebuild 19441 BLAKE2B 6898da68ce80888663ee1ede0e6f476bf20848f7d741707a0226f1e5ff92a55fb7abbae89067119b587de297db7a81bd96bd5c2cf813f67b0b8e933d61572a68 SHA512 d733cddd2b3c8dc351677aba014ccc57b9f770bce61679e4865964ada7e4c57a8a2fa758c20536214475360b65ad48c604156f43bc0b348c015fbf7fb62d444c
+EBUILD libreoffice-9999.ebuild 19444 BLAKE2B 7a554b6389af43f50e4a8cc6feac0fa855fa0b5e295349e680a2482bd7b572cb27fa1c00d02ef0ee3e1c3db18449e969f4c40b2bb250d02601848ce605a27e49 SHA512 3b36becb71a4614be3e84182a13c6239bda652bbeeda1e661cceb0f847864ddbbffc43e9825844812613409e24d6a02c3dfb152290134bea3a79c2bd2839808f
MISC metadata.xml 1222 BLAKE2B 02bb2d5bae26c3a97d77a36d90a2ffa0cac1eb2a0aabfac7d7f11d6b685264b7daad1a860598940af0fe9411068830d7eaf8553cbe4f69afedb092669b719cf1 SHA512 4ad197bb97eab3e860ba163b4c63839949fc9280a2ab53abc81ebb6c351d633e65ef3335a2d3af718d0e4a64e3312dfaff58f6cbab55507c57a6663c2850c3fd
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
similarity index 94%
rename from app-office/libreoffice/libreoffice-7.3.4.2.ebuild
rename to app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
index 99329d166bc3..9a3813a2b48b 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="threads(+),xml(+)"
MY_PV="${PV/_alpha/.alpha}"
@@ -163,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libvisio-0.1.0
media-libs/libzmf
media-libs/openjpeg:=
- media-libs/zxing-cpp
+ media-libs/zxing-cpp:=
>=net-libs/neon-0.31.1:=
net-misc/curl
sci-mathematics/lpsolve
@@ -217,7 +217,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
mariadb? ( dev-db/mariadb-connector-c:= )
!mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( app-text/poppler:=[cxx] )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
# FIXME: cppunit should be moved to test conditional
@@ -237,10 +237,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
+ >=virtual/jdk-11
)
test? (
app-crypt/gnupg
@@ -256,11 +253,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin-debug
media-fonts/liberation-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
+ java? ( >=virtual/jre-11 )
kde? ( kde-frameworks/breeze-icons:* )
"
BDEPEND="
@@ -300,11 +293,6 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux
- "${FILESDIR}/${PN}-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch" # from FreeBSD
- "${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # fixup for FreeBSD patch
)
S="${WORKDIR}/${PN}-${MY_PV}"
@@ -320,16 +308,10 @@ _check_reqs() {
}
pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
@@ -573,12 +555,8 @@ src_configure() {
--without-junit
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
)
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
- fi
use libreoffice_extensions_scripting-beanshell && \
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 86e77b20eb76..9a3813a2b48b 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -163,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libvisio-0.1.0
media-libs/libzmf
media-libs/openjpeg:=
- media-libs/zxing-cpp
+ media-libs/zxing-cpp:=
>=net-libs/neon-0.31.1:=
net-misc/curl
sci-mathematics/lpsolve
@@ -237,10 +237,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
+ >=virtual/jdk-11
)
test? (
app-crypt/gnupg
@@ -256,11 +253,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin-debug
media-fonts/liberation-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
+ java? ( >=virtual/jre-11 )
kde? ( kde-frameworks/breeze-icons:* )
"
BDEPEND="
@@ -315,16 +308,10 @@ _check_reqs() {
}
pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
@@ -568,12 +555,8 @@ src_configure() {
--without-junit
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
)
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
- fi
use libreoffice_extensions_scripting-beanshell && \
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index cb77e652cea2..b334b35d33ee 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -163,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libvisio-0.1.0
media-libs/libzmf
media-libs/openjpeg:=
- media-libs/zxing-cpp
+ media-libs/zxing-cpp:=
>=net-libs/neon-0.31.1:=
net-misc/curl
sci-mathematics/lpsolve
@@ -237,10 +237,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
+ >=virtual/jdk-11
)
test? (
app-crypt/gnupg
@@ -256,11 +253,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin-debug
media-fonts/liberation-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
+ java? ( >=virtual/jre-11 )
kde? ( kde-frameworks/breeze-icons:* )
"
BDEPEND="
@@ -315,16 +308,10 @@ _check_reqs() {
}
pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
@@ -568,12 +555,8 @@ src_configure() {
--without-junit
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
)
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
- fi
use libreoffice_extensions_scripting-beanshell && \
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 0d51f48caa1d..c608d45b9de3 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 6d66f203b633..617cf5cd71dc 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -7,6 +7,6 @@ DIST gentoolkit-0.5.1.tar.gz 3203805 BLAKE2B de2cd69aec9be79f498b1180a90afb54e77
DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d SHA512 1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d
EBUILD gentoolkit-0.5.0-r3.ebuild 2398 BLAKE2B 9ff7c63bbe1781290051b6a3479f23ee3fa8a81a1e5bb9fc696b0a8899dcf740470b8c4d31ede30084fc54fa99d93a64bd65123e5793862b68a420d26f4c1a12 SHA512 bc9fb3941d26b3c68641c72342af463a45b89be8de0ff0530422b5dffd5d3409f5ff4e62da307d14d9a6946806900368f24dd68825c7ffacaddd8567d7e80a08
EBUILD gentoolkit-0.5.1-r1.ebuild 1934 BLAKE2B c510353ec768dcc7848475cd2f353c466cb93e59a52c2743e5236995a1bf6761dfa1f32fb0ec4de75bc14db3a17404b152cebe7121dece062350744e08bdd0d7 SHA512 763f276f1dca5148efd9ba93c9008296b7ecbdd9119fe818e868e7996306d5b8ccf7a42ac540908b8edcd271e64cd680be9b3c5d39af72037ed8eafd587bbf84
-EBUILD gentoolkit-0.6.1-r2.ebuild 2049 BLAKE2B a509871905d69123618831bda8006b85943aae29b39092a5d962bc29a795e2c8f937dcd87a2f4d935602e6146c49f9cb8835eaf6c5eef60ad980a3cf40b463e8 SHA512 ef894f8a78c362da4e750ea0decf11624beff586bb140af35d38ae4ccf67743462520cde5b180f7f563ae0dc58e6596488199b24f73483fadf2a1c3ab582a02f
-EBUILD gentoolkit-9999.ebuild 1940 BLAKE2B 76b9d10079ce996932ec1ca540d4be0ac4ecc97d5ebd2363e46490c87f0cf7834e936f21c2116d0da7e612ffdb59ee6cd0f3d8c28170789cc6ccdfa7398fde49 SHA512 e2c5272fa77c50779e98b4789fc1bc349bdcb2704b82d899adaa8b8ace72091d510465b0d2ce2dc4541c1a411fd27182a984f255e4dc964974d0bb5053873cb6
+EBUILD gentoolkit-0.6.1-r3.ebuild 2104 BLAKE2B d22f2791fc46f600522b7d360c8cc6075ae92dbca8ee42dd42af9d9643fd2cb68e5144f437fb980c34c509123c1aca77a3647e3ddce30ac3df5d73c85bcd2967 SHA512 1f50b5bbf6f40aedc4b4575b885a3897974d3babfc4a0f4ad019b9ae7a2b42caa2983e471c8efb267fc9e91988c729b9348f3682ed027fc953ac0cafa3fe1dab
+EBUILD gentoolkit-9999.ebuild 1949 BLAKE2B 38ce3fa24d29285072cc202b89cce7c17fbaea4252e4d5cb13ec42d63490a58cbbdaf5c984fa0d93b54b42996ca7e8b586acb87b23e4320ce6c8a5554625c72c SHA512 681ff7aaab607dcc47836e6426a3710220e40cf8f5ba934ad99ae19fca03a2a3f05265c36a19331dfb415028ebf11a2462bfede94b7202998a15772b7a914bcf
MISC metadata.xml 559 BLAKE2B bbd703786a8eee12a1dbdac88476a3444622841918bcb3011c77b444bff3f650c6f5fb6c6c9ca053f3d85d16aa7fbb7e617bae79eb95fe4b17569b26726e6859 SHA512 a4788b331c6fd201abfdfc5500f4f055bf3e75d7cce9cf25528559aa3eeb9c763c9c72cfb88b774f93b2c5e0ba7be8ca55f8d2337701e517e70f4ef04a618a62
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild
similarity index 95%
rename from app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild
rename to app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild
index ea872764365b..496a5a4076ef 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.1-r2.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild
@@ -23,8 +23,9 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
LICENSE="GPL-2"
SLOT="0"
+# Need newer Portage for XML fix, bug #857537
DEPEND="
- sys-apps/portage[${PYTHON_USEDEP}]"
+ >=sys-apps/portage-3.0.32[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}
virtual/awk
sys-apps/gentoo-functions"
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 00ccd192438d..c864a6922d64 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-2"
SLOT="0"
DEPEND="
- sys-apps/portage[${PYTHON_USEDEP}]"
+ >=sys-apps/portage-3.0.32[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}
virtual/awk
sys-apps/gentoo-functions"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 578cd962e3db..b92871a7f81f 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index 1f102e015537..53630894e131 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -47,5 +47,5 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLA
EBUILD fzf-0.27.2.ebuild 3316 BLAKE2B 74cf1535e60b590327ecaafc5776389f71ad8bd0f2c5285b7e103876856a0fbabe0f2f2a787433095e00433cd5d836d01358624b8baa619b936c25bf293ed4ff SHA512 76ce723a79c18a1e3335b78ff4c5f79e5ec232b1a08e444e0a3b502105ea377905f7b32bafc20dd5e3a694f0b1f876fa9d2dbc93620cb4ce326aee656ba55b0c
EBUILD fzf-0.28.0.ebuild 3228 BLAKE2B aa0027e5d89dfc5c20620fd0fce475ad376064d3312d52b3d45395944deec80207e9b1d2b967507ee9944b83f4964c7ed77e50238757b414976eecbc42e20bc1 SHA512 c6a484f9fc3d56d9f2ce04961ea1ae2a094af4c9919f2747ff4fe8ac039520e260baf2ee7f26d488b4eadcb9b04eb67dbc76a65b1e475bde5520ea24001e2aa2
EBUILD fzf-0.29.0.ebuild 3228 BLAKE2B 3ac973b271de013ed0fc81eb2fa0e7b72d6dfa35c3a0cef10e584915e1dcb5c94678fdd1cfa9562a56487ceec4555fb71aa9d53b46a3d89c8b036a367d1f5c74 SHA512 462b8e9aab7a2a3f73e7c79b07b3fe18e8e0083338fbb4be6c70f8364fab570b325856ba1422ba25f3ec5b8ec94d467b4119e1ebbb240229e6365d4515981aae
-EBUILD fzf-0.30.0.ebuild 1759 BLAKE2B 9d538ea9e6e55c7e3ff602c6a7ba2333ec9b17af4709289e039ca397a3c9356dc6b50780c8a0ae2a5d8ea8d3e2c23f03ee9d21acfe879a285cf2c461c7f8b71b SHA512 bfe5566797ba8607b278ce0c328e0fd5c669ff17cee77572874dcdb90adbc0debeb14d75eebed6f9aea96e7e36ab3c1060f23bf459befb524de7631287af025e
+EBUILD fzf-0.30.0.ebuild 1757 BLAKE2B 009b962eccb17af6b8533d2c411030f050235e159988946ae775d3d1da7aab96360afc8ae9771e5ad4f0d0d3f605b2629b1be6eece989afa2f0fec5adfcf107e SHA512 be9f419f071a169b3754b34152da426bdd6f4213221d7d886b5a964e672fce0e12209b48d06c4f26d84696b56c418f41723c2a7462d4faff67eec9b96fa0a0aa
MISC metadata.xml 469 BLAKE2B 3d6dcce756d040b715bbf17f33faea2c0ddd810857cb38289f59cab134a5b049d21db71c9c3844497643e1728ecd09a924a51ba273f736712543307f2b806d1a SHA512 21f3fef809b276da7f7ad33dbafefc2ebfa86b9ce9aa0dea664724c399a6743923a8a1825cffbd06d885181dc7b305d351e7ab77bd133abb98f601a84783f52f
diff --git a/app-shells/fzf/fzf-0.30.0.ebuild b/app-shells/fzf/fzf-0.30.0.ebuild
index 1ac5993d819d..a729abb93e37 100644
--- a/app-shells/fzf/fzf-0.30.0.ebuild
+++ b/app-shells/fzf/fzf-0.30.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/junegunn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT BSD-with-disclosure"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
src_prepare() {
default
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8b104c8ea0f7..99822df6506c 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index 53d64a18cbd7..d78c8929c4db 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,4 +1,5 @@
DIST pelican-4.7.2.tar.gz 1401737 BLAKE2B c277844c0c153f71aae051dd8897e9abf8fd1ddc7c49251aaa7b85b7324a85da0ded74e8328a4b64ec79b8e6b4e143d5496b8535900c8a88bfa6198489c0a80c SHA512 9fbf2ecb3c193e976e01a4d095095ac55d56fe45aa24467d91635bbecb9df933ccabd6a456e14c6ee14ce0a845820be8d887917af314e13c7a3eb830cb0ce7e6
+DIST pelican-4.8.0.gh.tar.gz 1401791 BLAKE2B 889c9054659c9f98cca571fa0f3ea9ee7752aa65c3feb71278570bad74095f521d3838aa1a32dc3ae331ba86149cdd10be9c31c7ed5bc6e06348edf3eb3bb081 SHA512 2e94eb88a836bcb430026463c0e7e906b7f065507e0d873b6e0fc980e271e6a8f2e62b22af4b61c963d90ef61d57787de20656fe7497b0ae14e93eff2d364f3b
EBUILD pelican-4.7.2-r1.ebuild 1490 BLAKE2B 7764a1122ac5fa2e3bb5e20e3b1041da6ced02c8f50f66c621f5bc86a79766a1f7150c0491dbc9d48ad87094ef584ff3f38599c6a257047fd27564f34a4e7c0a SHA512 e5877f67e351166c057d8027f1c9c121d6b50e6c497d2adecc702d65292a0258eed17255bd84755d6fdd3aba81fe78b41f82af681bcd32aa10f06401ee7a6d1c
-EBUILD pelican-9999.ebuild 1479 BLAKE2B e59c32738a088a5cff6f2d94c6b5c7d3d65533e30f6207e4ca6c2d1f2bb32ec9ac9b8b3cfb9e7241f35de6cb992fe0e0f7f249ea3925219ac437d204440f6204 SHA512 d42118d548e2f7f8dd73bbceb2af56062cf48adb26321e276652cee657812a3e7764b126b5f0a785ea6a508f94341d603bfacd7553ab78bcc05010e4854b074b
+EBUILD pelican-4.8.0.ebuild 2025 BLAKE2B 3df393cc88bf8ecf7931dc29f7820585d88dbdfed326fbc77b4e45d57f5d242d7887ef94fe8ad049b9f2e66e8c9e48d68169aa22f1af65cc7e5e3c3362770767 SHA512 729afc740745b082cba1f7f04319d8b384c3b378fb99830cbd952a39c5acabef4ac9d6cc1a7a4998f5cb6c5cd836408039d7e813312d4b4363d1751bcfbafa85
MISC metadata.xml 463 BLAKE2B 2f062e4ee585182b37fdd094c75fe58aa600c57a416c955da7abef66e0c42eb1cd1d1d2b38c3cb322a6e0f044ffabf3915aedd16dee147f6a94fb92205f0d196 SHA512 5bc95a863d0741b536c3b9d3c2f7f9181ec5a26be18f15a1df4f691c8cafa0498d6ed57db37563ea972f8ea025f92c8f92729d97967b044f885989b996646d12
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-4.8.0.ebuild
similarity index 53%
rename from app-text/pelican/pelican-9999.ebuild
rename to app-text/pelican/pelican-4.8.0.ebuild
index aa9807867aa1..ea0e121101a7 100644
--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-4.8.0.ebuild
@@ -1,23 +1,22 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 git-r3
+inherit distutils-r1 optfeature
DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-EGIT_REPO_URI="https://github.com/getpelican/pelican.git"
-EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
IUSE="doc examples markdown"
-RESTRICT="test"
RDEPEND=">=dev-python/docutils-0.16[${PYTHON_USEDEP}]
>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
>=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
@@ -29,11 +28,24 @@ RDEPEND=">=dev-python/docutils-0.16[${PYTHON_USEDEP}]
>=dev-python/unidecode-1.1[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
-BDEPEND="test? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
+BDEPEND="
+ test? (
+ >=dev-python/markdown-3.1[${PYTHON_USEDEP}]
+ dev-python/typogrify[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )"
DOCS=( README.rst )
-distutils_enable_tests nose
+EPYTEST_DESELECT=(
+ # Needs investigation, we weren't running tests at all before
+ pelican/tests/test_testsuite.py::TestSuiteTest::test_error_on_warning
+ pelican/tests/test_pelican.py::TestPelican::test_basic_generation_works
+ pelican/tests/test_pelican.py::TestPelican::test_custom_generation_works
+)
+
+distutils_enable_tests pytest
python_compile_all() {
use doc && emake -C docs html
@@ -41,10 +53,16 @@ python_compile_all() {
python_install_all() {
use doc && local HTML_DOCS=( docs/_build/html/. )
+
if use examples; then
- insinto "/usr/share/doc/${PF}"
- docompress -x "/usr/share/doc/${PF}/samples"
- doins -r samples
+ docinto /usr/share/doc/${PF}
+ docompress -x /usr/share/doc/${PF}/samples
+ dodoc -r samples
fi
+
distutils-r1_python_install_all
}
+
+pkg_postinst() {
+ optfeature "Typographical enhancements (alternative to markdown)" dev-python/typogrify
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index a1f9c91a15ce..c154f04d003e 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index edba7835cb58..293cb949dad7 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -2,7 +2,8 @@ AUX clucene-2.3.3.4-contrib.patch 1697 BLAKE2B 2aebc143ff0dafb2765cb3bd5d8e5183b
AUX clucene-2.3.3.4-fix-clang.patch 2219 BLAKE2B 7572c05d9e2676eedb3aabc8030eea6b97a19af9f02eb1c336b40606105bc89800a8da8ea6f899ef550fa114776133fec962622ac3e337ca0f52fc0305c81bd3 SHA512 f3822c5d127b37fdb0a405a3fa0a2d2a168133da106a222de0311c2074aaacb7d9651a1be7ad7afda44da22cc2c8baa8d5db756aaaef5c344e12d52625e2c2e1
AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e47145dc9ecbfe73ec6b8a493fd9c0eef73611305de213e432dd94736dc49dbc140b47d0c65081228989aa21a3fe62 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722
AUX clucene-2.3.3.4-gmtime.patch 477 BLAKE2B 0c453684f6850ad7eb2eeff2624a9d23c7ea5f78321447b75acea625add44b7cae8c8c220c8848ed8ac39c66f8329f20e9c60005a1e2d237097771ecb0c2370f SHA512 1c23c08edf5512c29a061e4a8515dfa209151af83e46680842f0aeee1269d529a14fd4a89aab7c25312fd7dbb9daf80912a265d21fcf08ac892a467be4a59a60
+AUX clucene-2.3.3.4-musl-pthread.patch 256 BLAKE2B 30c38a06d98c2e4c34f1ebf1c8b0021d57e66fd2b49e01cd9f165c3c7fef8a67152ed2136ccc733b2e6b07b8c39b3057b3fc4961330e3195c9d0b4c0d686fb95 SHA512 329ae45428e1d9b2f005c818b69030e7146b6441ca0a8d17bc3c711f76aa4c384c61718b717170fd88a1ae16e371396b77f8ba072aac6879b82aedaba3238207
AUX clucene-2.3.3.4-pkgconfig.patch 871 BLAKE2B a108d0c4427159a09d2575b351bedfd38c6305219e01a7927b66aacfcab3587d3c08315f0a7e58a123e6779d2d8fec17fb06127de32dfd5782408cbc5c916ed5 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18
DIST clucene-core-2.3.3.4.tar.gz 2241498 BLAKE2B e7c02d3976fd8d722a81ad4c6d43363b9af0073aa68edb8303cada495f8b8514cb8c86a85f398f8c9ffc1f78a49c0718cde5af4145c32869572d21e8af633846 SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4
-EBUILD clucene-2.3.3.4-r6.ebuild 1528 BLAKE2B e3985a992717b6bbaad60be1330e1f07f8fa68ae6fbaf843fb22bcdf16ea58323d85ba10d071efd2aeeaa1168a009a40cf43ab3d8863be3b593abfa359646d00 SHA512 8efdac83d376d6938d7da37f86c3ef93233c9dc72c431cc5c54b832ccc31a42129e261a5428be1e69b21a5f713a7f6d1827599bb79b1d51531926893de13197c
+EBUILD clucene-2.3.3.4-r7.ebuild 1567 BLAKE2B 7643f76d4468d77a6f81f78a4e0ef33ea8bceeaf0990b69eb3c7ca2e53ba2b11e413b78c2a51097b8fddfdc6ba4f45232e6f732b8c9260c8dfbd734527820cc7 SHA512 ed532c29d7e7bf35b42cf9a601839ca674f8b9d175650ce34329b7a0f25617f7ff5ec5d6735fdd18e7e4bf3c7976211c543e4f5f852112dc999008e69e10be91
MISC metadata.xml 243 BLAKE2B f6749558bd65896555f359d7b6f67fdb5a9656eecbb944c5074a450ec952b2c9d5285be4d078c3eba5622bf4084d535f3d0860b8812cc4ad6590f18e593134c1 SHA512 675d016d3802dc7f8d70f98c6f044f39b32ca7722c7e0aa1e1aa6aad4acf83da129cddce37d72a4c899e2dd202f2ba1eba7ea7137ad24354b2c927f310732bae
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r7.ebuild
similarity index 97%
rename from dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
rename to dev-cpp/clucene/clucene-2.3.3.4-r7.ebuild
index 6ee79676be5a..6988382b9711 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r7.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
"${FILESDIR}/${P}-pkgconfig.patch"
"${FILESDIR}/${P}-gcc6.patch"
"${FILESDIR}/${P}-gmtime.patch"
+ "${FILESDIR}/${P}-musl-pthread.patch"
)
src_prepare() {
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-musl-pthread.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-musl-pthread.patch
new file mode 100644
index 000000000000..5fdbb3e3d97d
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-musl-pthread.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/855071
+--- a/src/shared/CLucene/LuceneThreads.h
++++ b/src/shared/CLucene/LuceneThreads.h
+@@ -7,6 +7,7 @@
+ #ifndef _LuceneThreads_h
+ #define _LuceneThreads_h
+
++#include
+
+ CL_NS_DEF(util)
+ class CLuceneThreadIdCompare;
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index bf864a9259a5..3a416480906a 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 87dbc86e55ed..7ab0c94e502a 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -27,15 +27,15 @@ DIST mariadb-10.6.8-patches-01.tar.xz 5220 BLAKE2B 0ad1caecbd05defd9d60e3c438cb0
DIST mariadb-10.6.8.tar.gz 88794744 BLAKE2B 1cd036bc686864b497d04454388d9366261f6cc69ad233ab3783063a893c8814ca6c95166415c5b76f2bec2462bffe0bc44d3543502932d03805e972f63b6abc SHA512 b4327000eb3e5fc75bbd78de9890b0464217a432c8aac744948af94e092ffeef1f101885b81ec49029900a92b0018838e46efcf225056a9b06f35a04ecf26aab
EBUILD mariadb-10.2.41.ebuild 41722 BLAKE2B 6a320f2bbf23254f59ec1a7942fc69af22eb298bc815b67542aa8ea6821298e9b9cd06f6160af97ad8a1aacf9e00e0ae25a8bcd4ea347f0fe47f0b3a717b2d51 SHA512 74bd2b651639788da037dc29f8941cbd5a1288a7070ddfe34b49fc85ccc719e4d3782f494102725f372e77a0586d356839588690ba770aa4c0a933760b12d855
EBUILD mariadb-10.2.43.ebuild 41827 BLAKE2B 78703e7246f3114173cea7a65d356e9ce14aa457d6ad65303a57e38508c33fc97ed863cc6c04bd50208c65714c4514005fb02bc1690f2dc25919f253f0c276b0 SHA512 d78e155ebfd6deb56eb5cc850b1e9e259f693b1d342ca5609658822894cd882a5106997aabb633c96ae19763fe6f27a68967e19902d98ae3b7b861e9ff1fc076
-EBUILD mariadb-10.2.44.ebuild 41827 BLAKE2B 78703e7246f3114173cea7a65d356e9ce14aa457d6ad65303a57e38508c33fc97ed863cc6c04bd50208c65714c4514005fb02bc1690f2dc25919f253f0c276b0 SHA512 d78e155ebfd6deb56eb5cc850b1e9e259f693b1d342ca5609658822894cd882a5106997aabb633c96ae19763fe6f27a68967e19902d98ae3b7b861e9ff1fc076
+EBUILD mariadb-10.2.44.ebuild 41821 BLAKE2B 8e115a6d92da8e7bd2524ac2ba54d320d5fe3a3ed5eaac9f1519f688081d73ecd4849ad8cde03acc667aba9f8c3c62858b90496f638a0707dbbfa992bf04ba50 SHA512 d74fe7a447813412eb7c23c2d743f654e4a9da931e5ca292c7b3233fb6cc1e7307fe058fcb4425fc65ec6881b3f88e65e890a3b125a2fd52c6015397bbf528f9
EBUILD mariadb-10.3.32.ebuild 41278 BLAKE2B fd829e8b4119ff990040dae55853283025e1dfb1ab6ef6bb5f7d8690db8bf855a2823f614c66e3931ed637dd4d989822f2af6078510d98ce647f09b941d48ca4 SHA512 c8aee5b7b186878b8bbb0eaaca250edc7a3a3338043e9779dfd05751b280277341b2ae2713d69cf26093e4bfc3933899d7d41dc734d7e8fdc7823c272ae01287
EBUILD mariadb-10.3.34.ebuild 41396 BLAKE2B e64f159078378c7046e31873b2f96f197276c0165487c4fdc7384bdf44eaee96a129859f4eace337e92a4325c3a3599a98406b130a351c8133bdef0e50f1c35a SHA512 d92a66730217edaa2c2d908cbe67d02f82d78f8745c863d056c93e9f4c6b608ff2635af54082771619a39cd0a38e2f0bdbd57f4d5d17d3449eedb1742bc77aac
-EBUILD mariadb-10.3.35.ebuild 41396 BLAKE2B e64f159078378c7046e31873b2f96f197276c0165487c4fdc7384bdf44eaee96a129859f4eace337e92a4325c3a3599a98406b130a351c8133bdef0e50f1c35a SHA512 d92a66730217edaa2c2d908cbe67d02f82d78f8745c863d056c93e9f4c6b608ff2635af54082771619a39cd0a38e2f0bdbd57f4d5d17d3449eedb1742bc77aac
+EBUILD mariadb-10.3.35.ebuild 41390 BLAKE2B ad0329879589464dcb5d78f72dd272d317083801e91657adce2ecfd83fc33eab4df2db825062ac7868d16b6a55efbd0c4dbff8b6a5e73dcbb4e300d7757dd50b SHA512 66920c06144f2f6aa51ebe8fbe63512c634ae0ab48fb459be8e3382b55ae6be9197c1e78c81192d1df184b829ad0b75d516db9170d527ed19a64a75bca2390a2
EBUILD mariadb-10.4.22.ebuild 41990 BLAKE2B 3a0266b734ac8ff8d7df3842f777832324693d1e20874201a790387e9861565ac7f79ed6ab69e7312473e0acdf0887413e91d2c47fd7bbe63cdb1ebae8455c44 SHA512 af6bb938294c01c76634117c8f61db13b26f871993a8e4db77929da796c21c86f2a39c7073facde22c23cae42c45e1714091f477afe057d6cdd63d3e80c8f1ac
-EBUILD mariadb-10.4.25.ebuild 42099 BLAKE2B 13866c4d4fc6b1e578390867b3f197c7f94f0eb10426c136749888ba6615231c47dacc6132587179f4bfc376f62e8ac7b55bd70ebce7c6e5dba86ee2beed71be SHA512 8a621dd4523c441173fc5d5f0f4284ff1d6e45597d1846c312701df9ab0432536dbac7cba2b43767e0e1576640dca6ca0eac7ad6bd0e467e734e27b77107b9c1
+EBUILD mariadb-10.4.25.ebuild 42093 BLAKE2B 5bbd6c073a9f2622a30076d4f6076d285b3512647ed6776324609b8783899bbf30ff9a605533af8483f8c4b56e03554945bf65be4a20249d1ac7911cacd19fc2 SHA512 0e7758b84fca35471f7adb86db64e36fabad31df5b09e755eda736229914722a4c402e5f6699f0e8d04d47c55b3f10ed6d9ca1023a1dbcd406f8a7e7d60ca30c
EBUILD mariadb-10.5.13.ebuild 41954 BLAKE2B 6e079c434881a7cd4281312ab08f984b02e50e07b163a8dbe9607895dff2b8d7cad621174d3dbb1f7335e90c3b14f41c73d61e7a74e4c385c81061791d05ea5f SHA512 bd3e7fa4f267883081ff9f010f2d27aa0911bdf42595df4a5621d60277193fb258892e2b753ff3d889603617f847dde3cbe44a637a4eb156e395373f4ff9cfb2
EBUILD mariadb-10.5.15.ebuild 41981 BLAKE2B 2b2ce60bf6c0c0bf96acd44f688b35cc3aa5175d3beed4f44ffca1e9024debed6f0cf51f39d00efd48ab6aad7e97b59a5bc2c6f5e7b73ac4e4e98601b162f935 SHA512 18659af551211a19002afaee74d86139d7fd9a493c55860e34127590f3bb727021126a520c3b98034e5bc48bafd7a42223df9766ffd56f981a569f227bbfff6a
-EBUILD mariadb-10.5.16.ebuild 42059 BLAKE2B e13b3e0cd0a1579e51ec300e6a09ff2df32924f8ee8fa3fa3e572b1805ba32f7784a0bf17410a7afdd82f1c4f87521ee3a0af825aac947c01fce87c488edc1e7 SHA512 9dbd609a4fbea94ee4dbe88a48af1c4f23176b287783a403bb4dca81367c6c2e44187f644797a3897b3d742f36a6975cee44f7e5ac27732b40258670c65715b7
+EBUILD mariadb-10.5.16.ebuild 42053 BLAKE2B b3311e24a222efd20268730a5ce77870a7e37914d4bd5fd32e2a5df27a65b9c3871b8344f3c71e3d16776f222074b973d37b53305b8e856b1d5728742dadc5ea SHA512 e2b5ee6ed0d9260741965a26bf5024ccc28f03cf437e98572d39fa0bc40e5f8a5e350667bc90c6c7ffb698869eca381ae5f8ad9b5864dd92e9067217fd464c6f
EBUILD mariadb-10.6.5-r1.ebuild 42201 BLAKE2B becb5a9c579ff36d32fb60df69ea8da42f54663e70b460d6f8146b33a79978aae10bd7f4cea0099dd897345f3b23dd6033b7e1cf6da9008ca428d0c916880ea2 SHA512 162ee90865966e39bbb68f4f813c3a2de97e594ae7ffb010824b384d19baa9719da47113dacf1efe9785795a3efaec7dfd362036271f6cadde66e14106506084
EBUILD mariadb-10.6.8-r1.ebuild 42469 BLAKE2B 5087d9d4dbc11213df0af353e3046e740c88c6a3c9c1f4d5febfd456ced53b004495b049f6e8da613ea1f23d1d87c35ba6fdf86754c615273084e9fc66c78b1a SHA512 eef9b10c174cf7717fcc6533c97093ecbaea04a8497a60b287798e66d187eaf5a51bb97bc5ef8ad1ae999b478f9d8a810480aef1b2d58aa5d45c1f3c1ceb2610
EBUILD mariadb-10.6.8.ebuild 42426 BLAKE2B a1d23eaa919f50d0dd1727d5fd50771df9290bb5cc4ea3e3ab308b8be2c4ed360ca00337498017eebdaeeada09ff27e4e9d0690feebf29d5aa400cb167fcd474 SHA512 0ccd2d518a3caf722fd67d57fadb5453153cbd7c8e75e673163c98daa595e3e04be84580bae0f830c40ba570805fa69e19a0d79b8f6f1088d7032b33c59f7e0d
diff --git a/dev-db/mariadb/mariadb-10.2.44.ebuild b/dev-db/mariadb/mariadb-10.2.44.ebuild
index 9bf1ab562571..0b6fb36477bd 100644
--- a/dev-db/mariadb/mariadb-10.2.44.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.44.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.3.35.ebuild b/dev-db/mariadb/mariadb-10.3.35.ebuild
index 0a94bc13dd36..68eeddd2a5f8 100644
--- a/dev-db/mariadb/mariadb-10.3.35.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.35.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
?? ( tcmalloc jemalloc )
static? ( yassl !extraengine !pam )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.4.25.ebuild b/dev-db/mariadb/mariadb-10.4.25.ebuild
index e128e00ce2f5..d614fe01c4fb 100644
--- a/dev-db/mariadb/mariadb-10.4.25.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.25.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.5.16.ebuild b/dev-db/mariadb/mariadb-10.5.16.ebuild
index c31291014f70..9d33127732ad 100644
--- a/dev-db/mariadb/mariadb-10.5.16.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.16.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 89ec52dd8400..21cc38991f7c 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -21,9 +21,11 @@ DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682e
DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953
DIST redis-7.0.1.tar.gz 2955839 BLAKE2B 67ff36e5e78ab9a90d4404d0f0bddbe9b539166c826d8a1b314bb32cdece7d40caf5eff57302cd641548ed3b1e19aff1b657ed31a20233550636708b6386c2db SHA512 e61d27695fd2d439f204612b97a3ea245ebf92d418949460f7144026191ade4fac1647717bbb48a2b3e238856f0392af08b4fdb4358d04f2ccd1088ff9d3dac4
DIST redis-7.0.2.tar.gz 2956784 BLAKE2B 418f6114662c9b9b67dc7f28f89f58fefee3eb5fec84a6193ca50034366c963986a56d1c96dadfdd88a88ea1ddd4542ed910b89c8a81c95b38aa4f7bdc5ae571 SHA512 bc8d679ecaad0220318b87be70476653f42b76815af61ff6f4e8885f5a5d17d41cea754fbf448f9e18e9a9f90227c5ac198fa9bc523370752f590ba01418a1b0
+DIST redis-7.0.3.tar.gz 2962858 BLAKE2B f523d96140e8ede263a5697ec8d88d02ee309a482b861ecbcdbd9063d94da4b1a801c3b8f01f50863a132b0dd33bfe09ec9b3f1c8ea2d12ea8a6f22d7f770263 SHA512 d4419c596577d58195478ff2414bedcfd81658067de733781fe8d41b79938c4dacb46b456779b94e30343d1e717140579b73db1715a6d721827afe1842d548e3
EBUILD redis-6.0.16.ebuild 5642 BLAKE2B 72f2aea7b428ea59a05d51f8f10e7447408757f3cf322cd2d37ed605812816f135baac4507543254de0d1f3d89a2da9d261d2012b6c3805b4a87fab064465e32 SHA512 1f6c69e96eb98e4389d55cee8dbd40ad0cab84aad60edc65df2b940968392ed052a489ad25662e44a5c14a5c878f08b2566097d0c20c200f8c74b0b2d5f327ee
EBUILD redis-6.2.6.ebuild 5398 BLAKE2B ea426c3c1f29e7e471fcd0435dd494713111d63d585f870e0d6c86e662e4023bacac5134c95c52ead1fcc3a8886db83a42a2f719fa035f46dde3dd333c725c92 SHA512 2b066233d5211973a19fc7d7c1d01892e818a560be746754166dcd836c46c370a61e0e92592452345c98d00dd455cb9af6bd2eff0f6375d9fcef15e46e433b1e
-EBUILD redis-6.2.7-r1.ebuild 5482 BLAKE2B 820c3b7261a84cc6ae2313ef9adad5a43787b308b36b20525ee3ec3d1587095b979ebb4a00775c37aa6f54b2520de7fe204582120436fef94717fc7d101001e6 SHA512 2d28ededbd610a0d9d8d61229c67ebc747464b77214daff069a2acdea45d86170de1fe70cd465aa444dad72d7e466e46d8397c82643857a11d9347b0ecdf6396
-EBUILD redis-7.0.1-r1.ebuild 4829 BLAKE2B 5530e81a11e62fa3118c7d89a956483856409527d0d28d48ed05dc05996c36389ae9910690808fe1e74e4741852c47e48f36ec23357988821b588827fbfb53ad SHA512 69cb7349fba737e14f4d93e8b5b5f4aaf9dae13b6661e6355103ce95c252bbf624444983e2f9373c1bfd40b35303652c752b8fc8616d3aca917eb16eca450181
-EBUILD redis-7.0.2.ebuild 4836 BLAKE2B d80fa0129b047a147ecb11c343ccf5b300d3026a9f8dece4740843341f84d53b3d675090c35f75afe3e0fd5b02546a5f2ae15ac4f2a113ecf4370c4c43fdc2c7 SHA512 21d2332d96868e95d48cbebe3e9f42c433194f198db6c27361356f61927eaad0d6c3cc21a83d1b16affa40ecdf2cfbc56328682311b3e84d596b260ab2672350
+EBUILD redis-6.2.7-r1.ebuild 5478 BLAKE2B 053f0e0d1eb7cd38724b4ab1141a288f4527dbd15ff711bd74d24262a5e38ce3ecb92bf4115c2ef224fb7e22987d69c8562b73d47a83a3176985ad3ba3cd9260 SHA512 8211b56d75cd0a971021db3c984b33edc504eb5a7d769e7affdbfd93f536b0df0dd97b8d5c6e1b793fdc4fade584dccf6a9d204a4b91dfa530ad5941a38384d0
+EBUILD redis-7.0.1-r1.ebuild 4890 BLAKE2B 8c43af6454f8fee44e4c2cce7ce8ce646ebca1e23ab0938b566022bc0318d4a73708d65763c52f76d61801eed811f90ba8178c28d981cc58910c6f3e641204fa SHA512 7126a2675572dce2a15b25753641fbd6a1c90b04a635e0ac1dbb28a44137219311abba357b7975b4f16ea20888a70b6d1eb5419e6d7ce5479303164ffe88efb3
+EBUILD redis-7.0.2.ebuild 4897 BLAKE2B d8e801fc98a00d63681e6e4a08a80e576ee77fc5e8008bc6c60b947e3f41738a96c9e0156611c7daf7c147c9b7f053c0ecdc2ed829b017e022d581e77f69b8e2 SHA512 74e9242961d40ff97002cca7faf7a86a59937a0246958831d078b087c232bd650b993e9c73b7cde6e309e12ae3b19cc5424239946163e0eacf281be72c5e4296
+EBUILD redis-7.0.3.ebuild 4900 BLAKE2B d0c337b9a1df1c70aa2f520419fb1c7e3cccc823d93d64972ec7968d6cf55c8b87a0fd5caab90ac7031556f72da54d6030fc0262fa11c1731df120d099ea3f0b SHA512 95cd2589fe38f59c068ff16245c93c0695330b67070dc686545b17637d810eff90bc632589cfa4f65c8ee6e77741a5d8fca4b3e4ad62aac39169153278f75545
MISC metadata.xml 616 BLAKE2B 7d97d6490b18f6505729b0ec0c06fafbc8be3fb81c4f0b3aedcb44bbf557ca53c4465d0dac11e52396853e471d426b117e0d4c34407806e8bd31149e12ddad87 SHA512 8ff1a9be0ff3a6c09bb6f77cc83937c0e045ae666cec3994d9f3bf290260337faeeb2d28266e789d1812b4dc481a19afd198c0a207ee107afd2368b9d176fb70
diff --git a/dev-db/redis/redis-6.2.7-r1.ebuild b/dev-db/redis/redis-6.2.7-r1.ebuild
index a15818f6a3db..81a788f58fc7 100644
--- a/dev-db/redis/redis-6.2.7-r1.ebuild
+++ b/dev-db/redis/redis-6.2.7-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+jemalloc selinux ssl systemd tcmalloc test"
RESTRICT="!test? ( test )"
diff --git a/dev-db/redis/redis-7.0.1-r1.ebuild b/dev-db/redis/redis-7.0.1-r1.ebuild
index f43853ced40b..2fdb9e772f89 100644
--- a/dev-db/redis/redis-7.0.1-r1.ebuild
+++ b/dev-db/redis/redis-7.0.1-r1.ebuild
@@ -117,6 +117,8 @@ src_compile() {
src_test() {
local runtestargs=(
--clients "$(makeopts_jobs)" # see bug #649868
+
+ --skiptest "Active defrag eval scripts" # see bug #851654
)
if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
diff --git a/dev-db/redis/redis-7.0.2.ebuild b/dev-db/redis/redis-7.0.2.ebuild
index 3e4ee296d8aa..9ab76d9dd7cc 100644
--- a/dev-db/redis/redis-7.0.2.ebuild
+++ b/dev-db/redis/redis-7.0.2.ebuild
@@ -117,6 +117,8 @@ src_compile() {
src_test() {
local runtestargs=(
--clients "$(makeopts_jobs)" # see bug #649868
+
+ --skiptest "Active defrag eval scripts" # see bug #851654
)
if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
diff --git a/dev-db/redis/redis-7.0.3.ebuild b/dev-db/redis/redis-7.0.3.ebuild
new file mode 100644
index 000000000000..c9f9d38f3cb8
--- /dev/null
+++ b/dev-db/redis/redis-7.0.3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated
+# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable
+
+inherit autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+jemalloc selinux ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ jemalloc? ( >=dev-libs/jemalloc-5.1:= )
+ ssl? ( dev-libs/openssl:0= )
+ systemd? ( sys-apps/systemd:= )
+ tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ acct-group/redis
+ acct-user/redis
+ selinux? ( sec-policy/selinux-redis )
+"
+
+BDEPEND="
+ ${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+ ${COMMON_DEPEND}
+ test? (
+ dev-lang/tcl:0=
+ ssl? ( dev-tcltk/tls )
+ )"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.2.1-config.patch
+ "${FILESDIR}"/${PN}-5.0-shared.patch
+ "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+ "${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+)
+
+src_prepare() {
+ default
+
+ # Append cflag for lua_cjson
+ # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+ append-cflags "-DENABLE_CJSON_GLOBAL"
+
+ # now we will rewrite present Makefiles
+ local makefiles="" MKF
+ for MKF in $(find -name 'Makefile' | cut -b 3-); do
+ mv "${MKF}" "${MKF}.in"
+ sed -i -e 's:$(CC):@CC@:g' \
+ -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+ -e 's: $(DEBUG)::g' \
+ -e 's:$(OBJARCH)::g' \
+ -e 's:ARCH:TARCH:g' \
+ -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+ "${MKF}.in" \
+ || die "Sed failed for ${MKF}"
+ makefiles+=" ${MKF}"
+ done
+ # autodetection of compiler and settings; generates the modified Makefiles
+ cp "${FILESDIR}"/configure.ac-7.0 configure.ac || die
+
+ sed -i \
+ -e "/^AC_INIT/s|, __PV__, |, $PV, |" \
+ -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+ configure.ac || die "Sed failed for configure.ac"
+ eautoreconf
+}
+
+src_configure() {
+ econf
+
+ # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+ # also, don't define ANSI/c99 for lua twice
+ sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+ local myconf=""
+
+ if use jemalloc; then
+ myconf+="MALLOC=jemalloc"
+ elif use tcmalloc; then
+ myconf+="MALLOC=tcmalloc"
+ else
+ myconf+="MALLOC=libc"
+ fi
+
+ if use ssl; then
+ myconf+=" BUILD_TLS=yes"
+ fi
+
+ export USE_SYSTEMD=$(usex systemd)
+
+ tc-export AR CC RANLIB
+ emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
+}
+
+src_test() {
+ local runtestargs=(
+ --clients "$(makeopts_jobs)" # see bug #649868
+
+ --skiptest "Active defrag eval scripts" # see bug #851654
+ )
+
+ if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
+ ewarn "oom-score-adj related tests will be skipped." \
+ "They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382."
+
+ runtestargs+=(
+ # unit/oom-score-adj was introduced in version 6.2.0
+ --skipunit unit/oom-score-adj # see bug #756382
+
+ # Following test was added in version 7.0.0 to unit/introspection.
+ # It also tries to adjust OOM score.
+ --skiptest "CONFIG SET rollback on apply error"
+ )
+ fi
+
+ if use ssl; then
+ edo ./utils/gen-test-certs.sh
+ runtestargs+=( --tls )
+ fi
+
+ edo ./runtest "${runtestargs[@]}"
+}
+
+src_install() {
+ insinto /etc/redis
+ doins redis.conf sentinel.conf
+ use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+ fperms 0750 /etc/redis
+ fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+ newconfd "${FILESDIR}/redis.confd-r2" redis
+ newinitd "${FILESDIR}/redis.initd-6" redis
+
+ systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+ newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+ newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+ newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ dodoc 00-RELEASENOTES BUGS CONTRIBUTING.md MANIFESTO README.md
+
+ dobin src/redis-cli
+ dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+ fperms 0750 /usr/sbin/redis-benchmark
+ dosym redis-server /usr/sbin/redis-sentinel
+
+ if use prefix; then
+ diropts -m0750
+ else
+ diropts -m0750 -o redis -g redis
+ fi
+ keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+ tmpfiles_process redis.conf
+
+ ewarn "The default redis configuration file location changed to:"
+ ewarn " /etc/redis/{redis,sentinel}.conf"
+ ewarn "Please apply your changes to the new configuration files."
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index cc1436df456f..8d664861cff4 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/wsdl4j/Manifest b/dev-java/wsdl4j/Manifest
index a6560e100fb1..37995978417c 100644
--- a/dev-java/wsdl4j/Manifest
+++ b/dev-java/wsdl4j/Manifest
@@ -1,7 +1,3 @@
-AUX 1.6.2-tests-sandbox.patch 548 BLAKE2B aba74bdc87f3a35b46a80e20968e926f604a2dc13bfd48569f62fc72b7c8e2bbcb5df33af712c19a548a8c9668195cc340be92fa60e21ab36b0ab0c089de1d23 SHA512 bed0bcf00856309d8f628d4a41774a112bd26c651e9fdfa00af3113d780f430e6b50213fe0f743b486aafb78f11cdd924c4dd8eef64300715a8e88c64c11368b
-DIST jwsdltck-bin-1.2.zip 599377 BLAKE2B 0f99dc93a1b22019c572fe55585ee285c72e1dabcecc5cf93fa635b12a39a43686f0ff704a0c9ea25c682a882c4580fd82cf2015a9d4417dd28bc87d0b32a670 SHA512 a8f86d9895c588d752d266413e77c2a8db241e9cf9c199909f2e9d1d1b3b1b03eaa6b5841c62b0e7a7c779089eb6721797fdb4f2db841789a6a19884bd48711b
-DIST wsdl4j-src-1.6.2.zip 172400 BLAKE2B 96fa6a9098993ba20a277004515a4cd29bae84450b86398ceb1dc7835f14f17b39e5daf87d557b4378860c9d24e5928a80bb30b2d953fdc8fcae7d97ae8454f5 SHA512 55d0b8eb6a08cecd4a48223a9f29fe6ed0e00ec4dca99f44a04882efdba448601bb7dadcaa347e32e3ff5bb9e3334503d6666ca2a6276c7bb48b80acea57b751
DIST wsdl4j-src-1.6.3.zip 173137 BLAKE2B 85ffe7a53b281307cd2d7072f611aa7ecbc10a5e13125f44f0dc934218b8d31ad15438adfc46a89431a5fc1ac68d4896c2415a95ee87c227d74babe664202e4f SHA512 eb5e16b0b51530a27b12aae5d897384d2a03db2e4df70f23ab435af5e8444f828dacfdb0ab0807a9e0b3423eebb165eea8790c129a173d376fc929a1c222be6e
-EBUILD wsdl4j-1.6.2-r1.ebuild 1376 BLAKE2B cb0628a913a4d93b32f8d2db8e59757bf31500ebfc7bbf7899e2f08e60e82ecfef6609dba997ec17aeaa9a96782326e3055e8a7808c52d9257010249d0cc53cb SHA512 32e0c7d1cd69884104ae305d7dd3e24e92fbb6f26c7e2eda07ba4ddc814f700b8c8986a8cfadc89bd4b57203b6219abcc2db30104ec929677036e63153303e00
-EBUILD wsdl4j-1.6.3.ebuild 599 BLAKE2B 60af9fd15e0fadeec0ef848404f314a9b4dffa58c193e7ceb82820cb9a5a17f6b0f51d3ca4b65f608df5ffeb437e9a257a96b04e890750c145b8bcfec4b39a49 SHA512 e15ab20d9f011a3009be198610a84679e2e61a5c98659c0163ac47fa9e9231072842adb867e89a9b7be75d10350758a1c340a4296ec3df253bd8f31cff5fe65f
+EBUILD wsdl4j-1.6.3.ebuild 597 BLAKE2B 1fa1cfbea02d915133fae7a7cdbb3b22fdf3bff6da0aba80991363c70d0cf0362e37dff6d94584688177232ccefe115e45c0da250983d9f4c4a2bc989f9bbeb2 SHA512 dacbdd6d2257d53a8079f96d905c5e480d5c55e1a92643dbd7d68d1db27127c4c1821797b56a010d6c47d55be5321b9c54c6b168a4ab9d64390f2ea8132dfdeb
MISC metadata.xml 313 BLAKE2B aabc90f625441d1325eb089a25545ba18a7e323c758d183b8e5ca2c1531c12f33e71404209f8c7c70713cb9ecfac806ce1d59aceb34b21c1c83f44b409433f5d SHA512 13071d1d4f65f3e9ce63df3e7b15289167c9bd83b0a83df6b40faec8da89a69d271f83e22ceff5e003ca230259a986c96cf5765a94ec5c03d6cffac3ef4632ce
diff --git a/dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch b/dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch
deleted file mode 100644
index 7901a11a6fc0..000000000000
--- a/dev-java/wsdl4j/files/1.6.2-tests-sandbox.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur wsdl4j-1_6_2.old/build.xml wsdl4j-1_6_2/build.xml
---- wsdl4j-1_6_2.old/build.xml 2007-06-09 01:12:11.000000000 +0300
-+++ wsdl4j-1_6_2/build.xml 2007-06-09 01:13:09.000000000 +0300
-@@ -279,6 +279,7 @@
-
-
-
-+
-
-
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
deleted file mode 100644
index 2543074e32b0..000000000000
--- a/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,61 +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 test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Web Services Description Language for Java Toolkit (WSDL4J)"
-HOMEPAGE="http://wsdl4j.sourceforge.net"
-
-TCK="jwsdltck"
-TCK_V="1.2"
-
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip
- test? ( mirror://sourceforge/${TCK}/${TCK}-bin-${TCK_V}.zip )"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-# tests fail with encoding errors
-RESTRICT="test"
-
-DEPEND=">=virtual/jdk-1.8:*
- test? ( dev-java/junit:0 )
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${P//./_}"
-TCK_S="${WORKDIR}/${TCK}-${TCK_V//./_}"
-
-EANT_BUILD_TARGET="compile"
-EANT_DOC_TARGET="javadocs"
-
-src_prepare() {
- default
- if use test; then
- rm -v "${TCK_S}"/lib/*.jar || die
- eapply "${FILESDIR}/1.6.2-tests-sandbox.patch"
- fi
-}
-
-src_test() {
- ln -s "${TCK_S}" test || die
- cd "${TCK_S}" || die
- java-ant_rewrite-classpath
- local junit="$(java-pkg_getjars junit)"
- eant -Dbuild.lib="${S}/test/lib" compile \
- -Dgentoo.classpath="${S}/build/lib/${PN}.jar:${junit}"
- cd "${S}" || die
- mkdir "${T}/lib" || die
- ANT_TASKS="ant-junit" eant test -Dtemp.dir="${T}"
-}
-
-src_install() {
- java-pkg_dojar build/lib/*.jar
-
- use doc && java-pkg_dojavadoc build/javadocs/
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
index 3be69a6a39f3..6d6021edc701 100644
--- a/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
+++ b/dev-java/wsdl4j/wsdl4j-1.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/wsdl4j/WSDL4J/${PV}/wsdl4j-src-${PV}.zip"
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a816d4ac1fd4..3416ea4220eb 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index d7ab60aed40c..37c8754f2889 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -3,6 +3,8 @@ AUX R-3.4.1-rmath-shared.patch 899 BLAKE2B 0aba9c1c5417531647bed3829d53909e6f398
AUX R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch 469 BLAKE2B ee716b068316bbac0c07fe44bef739a491af5f4e90ba268cf7db428350763d498ab0b1bc9efa02ac885d0ac64aa5d076deaac094725766e340cbcd9d7e839b22 SHA512 cb7bc73fd0f1aa4159b25bc76318074662afddafdef8acc8caf20afb98da6c065c3bd0895c4a7a7f18a174d21d59c0f054a46aa513db1b5b622a110e7c54e171
AUX R-3.6.2-no-gzip-doc.patch 443 BLAKE2B 1154e9f67f08e1d8b286152bd093789a0b94b3a2422bdb54d1d1d03729bd892811e68121309c41ef4323ed31efcea82f3e265b37445e9870bbd88c5413311345 SHA512 99678dbf809761a2991cd5cbe6ff5ba8d1c3e9388f69d94b30726caae4eee29ae50ee74aa24e3851d41559f804381ec18a2cd818b97b5417bf7ae660c93ad2a6
DIST R-4.2.0.tar.gz 37585694 BLAKE2B 5ba4d3b9397e92b72af729d88ff562655e0dd7c547bd371638aa76d4f1701f4f8a7911d500cf4f10d87b62457f8f8ce7a946d893477ceb7268b06bd59bc10f3d SHA512 99e71dad00b63e44bfcb8dc9539ff1951809112882d9ee7e06a4e99bce2e6ceac24e8348fd598c21e6d5ab0e0629a85170cde208bfa8145af91c398ac4ef7bcd
+DIST R-4.2.1.tar.gz 37601544 BLAKE2B b898262a05c92e125c36a661a89be34b1698177832002f7aa21ccfcf0b30a06481e2154eea9e77a94b1ad8ca35c7bc4aead2be99b862dca7450acee1bec6a99f SHA512 c1baf46d22304c425dde79301183f80f99f2752300137b0b6f902c3e55e2419d5e9185c97de6e3c840a38f6345a6c334aa24161656d4a7f6fa01570390f1122f
DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
EBUILD R-4.2.0.ebuild 7338 BLAKE2B 21b5f57bd6e00c4c7eb3f086d7566c4699f549c62e243c5de1044b0ed9349f911ca78c50a133c6e1c1f77c69f8f2c19a7ab9892aa0c1a68308a051096e9a6114 SHA512 dcf2ddb27f6ab783c3f828e6f5a07ea8e71130734f7f500b2ffdd8c72b72dea10df37ffb38756e8af7bb6b20ec66743cf82568d5095d2e684ebff5d1d0e686d3
+EBUILD R-4.2.1.ebuild 7333 BLAKE2B e3e1d97cb16f9fe9e60e89342d05fbfe514b2b2a9be09171d9c605c60405351cfd964f6460b41e4a9e014ed737b40a672caf27db0d37b24303fedbd031528964 SHA512 3dc2cef4e3fdeee61aeb87f1c135873ada92305e1325115f10950a02fc2082b4d95d0b68efb3fe0934491b1c5a681fc611718480cabcc1887ff5271cba4cfb87
MISC metadata.xml 1261 BLAKE2B 468178b60e894bd8dff85ecbf74d10dce61bdb21fc8b61f43d7778dbc345234fc6b5e28c7608534d558c95fa6583b5acd2e55cef7096c4cff88e84776e93e03a SHA512 0d42cb1e3b951e3b1cbf09e6e48d47cf7635c8b16708b5b1edb6c5d1b422cad2f16ce5c6f7c603efb365eb9d5b794d2d2653b408147aa9e921cd57feb3840013
diff --git a/dev-lang/R/R-4.2.1.ebuild b/dev-lang/R/R-4.2.1.ebuild
new file mode 100644
index 000000000000..bdc4ef782ed2
--- /dev/null
+++ b/dev-lang/R/R-4.2.1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs
+
+# latest git commit for R bash completion: https://github.com/deepayan/rcompletion
+BCPV=78d6830e28ea90a046da79a9b4f70c39594bb6d6
+
+DESCRIPTION="Language and environment for statistical computing and graphics"
+HOMEPAGE="https://www.r-project.org/"
+SRC_URI="
+ mirror://cran/src/base/R-4/${P}.tar.gz
+ https://raw.githubusercontent.com/deepayan/rcompletion/${BCPV}/bash_completion/R -> ${PN}-${BCPV}.bash_completion"
+
+LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X"
+
+REQUIRED_USE="
+ png? ( || ( cairo X ) )
+ jpeg? ( || ( cairo X ) )
+ tiff? ( || ( cairo X ) )"
+RESTRICT="
+ minimal? ( test )
+ !test? ( test )"
+
+# At least one package installation in the test suite requires TeX,
+# and will fail without it (bug #718056).
+DEPEND="
+ app-arch/bzip2
+ app-arch/xz-utils
+ app-text/ghostscript-gpl
+ dev-libs/libpcre2:=
+ >=dev-libs/tre-0.8.0_p20210321[approx]
+ net-libs/libtirpc
+ net-misc/curl
+ virtual/blas
+ sys-libs/zlib[minizip]
+ || (
+ sys-apps/coreutils
+ app-misc/realpath
+ )
+ cairo? (
+ x11-libs/cairo:=[X=]
+ x11-libs/pango:=
+ )
+ icu? ( dev-libs/icu:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ lapack? ( virtual/lapack )
+ perl? ( dev-lang/perl )
+ png? ( media-libs/libpng:= )
+ readline? ( sys-libs/readline:= )
+ tiff? ( media-libs/tiff:= )
+ tk? ( dev-lang/tk:= )
+ X? (
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-misc/xdg-utils
+ )"
+RDEPEND="${DEPEND}
+ java? ( >=virtual/jre-1.8:* )"
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ virtual/latex-base
+ dev-texlive/texlive-fontsrecommended
+ )
+ test? ( virtual/latex-base )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.1-parallel.patch
+ "${FILESDIR}"/${PN}-3.4.1-rmath-shared.patch
+ "${FILESDIR}"/${PN}-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch
+ "${FILESDIR}"/${PN}-3.6.2-no-gzip-doc.patch
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+ tc-check-openmp
+ FORTRAN_NEED_OPENMP=1
+ fi
+
+ fortran-2_pkg_setup
+
+ # avoid using existing R installation
+ unset R_HOME
+}
+
+src_prepare() {
+ default
+
+ # fix packages.html for doc (gentoo bug #205103)
+ sed -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
+ -i src/library/tools/R/Rd.R || die
+
+ # fix Rscript path when installed (gentoo bug #221061)
+ sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EPREFIX}/usr/$(get_libdir)/${PN}\"':" \
+ -i src/unix/Makefile.in || die "sed unix Makefile failed"
+
+ # fix HTML links to manual (gentoo bug #273957)
+ sed -e 's:\.\./manual/:manual/:g' \
+ -i $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
+
+ # Disable this test until it passes again,
+ # https://bugs.r-project.org/show_bug.cgi?id=18338
+ sed -e 's/ reg-packages.R / /' \
+ -i tests/Makefile.common || die
+
+ use lapack &&
+ export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
+
+ if use X; then
+ export R_BROWSER="$(type -p xdg-open)"
+ export R_PDFVIEWER="$(type -p xdg-open)"
+ fi
+ use perl &&
+ export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
+
+ # don't search /usr/local
+ sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
+
+ # Fix for Darwin (macOS)
+ if use prefix; then
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
+ -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
+ -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
+ -e "/SHLIB_EXT/s/\.so/.dylib/" \
+ -i configure.ac || die
+ # sort of "undo" 2.14.1-rmath-shared.patch
+ sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EPREFIX}/usr/$(get_libdir)/libRmath.dylib:" \
+ -i src/nmath/standalone/Makefile.in || die
+ else
+ append-ldflags -Wl,-rpath="${EPREFIX}/usr/$(get_libdir)/R/lib"
+ fi
+ fi
+
+ AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+ filter-ldflags -Wl,-Bdirect -Bdirect
+
+ econf \
+ --enable-byte-compiled-packages \
+ --enable-R-shlib \
+ --disable-R-framework \
+ --disable-R-static-lib \
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+ rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --with-system-tre \
+ $(use_enable java) \
+ $(use_enable lto lto R) \
+ $(use_enable nls) \
+ $(use_enable openmp) \
+ $(use_enable profile R-profiling) \
+ $(use_enable profile memory-profiling) \
+ $(use_with cairo) \
+ $(use_with icu ICU) \
+ $(use_with jpeg jpeglib) \
+ $(use_with lapack) \
+ $(use_with !minimal recommended-packages) \
+ $(use_with png libpng) \
+ $(use_with readline) \
+ $(use_with tiff libtiff) \
+ $(use_with tk tcltk) \
+ $(use_with tk tk-config "${ESYSROOT}"/usr/$(get_libdir)/tkConfig.sh) \
+ $(use_with tk tcl-config "${ESYSROOT}"/usr/$(get_libdir)/tclConfig.sh) \
+ $(use_with X x)
+}
+
+src_compile() {
+ export VARTEXFONTS="${T}"/fonts
+ emake AR="$(tc-getAR)"
+ emake -C src/nmath/standalone shared AR="$(tc-getAR)"
+ use doc && emake info pdf
+}
+
+src_install() {
+ default
+ emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
+
+ if use doc; then
+ emake DESTDIR="${D}" install-info install-pdf
+ dosym ../manual /usr/share/doc/${PF}/html/manual
+ fi
+
+ newenvd - 99R <<-_EOF_
+ LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}/lib"
+ R_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}"
+ _EOF_
+
+ newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
+ # The buildsystem has a different understanding of install_names than
+ # we require. Since it builds modules like shared objects (wrong), many
+ # objects (all modules) get an incorrect install_name. Fixing the build
+ # system here is not really trivial.
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ local mod
+ pushd "${ED}"/usr/$(get_libdir)/R >/dev/null || die
+ for mod in $(find . -name "*.dylib") ; do
+ mod=${mod#./}
+ install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/R/${mod}" "${mod}"
+ done
+ popd >/dev/null || die
+ fi
+
+ # Users are encouraged to access some of the the R documentation
+ # interactively, through functions like "contributors()" that
+ # tries to open the "AUTHORS" file. Other files can be accessed
+ # by name with RShowDoc(), and the documentation for e.g. license()
+ # and RShowDoc() suggests a few of these names. Here we try to
+ # collect as many names as possible that a user might actually
+ # try to view through R, because if we don't decompress them,
+ # then R doesn't know what to do with 'em. Bug #556706.
+ local INTERACTIVE_DOCS=(
+ AUTHORS
+ COPYING
+ FAQ
+ NEWS
+ THANKS
+ )
+
+ # Other data sources that are shipped as "documentation," but which
+ # need to be accessible via their original unmolested filenames.
+ local INTERACTIVE_DATA=(
+ BioC_mirrors.csv
+ CRAN_mirrors.csv
+ KEYWORDS.db
+ NEWS.rds
+ )
+
+ local f NOCOMPRESS_DOCS=( "${INTERACTIVE_DOCS[@]}" "${INTERACTIVE_DATA[@]}" )
+ for f in "${NOCOMPRESS_DOCS[@]}"; do
+ docompress -x /usr/share/doc/${PF}/${f}
+ done
+
+ # Finally, an extra copy of this started showing up at some point...
+ rm "${ED}"/usr/$(get_libdir)/R/COPYING || die
+}
+
+pkg_postinst() {
+ if use java; then
+ einfo "Re-initializing java paths for ${P}"
+ R CMD javareconf
+ fi
+}
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index e19808656d46..125c39e639fc 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,10 +1,10 @@
AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
-DIST nim-1.4.8.tar.xz 4786360 BLAKE2B 961b38275c4f9de87ac522c5b47368ce7f5543811a2dfd7b4f3fd79a104bcd0458caaaaab1705f99eb42c64735ca5f71d5018f8a8275a430d883233b28b1d412 SHA512 e6b245271495880f0eea271c46b4f5ce9168a421716a9a22367b6be3c2a9822937aad1f48eb61c151b040ac961728a89c8a6d143c8300057c0d8c1f2d66f3dd3
+AUX nim-1.6.6-csources-flags.patch 371 BLAKE2B 903e9738f6c87bc40ef922c5abde50edaff223cdf11befee0ece7b3a472a68b7dc211e1e6347a2181c68fe524693832f20309bf90aeb3aac9d76125f224587c9 SHA512 2753e14ada3093a2208636eb36eb2a79946f7c4858d86945b1d242d424b1a4350403b7d8f58af33c1c43a04b24465748cb7f26b7426e65b91d09cc61167d5de4
DIST nim-1.6.2.tar.xz 5181616 BLAKE2B adedbcaad1b135b6f99459894856190103e2d2b678849e0418f77c02a54fde44224456ea13949f3fe9f5f020a90adde46593497895674bd9ae892b17708df292 SHA512 052b62c987035f7633f965356993cd4eec686f4f4f5c675cf966d82cb30fcf574045887a4402bcc20e487299fb5e8f65a921951c2dc21ac334e695e31d95d992
DIST nim-1.6.4.tar.xz 5130208 BLAKE2B d0f297581677bbb9fb185a8b4198f48bb58efe81a1624f62051bc1e0a93f879a0cec172f11a41784ca715ba3c151dc5307e96c15c54908aa40df406040891d6c SHA512 f4d082f37f0e675e8cdb4340d67f2e58b5e6ac5bb51dab1ded5417097f3b86d71fa585ef12ee1c3cd5b17285589cbe9d5658fcb29c98547f7967a1b6f0cb4646
DIST nim-1.6.6.tar.xz 5149956 BLAKE2B 2fd1b40f1ecc1200255052d9e013c55287d3e01337146d0b1386d0f3fc9c14fda1e8e82ee289e782c77a573c1ae0985ea7f900f61e6b9824a9eb4b5c803c7f71 SHA512 6ea8d3f61adae48184dd0e3ac393296fd3bd5ead818e7dee949f43eccbd0b6229ebfc474353ddd63cc734f82c3247998fbfe88362061983f978ad8d0ab7fa677
-EBUILD nim-1.4.8.ebuild 2078 BLAKE2B 2a9781ebc99b6ae00c67f3034e71b8adff46f1452f628187975219ea73ee6c60f6176dc55fa0520cd83f0969302906fe79f5d87aae17cf539447a8fb1e1bf169 SHA512 3d38c1304c76727461e7e7bcc5b85770c42364da5b3c01fcada9c8528146687cab141e9acbf47b82ef85c68f892882c0266c76fb25d3ee39e84422dafee6be73
+DIST nim-patches-1.6.6.tar.gz 1975 BLAKE2B 75490f4c61f4d920aadb2ad5908cb2773e270f80cee95f937ede8125bad5688b71840ed7f48659db892e4017437a0454b38eab18ae8b13c6b48207d0a7714371 SHA512 4d1590e7d05ad64432b943f8da9edb2b05213400181d1e07a0e40f479afbceb1997d0ea0f05a73d550afe60cf4b657f7e34840907ea16c3b9e96824e9f29e0e5
EBUILD nim-1.6.2.ebuild 2139 BLAKE2B 9ce2020017887e5403aefd67712ffbf0b4f6c42c7f5ad96eddac2fef3afdafbd6f6264dd27eea2b6968b0dd816d714ccb1a8bf7debed5a338cf7a65c24ce4eb7 SHA512 b910a98baac46d490be0764b79f6438a61e2ed6dfa5f998102bf52ae7dead628a1aabb2e488860c61d6f9eef54f27477797e654a588c4ee8ba67cbe3ef8c13eb
EBUILD nim-1.6.4.ebuild 2150 BLAKE2B df6e12e923f86d1ae2fd7f97c3d58884aaffae1f6db49f1fe0bda6d4f566716b398f638277697ad3850f8d00bdda1f36508e0740a7c7b1e6cc728b1671db7382 SHA512 5fa6a5df5374ef85198095e08647a3c1bad33ad999eb18458ae593b65f964c30c805488eab360a793a5a0c8ca9df6dba45d000edbbff16d6e19602339f6d3786
-EBUILD nim-1.6.6.ebuild 2150 BLAKE2B df6e12e923f86d1ae2fd7f97c3d58884aaffae1f6db49f1fe0bda6d4f566716b398f638277697ad3850f8d00bdda1f36508e0740a7c7b1e6cc728b1671db7382 SHA512 5fa6a5df5374ef85198095e08647a3c1bad33ad999eb18458ae593b65f964c30c805488eab360a793a5a0c8ca9df6dba45d000edbbff16d6e19602339f6d3786
-MISC metadata.xml 1894 BLAKE2B 8ba43a558af584b0c455e16f6d710a2482fbd3d8a4ae80817ee0080165227e931f40b2269d6316ca4fc8773cea0e6d941feafcc30d8a2eb5eb0843d8f7e7df71 SHA512 6fbc92e65c8a85c82cba372aba12133acc626c2a33ec35aff4a02246e70f64dd06c51af121f17fb5cbab48df1aafa3e9af9375a1ccbd769590e26078a7dacf88
+EBUILD nim-1.6.6-r2.ebuild 2565 BLAKE2B bc888ebb22d8932fb905088d2f8042e0bde6e0e1ff495967d130f3477e6494c392f04b17dea7c49b35eac3c56d5534427e9384b92a365f0539a5c63a452d7bb3 SHA512 6e116b206c24927c30513ee97cd9035952380b1b88bb240ffc8909a1989d0fbba9827685fd4ab759e02077422afdd0cad28028980ffd7ebfef47d11d3c163b16
+MISC metadata.xml 1975 BLAKE2B 892f172a8f69200207ce9f3f9415ec08adddf30e52d975a706c2de75e643a9a7e1e9911340ff9aaf9d74feb8e159172c90ecb7eb75642319afc8a5ab3d04f030 SHA512 69772a1e0469fdd71e28037eb2ecba46b78355a120fbacfb1c520e0e5c6c5a0b68fc5b7b0695f4ca7e682031f68a4350fe8108e97e64eb6b86b49fdc57b07977
diff --git a/dev-lang/nim/files/nim-1.6.6-csources-flags.patch b/dev-lang/nim/files/nim-1.6.6-csources-flags.patch
new file mode 100644
index 000000000000..9a39a900e82a
--- /dev/null
+++ b/dev-lang/nim/files/nim-1.6.6-csources-flags.patch
@@ -0,0 +1,11 @@
+--- a/build.sh
++++ b/build.sh
+@@ -60,7 +60,7 @@
+ fi
+ CC="sem -j $parallel --id $$ ${CC}"
+ fi
+-COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fmax-errors=3 -O3 -fno-strict-aliasing -fno-ident $extraBuildArgs"
++COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fmax-errors=3 -fno-strict-aliasing -fno-ident $extraBuildArgs"
+ LINK_FLAGS="${LDFLAGS:-} "
+ PS4=""
+ # platform detection
diff --git a/dev-lang/nim/metadata.xml b/dev-lang/nim/metadata.xml
index cca80bdcbe60..d24270e82fb6 100644
--- a/dev-lang/nim/metadata.xml
+++ b/dev-lang/nim/metadata.xml
@@ -36,4 +36,7 @@
https://github.com/nim-lang/Nim/issues/
nim-lang/Nim
+
diff --git a/dev-lang/nim/nim-1.4.8.ebuild b/dev-lang/nim/nim-1.4.8.ebuild
deleted file mode 100644
index d0ec48b68ee2..000000000000
--- a/dev-lang/nim/nim-1.4.8.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 multiprocessing toolchain-funcs
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+readline test"
-
-RESTRICT=test # need to sort out depends and numerous failures
-
-RDEPEND="
- readline? ( sys-libs/readline:0= )
-"
-DEPEND="
- ${RDEPEND}
- test? ( net-libs/nodejs )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.20.0-paths.patch
-)
-
-# Generated by nim
-QA_FLAGS_IGNORED="
-usr/bin/atlas
-usr/bin/nim
-usr/bin/nim_dbg
-usr/bin/nimble
-usr/bin/nimgrep
-usr/bin/nimpretty
-usr/bin/nimsuggest
-usr/bin/testament
-"
-
-_run() {
- echo "$@"
- "$@" || die "'$*' failed"
-}
-
-nim_use_enable() {
- [[ -z $2 ]] && die "usage: nim_use_enable