gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2022-07-08 07:46:39 +00:00
parent 090f324d13 1063b9d95a
commit c2e25eeb4d
25 changed files with 941 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-crypt/gnupg/Manifest
View File

@@ -1,4 +1,6 @@
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
DIST gnupg-2.2.36.tar.bz2.sig 119 BLAKE2B ad6dc03c34f6c0d13080ef0bdea2db152c12ea4f129783ba1b0b7f237965b8eeec22b2e79fcf42657dafdd20cae558d781b07378bed78386979a0b4c4ef4a49b SHA512 4ad3f9041aa1fbffaab3cc4aa0df038a67dc8eb200492cdd96259dcf1e0005cb39d6e6245280f1a2a8d4db9f686381e2b0f5bb80c412edbdbcb3fc11dca044c5
DIST gnupg-2.3.6.tar.bz2 7604761 BLAKE2B 6cbc749156c50b6633c126cde621271c6c9682a04efea51fbc5a2e92ee56493e8348814391ee0c337adcb4de4dd23293b9592db78998626905038c859ac4af6e SHA512 4540e8d2be836b491918f4987ba301a73fcdc4539b1f9abf6112a74c2d39c0e5dc3f17511212bac1dd7fd0594feecd91f95ecf78d4b2c1e70e818342a1802b85
DIST gnupg-2.3.6.tar.bz2.sig 119 BLAKE2B c7d4cdc81580b8b1e56c7bc83236d65c9d2c1bab2d210d14a0d3c58f635d656c9b449ef9596b9601027cb891bd437cc8f2a63eb3c17742c288531511984fba7f SHA512 85d155f9809c8d0f38723d8622c085e421531c016d19fcce2ae34dc9a4aeac0bc1895f7a094ee9cdf69a15b426fb0d72ee53319fe0a05665c92caa0e950c1797

159
app-crypt/gnupg/gnupg-2.2.36.ebuild Normal file
View File

@@ -0,0 +1,159 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
inherit flag-o-matic systemd toolchain-funcs verify-sig
MY_P="${P/_/-}"
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
HOMEPAGE="https://gnupg.org/"
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
RESTRICT="!test? ( test )"
# Existence of executables is checked during configuration.
# Note: On each bump, update dep bounds on each version from configure.ac!
DEPEND=">=dev-libs/libassuan-2.5.0
>=dev-libs/libgcrypt-1.8.0:=
>=dev-libs/libgpg-error-1.29
>=dev-libs/libksba-1.3.5
>=dev-libs/npth-1.2
>=net-misc/curl-7.10
sys-libs/zlib
bzip2? ( app-arch/bzip2 )
ldap? ( net-nds/openldap:= )
readline? ( sys-libs/readline:0= )
smartcard? ( usb? ( virtual/libusb:1 ) )
ssl? ( >=net-libs/gnutls-3.0:0= )
tofu? ( >=dev-db/sqlite-3.7 )"
RDEPEND="${DEPEND}
app-crypt/pinentry
nls? ( virtual/libintl )
selinux? ( sec-policy/selinux-gpg )
wks-server? ( virtual/mta )"
BDEPEND="virtual/pkgconfig
doc? ( sys-apps/texinfo )
nls? ( sys-devel/gettext )
verify-sig? ( sec-keys/openpgp-keys-gnupg )"
DOCS=(
ChangeLog NEWS README THANKS TODO VERSION
doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
)
PATCHES=(
"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
)
src_prepare() {
default
# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
# idea borrowed from libdbus, see
# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
#
# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
# which in turn requires discovery in Autoconf, something that upstream deeply resents.
sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
}
src_configure() {
local myconf=(
$(use_enable bzip2)
$(use_enable nls)
$(use_enable smartcard scdaemon)
$(use_enable ssl gnutls)
$(use_enable test all-tests)
$(use_enable test tests)
$(use_enable tofu)
$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
$(use_enable wks-server wks-tools)
$(use_with ldap)
$(use_with readline)
--with-mailprog=/usr/libexec/sendmail
--disable-ntbtls
--enable-gpg
--enable-gpgsm
--enable-large-secmem
CC_FOR_BUILD="$(tc-getBUILD_CC)"
GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
)
if use prefix && use usb; then
# bug #649598
append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
fi
# bug #663142
if use user-socket; then
myconf+=( --enable-run-gnupg-user-socket )
fi
# glib fails and picks up clang's internal stdint.h causing weird errors
tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
# As of GnuPG 2.3, the mailprog substitution is used for the binary called
# by wks-client & wks-server; and if it's autodetected but not not exist at
# build time, then then 'gpg-wks-client --send' functionality will not
# work. This has an unwanted side-effect in stage3 builds: there was a
# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
# the build where the install guide previously make the user chose the
# logger & mta early in the install.
econf "${myconf[@]}"
}
src_compile() {
default
use doc && emake -C doc html
}
src_test() {
# bug #638574
use tofu && export TESTFLAGS=--parallel
default
}
src_install() {
default
use tools &&
dobin \
tools/{convert-from-106,gpg-check-pattern} \
tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
tools/make-dns-cert
dosym gpg /usr/bin/gpg2
dosym gpgv /usr/bin/gpgv2
echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
dodir /etc/env.d
echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
use doc && dodoc doc/gnupg.html/* doc/*.png
systemd_douserunit doc/examples/systemd-user/*.{service,socket}
}

2
app-shells/tcsh/tcsh-6.24.00.ebuild
View File

@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls doc"
RESTRICT="test"

34
dev-python/Faker/Faker-13.15.0.ebuild Normal file
View File

@@ -0,0 +1,34 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1
DESCRIPTION="A Python package that generates fake data for you"
HOMEPAGE="
https://github.com/joke2k/faker/
https://pypi.org/project/Faker/
"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
!dev-ruby/faker
"
BDEPEND="
test? (
dev-python/freezegun[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP},tiff]
dev-python/random2[${PYTHON_USEDEP}]
dev-python/validators[${PYTHON_USEDEP}]
)
"
distutils_enable_tests pytest

1
dev-python/Faker/Manifest
View File

@@ -1,2 +1,3 @@
DIST Faker-13.13.0.tar.gz 1528907 BLAKE2B be4593ba271330822f10590aa8e15c4658cd8a19333ab769d32178b72c15b504b8a5269443100250a863af25e40c582244e815cf612dbf8a57833f470ddeec09 SHA512 9e794bf95d40040dfa98439d0d9da19a90dd202905d4825c82453e202adad80bbea6da74ce0d36d8e205381d419a19b8b1fb60b32e20e97ee69b315f4f0c8eb9
DIST Faker-13.14.0.tar.gz 1529502 BLAKE2B 57c5182742f4383bc0590f953dbf8de7075b331da8d9893b84149ce8d3004e545acccf9f113d94eb608b634d9ad42a466d813c5f0311e037d8977fa04eaf36af SHA512 05edbad684a89b0cb4df4965be63b43729047075eed98de9678d98383b28d2ae6d3c645c03ab86d7bc935160c1ab744494d608749213322e318b465c0d47e9c7
DIST Faker-13.15.0.tar.gz 1531111 BLAKE2B b6e91f7e47f5040894647b53eff92ddc8384fe9edfe19aa4d3706c2d5e54100d171b37609968bba068c89d9c946f92b5966b9e8f502863ab3730d9857a342853 SHA512 6de6de872e19f82a716fdf10f594e3d77b160bde46e7c8d20610621728ee3e555b4090835dba220da96d98db5eaac8c0e4290786441441f220b7458f442b99f3

1
dev-python/boto3/Manifest
View File

@@ -5,3 +5,4 @@ DIST boto3-1.24.21.gh.tar.gz 513083 BLAKE2B 1de0405823b6b33efcb11316a3c400180fa3
DIST boto3-1.24.22.gh.tar.gz 513301 BLAKE2B 1b71d128cc8f8224fd1ef521988e6b5e941562c256c2769941340f6a9e3342394f9e2cf20d658bc4b0e9f5ddaebc832ae8fdc96e35e348b73631ca01f0be33a6 SHA512 eb64a050c1b63da823fad2b10db828fefbf75a95ae1f222576eabb8efa80cbbb3e54862dfd40813a8d58f9c329f4d95595bbebc172bcf0141c241499af7d4726
DIST boto3-1.24.23.gh.tar.gz 514077 BLAKE2B ff5b661d477e8163e83cb85045b61fa8057f9cab0b93b2d4575904b17361801e3ffc928ee86624bdf61213a0dc93be91f101e30f418869a1c5dd65e16ff9ed2a SHA512 c127f11e7cd42d0c7f2b802de425d087722ae81fc642fd6867d44cf1b1686ca94b3de76b3034abbd9b85393f8f59d18ea46cd68a57804e658d65e9fba6e6f9a6
DIST boto3-1.24.24.gh.tar.gz 514350 BLAKE2B 6ddb182ef3fa9018d763747bcc3508bbb37a40576ac80f4fbbd25efaa2a96de411a76a2cfafdea7664926c07f7733245b2a6703d8c2d341e43450e7d7eaa4894 SHA512 2465c33529900a7d67f8cc994a0665879d940967279d33be167dcf2eed078575ddea099a40978b291c7a941e8276f3938bd52a002634e73fe64272d8843e47d2
DIST boto3-1.24.25.gh.tar.gz 515150 BLAKE2B 7a6d1bbe4aa327ad9807305b82ae4de5e7035d5ca65203a4f57811c5178e9ea3dd5253a20d566bc7a3e641a8eca709f9fa39f9d53b17a9a5b85ee4a50d090bbb SHA512 13ef720324abbe710f52811490ac7f96ebfe2137ed02fe80bbcefe7514c01316c4338da1690f84b03eb1e5aaa44f74ffa56292f053a04a813d5afb27cb072a32

68
dev-python/boto3/boto3-1.24.25.ebuild Normal file
View File

@@ -0,0 +1,68 @@
# 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..11} )
inherit distutils-r1 multiprocessing
DESCRIPTION="The AWS SDK for Python"
HOMEPAGE="
https://github.com/boto/boto3/
https://pypi.org/project/boto3/
"
LICENSE="Apache-2.0"
SLOT="0"
if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://github.com/boto/boto3"
inherit git-r3
BOTOCORE_PV=${PV}
else
SRC_URI="
https://github.com/boto/boto3/archive/${PV}.tar.gz
-> ${P}.gh.tar.gz
"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
# botocore is x.(y+3).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
fi
RDEPEND="
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
"
BDEPEND="
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
"
distutils_enable_sphinx docs/source \
'dev-python/guzzle_sphinx_theme'
distutils_enable_tests pytest
python_prepare_all() {
# don't lock versions to narrow ranges
sed -e '/botocore/ d' \
-e '/jmespath/ d' \
-e '/s3transfer/ d' \
-i setup.py || die
# 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
distutils-r1_python_prepare_all
}
python_test() {
epytest tests/{functional,unit} -n "$(makeopts_jobs)"
}

1
dev-python/botocore/Manifest
View File

@@ -5,3 +5,4 @@ DIST botocore-1.27.21.tar.gz 9149425 BLAKE2B fa7141f78128ebc4810bf51bcca93a23606
DIST botocore-1.27.22.tar.gz 9151155 BLAKE2B e3aa6e9814e07bca2bd67d16f6548303af71654021b28f13c43b4005ba24a32cfccffa9a145babb781a6cbff9df3eab7de4c18973c00b3861ba83264eb144537 SHA512 57e43577840c62556760ff40d820898b0ee1efeb5da39fbdfe8c7ef53e86c8184bdfed5a52eeb9d0652fa053900462bdad9820b4a34bd4b5231f361b89c710d6
DIST botocore-1.27.23.tar.gz 9161058 BLAKE2B c4e70d4662b45b1365eb3db3f9aa39ef989bb95d962c4b31fecf16b2bc5b14db46cb5aedc7abe23e2fd6484544efa2a894141c1245c842d9c05a89cb560ad0a2 SHA512 80c70c50d5a8fa5f9bdfa5cf0762edd83c8503bf1a65db1b8680e0d9ed8356699ee23ed4db0ab60e34b69cdc5ddc12ff69f2cf3907cf8f8d5075d26a3ba4373f
DIST botocore-1.27.24.tar.gz 9164664 BLAKE2B 3a1453e01dec7b526ac613f5a0b98151e8cc60d524e0dc11d1b1ab82ebd16bdd134190618a4469d44a14a18fe26027a51f04b351e35399ba8f1d81f82ab9a780 SHA512 5778d031e11cf3e441b844c530c0685c1a4fdb5a55f8a45b77c62028cb49852eea4f1dab09af2016a5cfcbab7dcf83cee3143f517034b03d1379be2b85e64585
DIST botocore-1.27.25.tar.gz 9166544 BLAKE2B 276f50dd87aa812cb503be3c0da67affaa664f7deb3dcffc34056d72982840db0b026c16e7d6c0d01aa77adbf649893b69ef8d5bbc7d4dd55fdba43f2cc5ca2b SHA512 833de71bcea3ccf85332530fa82f5b0713eae58bfa132a06d8f8b51315bfcdbac0a9a271d2408fc99751edf9ddb7370d331cd93475d8daf1d938902b8fce59e5

66
dev-python/botocore/botocore-1.27.25.ebuild Normal file
View File

@@ -0,0 +1,66 @@
# 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..11} )
inherit distutils-r1 multiprocessing
DESCRIPTION="Low-level, data-driven core of boto 3"
HOMEPAGE="
https://github.com/boto/botocore/
https://pypi.org/project/botocore/
"
LICENSE="Apache-2.0"
SLOT="0"
if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://github.com/boto/botocore"
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
<dev-python/jmespath-2[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
"
BDEPEND="
test? (
dev-python/jsonschema[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
"
distutils_enable_sphinx docs/source \
'dev-python/guzzle_sphinx_theme'
distutils_enable_tests pytest
src_prepare() {
# unpin deps
sed -i -e "s:>=.*':':" setup.py || die
# unbundle deps
rm -r botocore/vendored || die
find -name '*.py' -exec sed -i \
-e 's:from botocore[.]vendored import:import:' \
-e 's:from botocore[.]vendored[.]:from :' \
{} + || die
distutils-r1_src_prepare
}
python_test() {
local EPYTEST_DESELECT=(
# rely on bundled six
tests/functional/test_six_imports.py::test_no_bare_six_imports
tests/functional/test_six_threading.py::test_six_thread_safety
)
epytest tests/{functional,unit} -n "$(makeopts_jobs)"
}

1
dev-python/debugpy/Manifest
View File

@@ -1,3 +1,4 @@
DIST debugpy-1.5.1.gh.tar.gz 6675322 BLAKE2B a8e3a07d5dbd1b5ca39301e703b279514653606f98743a396693738c9a89403c73a6b6942e5dc368dd89eb8b74277e1808f9247573f330e3a94596c26af7e5be SHA512 93ee526ca7cb3d44b85106a33d8f930f4f2b307eb26ede3ab6b5653de986a101b10f545f5de12cd8ee6ff9e9a12c5e4b57c4c40b1b3003c2f555676bd34482ce
DIST debugpy-1.6.0.gh.tar.gz 6366079 BLAKE2B 134d2adcae6ec926dcdb7161f0874b830a1d0e3c55abb991f4861fa5a58045437ee4f4cb4c9572b902e3e33634bc3f9970ae055985b983d89d0ef1d99561bda8 SHA512 fe245d4ff751a6c2ef0e75a5249f99661b78075ac62c931c20e3ccbc9389d39a08dc2fda44a33eb23a0a76e5ee339edae439b0004d130cdfe421048f3cc83962
DIST debugpy-1.6.1.gh.tar.gz 6684941 BLAKE2B 113ad9670cb9c80a28670be22265e110e5857d7093438db6ea531719de012a66c53ed9914c859c17f3bb5e03b88b11317173d261c9327e5434b5105396fac057 SHA512 28619e8e07265a8d983eccde28cc693b96ca5b94674ab0d512775a9c261f54baaa72e7bb8632b49b3715c2eb3626997cb967b5edb1b53672c6777493f0a46e50
DIST debugpy-1.6.2.gh.tar.gz 6684477 BLAKE2B ab1bdf394d3447ba347db149e5c4c36820df6df24c5d0984fe862419a490cea21b240322d76644bc9ebadbdf9a6d6c8709ae28452828d42b45d65edd2d2e58cb SHA512 64ecd9f8290588358abcff538f2c68025f14efc38ac5b406f32cd40a580aab90e0b2f145de90ca81943872c70969d6294ac51b3151bc4e03f18370ddfbb9ac6c

43
dev-python/debugpy/debugpy-1.6.2.ebuild Normal file
View File

@@ -0,0 +1,43 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..11} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
SRC_URI="
https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
-> ${P}.gh.tar.gz
"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
# This is completely broken
RESTRICT="test"
RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
PATCHES=(
"${FILESDIR}/${PN}-1.6.1-unbundle-pydevd.patch"
)
distutils_enable_tests pytest
python_prepare_all() {
# Drop unnecessary and unrecognized option
# __main__.py: error: unrecognized arguments: -n8
# Do not timeout
sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
# Unbundle dev-python/pydevd
rm -r src/debugpy/_vendored tests/tests/test_vendoring.py || die
distutils-r1_python_prepare_all
}

1
dev-python/weasyprint/Manifest
View File

@@ -1 +1,2 @@
DIST weasyprint-55.0.tar.gz 410970 BLAKE2B ba77f249c3568031eff9b7110864b69113f71ea197d0c7136de01bd40155a437b5e540e87219e6ca49428b98d8ec471dcf9ed1d0224d68a3b320e5fffb568239 SHA512 96cc6de5af86da47aa0b5a84c3f00679690774574f3370ca319afe77f3eb9c9725f3b0a6cbddf589f23f444972bc77b07cce7e27ee2c466484636b3cb30250a3
DIST weasyprint-56.0.tar.gz 419236 BLAKE2B c64d382e4ac169904a51fec17152faacccf4ccdab775a3b34b0db7e0a4306e6cadf6810482cee5535991400455864749cce1fc6ba5e0b469a3eb934d62298028 SHA512 d8efc83f77967a514d26806a9b73ef03e047431c6db9b367cd23a819b4a68714d216081afc74162b60084d0f3755498dc782d0335069bc9e70c42b611b737eec

44
dev-python/weasyprint/weasyprint-56.0.ebuild Normal file
View File

@@ -0,0 +1,44 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
>=dev-python/pydyf-0.2.0[${PYTHON_USEDEP}]
>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
x11-libs/pango
"
BDEPEND="
test? (
<app-text/ghostscript-gpl-9.56
media-fonts/ahem
media-fonts/dejavu
)
"
distutils_enable_tests pytest
src_prepare() {
sed -i -e '/addopts/d' pyproject.toml || die
distutils-r1_src_prepare
}

1
kde-misc/rsibreak/Manifest
View File

@@ -1,2 +1 @@
DIST rsibreak-0.12.14.tar.xz 562176 BLAKE2B 1c0a687c3df8eba116eba64ed502a52ab66f5e77183a31fbb18b8ac3e1bc6ff43e8bb1e50303bcdd78536d415b61730b2dc561c72bc92544dd5855f5a937e317 SHA512 10de87ce892b0320dc6f5115985125c1e1e156022d6d0159dc64721ba2f4dbfdea0f8d2138d450fbfef8c11bedcd564df850cbeb7900dc480c94d44bf15ae997
DIST rsibreak-0.12.15.tar.xz 591600 BLAKE2B 9c3b455c64e5c07d340dc134e3d9f31ae97a1326568b5d4a8837c42a0c6a943de59ff615346b15277db8e491ea013d62024bf899ee76547bf7056dc1b0f94773 SHA512 8178387716b9d611a33ce72070bae1c3d55ad098100a701fcae9f40a8db4bb29eda364a799223a6fea5671e44e0a5a41aa2b6dff2fb50a832221e468c17de87b

46
kde-misc/rsibreak/rsibreak-0.12.14.ebuild
View File

@@ -1,46 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
ECM_HANDBOOK="forceoptional"
KFMIN=5.74.0
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Small utility which bothers you at certain intervals"
HOMEPAGE="https://apps.kde.org/rsibreak/ https://userbase.kde.org/RSIBreak"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
KEYWORDS="amd64 ~arm64 x86"
fi
LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
SLOT="5"
IUSE=""
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kidletime-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/knotifyconfig-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
"
# bug 587170 for frameworkintegration
RDEPEND="${DEPEND}
>=kde-frameworks/frameworkintegration-${KFMIN}:5
"
BDEPEND="sys-devel/gettext"

1
media-gfx/graphviz/Manifest
View File

@@ -1,2 +1,3 @@
DIST graphviz-2.50.0.tar.xz 23031008 BLAKE2B a1789368a77384366bf813466d4a733765ffc0a04660cfcc002c643264780425b449087306b143cfddd70d2feabb67e82b6c04217684aba175824c3e83062085 SHA512 2b035559da20bad35e046bfa1b2c8ce1b395ff9b812f33bcf612d7f7c65ff9a226c9b209553b4283825330683fb925516563943de7922c2f6434baaf3c3b5ee2
DIST graphviz-4.0.0.tar.xz 21494432 BLAKE2B b188feb5c6bad2537f7d404c330c314de38f6f274d72ce84040524d6be209642686161939a210f41e446dc37619266864353f7e1829d172c97e559632ba17971 SHA512 34e3e720152cb6a8f0d266f37ae1f66d432b89f44309f172d7abfcf8eba611a16e41250faa3eac64bf94e5e721a242ad5093ef8905238b61d6ad869b7853b9d2
DIST graphviz-5.0.0.tar.xz 21495572 BLAKE2B b28cbc5a20b202441ed7e98ebbb85b878f9362d1f95816ca89f7aedd62302c77974efc3b63e2ab8b577da59946ca63c7607706da2e79afcae9089f8c2743cd4a SHA512 51576c0d0405aa2005e908b57c3bac5e30069e6efb355b467a35a46559b002b34eaec77c35b6d41c635d6d874351da7261a11cf0f857cea72ff7259d5f6c860d

216
media-gfx/graphviz/graphviz-5.0.0.ebuild Normal file
View File

@@ -0,0 +1,216 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..11} )
inherit python-single-r1
DESCRIPTION="Open Source Graph Visualization Software"
HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
# unfortunately upstream uses an "artifact" store for the pre-generated
# tarball now, which makes predictable URLs impossible.
SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
LICENSE="CPL-1.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
REQUIRED_USE="
!cairo? ( !X !gtk2 !postscript !lasi )
pdf? ( cairo )
python? ( ${PYTHON_REQUIRED_USE} )"
# Requires ksh, tests against installed package, missing files and directory
RESTRICT="test"
RDEPEND="
>=dev-libs/expat-2
>=dev-libs/glib-2.11.1:2
dev-libs/libltdl:0
>=media-libs/fontconfig-2.3.95
>=media-libs/freetype-2.1.10
>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
media-libs/libjpeg-turbo:=
>=media-libs/libpng-1.2:0=
sys-libs/zlib
virtual/libiconv
cairo? (
>=x11-libs/cairo-1.1.10[svg]
>=x11-libs/pango-1.12
)
devil? ( media-libs/devil[png,jpeg] )
gtk2? (
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:2
)
gts? ( sci-libs/gts )
guile? ( dev-scheme/guile )
lasi? ( media-libs/lasi )
pdf? ( app-text/poppler )
perl? ( dev-lang/perl:= )
postscript? ( app-text/ghostscript-gpl )
python? ( ${PYTHON_DEPS} )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
)
ruby? ( dev-lang/ruby:* )
svg? ( gnome-base/librsvg )
tcl? ( >=dev-lang/tcl-8.3:0= )
webp? ( media-libs/libwebp:= )
X? ( x11-libs/libX11 )"
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )"
BDEPEND="
sys-devel/flex
sys-devel/libtool
virtual/pkgconfig
doc? (
app-text/ghostscript-gpl
sys-apps/groff
)
guile? (
dev-lang/swig
dev-scheme/guile
)
nls? ( >=sys-devel/gettext-0.14.5 )
perl? ( dev-lang/swig )
python? ( dev-lang/swig )
ruby? ( dev-lang/swig )
tcl? ( dev-lang/swig )"
# Dependency description / Maintainer-Info:
# Rendering is done via the following plugins (/plugins):
# - core, dot_layout, neato_layout, gd , dot
# the ones which are always compiled in, depend on zlib, gd
# - gtk
# Directly depends on gtk-2.
# needs 'pangocairo' enabled in graphviz configuration
# gtk-2 depends on pango, cairo and libX11 directly.
# - gdk-pixbuf
# Directly depends on gtk-2 and gdk-pixbuf.
# needs 'pangocairo' enabled in graphviz configuration
# - ming
# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
# incomplete.
# - cairo/pango:
# Needs pango for text layout, uses cairo methods to draw stuff
# - xlib:
# needs cairo+pango,
# can make use of gnomeui and inotify support (??? unsure),
# needs libXaw for UI
# UI also links directly against libX11, libXmu, and libXt
# and uses libXpm if available so we make sure it always is
# There can be swig-generated bindings for the following languages (/tclpkg/gv):
# - c-sharp (disabled)
# - scheme (enabled via guile) ... no longer broken on ~x86
# - go (disabled)
# - io (disabled)
# - lua (enabled via lua)
# - ocaml (enabled via ocaml)
# - perl (enabled via perl) *1
# - php (enabled via php) *2
# - python (enabled via python) *1
# - ruby (enabled via ruby) *1
# - tcl (enabled via tcl)
# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
# *2 = Those bindings don't build because the paths for the headers/libs aren't
# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
# There are several other tools in /tclpkg:
# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
# tkspline, tkstubs ; enabled with: --with-tk
# And the commands (/cmd):
# - dot, gvedit, gvpr, smyrna, tools/* :)
# sci-libs/gts can be used for some of these
# - gvedit (via 'qt5'):
# based on ./configure it needs qt-core and qt-gui only
# - smyrna : experimental opengl front-end (via 'smyrna')
# currently disabled -- it segfaults a lot
# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
# with flags enabled at configure time
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_configure() {
local myconf=(
# Speeds up the libltdl configure
--cache-file="${S}"/config.cache
--enable-ltdl
$(use_enable doc man-pdfs)
$(use_with cairo pangocairo)
$(use_with examples demos '$(docdir)/examples')
$(use_with devil)
$(use_with gtk2 gdk)
$(use_with gtk2 gdk-pixbuf)
$(use_with gtk2)
$(use_with gts)
$(use_with qt5 qt)
$(use_with lasi)
$(use_with pdf poppler)
$(use_with postscript ghostscript)
$(use_with svg rsvg)
$(use_with webp)
$(use_with X x)
--with-digcola
--with-fontconfig
--with-freetype2
--with-ipsepcola
--with-libgd
--with-sfdp
--without-ming
# new/experimental features, to be tested, disable for now
--without-ipsepcola
--without-smyrna
--without-visio
# Bindings:
$(use_enable guile)
$(use_enable perl)
$(use_enable python python3)
$(use_enable ruby)
$(use_enable tcl)
--disable-go
--disable-io
--disable-lua
--disable-java
--disable-ocaml
--disable-php
--disable-python
--disable-r
--disable-sharp
# libtool file collision, bug #276609
--without-included-ltdl
--disable-ltdl-install
)
econf "${myconf[@]}"
}
src_install() {
default
find "${ED}" -name '*.la' -delete || die
use python && python_optimize \
"${D}"$(python_get_sitedir) \
"${ED}"/usr/$(get_libdir)/graphviz/python3
}
pkg_postinst() {
# We need to register all plugins before they become usable
dot -c || die
}
pkg_postrm() {
# Remove cruft, bug #547344
rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
}

2
media-libs/opencv/opencv-4.5.5-r2.ebuild
View File

@@ -115,7 +115,7 @@ RDEPEND="
sys-libs/libraw1394[${MULTILIB_USEDEP}]
)
java? ( >=virtual/jre-1.8:* )
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
lapack? (
virtual/cblas

293
media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch Normal file
View File

@@ -0,0 +1,293 @@
https://gitlab.com/mbunkus/mkvtoolnix/-/commit/1e1076e43fe8f38e33246fff3ce8651a93c371d9
https://bugs.gentoo.org/856700
From: Moritz Bunkus <mo@bunkus.online>
Date: Thu, 7 Jul 2022 13:11:34 +0200
Subject: [PATCH] fix compilation with fmt v9.0.0
Prior to v9 all types that were outputtable via `operator<<` to
`std::ostream` could be formatted. v9 changed that to require explicit
tagging of those types that should work this way. This commit adds
those tags for the types that are currently formatted via fmt.
Fixes #3366.
--- a/src/common/aac.h
+++ b/src/common/aac.h
@@ -221,3 +221,7 @@ protected:
using parser_cptr = std::shared_ptr<parser_c>;
} // namespace mtx::aac
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<mtx::aac::header_c> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/common/bcp47.h
+++ b/src/common/bcp47.h
@@ -176,3 +176,8 @@ struct hash<mtx::bcp47::language_c> {
};
} // namespace mtx::bcp47
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<mtx::bcp47::language_c::extension_t> : ostream_formatter {};
+template <> struct fmt::formatter<mtx::bcp47::language_c> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/common/bluray/track_chapter_names.cpp
+++ b/src/common/bluray/track_chapter_names.cpp
@@ -18,6 +18,7 @@
#include "common/bluray/track_chapter_names.h"
#include "common/bluray/util.h"
#include "common/debugging.h"
+#include "common/path.h"
#include "common/qt.h"
#include "common/xml/xml.h"
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -45,3 +45,7 @@ operator <<(std::ostream &out,
}
}
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<mtx::exception> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/common/fourcc.h
+++ b/src/common/fourcc.h
@@ -83,3 +83,7 @@ operator <<(std::ostream &out,
out << fourcc.str();
return out;
}
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<fourcc_c> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/common/kax_analyzer.h
+++ b/src/common/kax_analyzer.h
@@ -239,3 +239,7 @@ public:
virtual void debug_abort_process();
};
using console_kax_analyzer_cptr = std::shared_ptr<console_kax_analyzer_c>;
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<mtx::kax_analyzer_x> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/common/math_fwd.h
+++ b/src/common/math_fwd.h
@@ -18,6 +18,11 @@
using mtx_mp_rational_t = boost::multiprecision::number<boost::multiprecision::backends::gmp_rational, boost::multiprecision::et_off>;
using mtx_mp_int_t = boost::multiprecision::number<boost::multiprecision::backends::gmp_int, boost::multiprecision::et_off>;
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<mtx_mp_rational_t> : ostream_formatter {};
+template <> struct fmt::formatter<mtx_mp_int_t> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
+
namespace mtx {
// This conversion function exists to work around incomplete
--- a/src/common/mm_io_x.h
+++ b/src/common/mm_io_x.h
@@ -155,3 +155,16 @@ operator <<(std::ostream &out,
}
}}
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<mtx::mm_io::exception> : ostream_formatter {};
+template <> struct fmt::formatter<mtx::mm_io::end_of_file_x> : ostream_formatter {};
+template <> struct fmt::formatter<mtx::mm_io::seek_x> : ostream_formatter {};
+template <> struct fmt::formatter<mtx::mm_io::read_write_x> : ostream_formatter {};
+template <> struct fmt::formatter<mtx::mm_io::open_x> : ostream_formatter {};
+template <> struct fmt::formatter<mtx::mm_io::wrong_read_write_access_x>: ostream_formatter {};
+template <> struct fmt::formatter<mtx::mm_io::insufficient_space_x> : ostream_formatter {};
+template <> struct fmt::formatter<mtx::mm_io::create_directory_x> : ostream_formatter {};
+template <> struct fmt::formatter<mtx::mm_io::text::exception> : ostream_formatter {};
+template <> struct fmt::formatter<mtx::mm_io::text::invalid_utf8_char_x>: ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/common/opus.h
+++ b/src/common/opus.h
@@ -91,3 +91,9 @@ operator <<(std::ostream &out,
}
}
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<mtx::opus::decode_error> : ostream_formatter {};
+template <> struct fmt::formatter<mtx::opus::id_header_t> : ostream_formatter {};
+template <> struct fmt::formatter<mtx::opus::toc_t> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/common/path.h
+++ b/src/common/path.h
@@ -36,3 +36,7 @@ std::filesystem::path absolute(std::filesystem::path const &p);
void create_directories(std::filesystem::path const &path, std::error_code &error_code);
} // namespace mtx::fs
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<std::filesystem::path> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/common/qt.h
+++ b/src/common/qt.h
@@ -102,3 +102,7 @@ operator <<(std::wostream &out,
out << string.toStdWString();
return out;
}
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<QString> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/common/strings/formatting.h
+++ b/src/common/strings/formatting.h
@@ -129,3 +129,7 @@ operator <<(std::ostream &out,
out << mtx::string::format_timestamp(timestamp);
return out;
}
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<basic_timestamp_c<int64_t>> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/common/translation.h
+++ b/src/common/translation.h
@@ -80,4 +80,8 @@ operator <<(std::ostream &out,
return out;
}
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<translatable_string_c> : ostream_formatter {};
+#endif
+
void init_locales(std::string locale = "");
--- a/src/input/r_flac.cpp
+++ b/src/input/r_flac.cpp
@@ -240,7 +240,7 @@ flac_reader_c::handle_picture_metadata(FLAC__StreamMetadata const *metadata) {
mxdebug_if(m_debug, fmt::format("flac_reader: MIME type: {0}\n", attachment->mime_type));
mxdebug_if(m_debug, fmt::format("flac_reader: data length: {0}\n", picture.data_length));
mxdebug_if(m_debug, fmt::format("flac_reader: ID: {0}\n", m_attachment_id));
- mxdebug_if(m_debug, fmt::format("flac_reader: mode: {0}\n", attach_mode));
+ mxdebug_if(m_debug, fmt::format("flac_reader: mode: {0}\n", static_cast<unsigned int>(attach_mode)));
if (attachment->mime_type.empty() || attachment->name.empty())
return;
@@ -276,7 +276,7 @@ flac_reader_c::flac_metadata_cb(const FLAC__StreamMetadata *metadata) {
: metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ? "VORBIS COMMENT"
: metadata->type == FLAC__METADATA_TYPE_CUESHEET ? "CUESHEET"
: "UNDEFINED",
- metadata->type, metadata->length));
+ static_cast<unsigned int>(metadata->type), metadata->length));
break;
}
}
--- a/src/input/r_flv.h
+++ b/src/input/r_flv.h
@@ -173,3 +173,8 @@ protected:
unsigned int add_track(char type);
};
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<flv_header_t> : ostream_formatter {};
+template <> struct fmt::formatter<flv_tag_c> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/input/r_mpeg_ps.h
+++ b/src/input/r_mpeg_ps.h
@@ -244,3 +244,8 @@ private:
void sort_tracks();
void calculate_global_timestamp_offset();
};
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<mpeg_ps_id_t> : ostream_formatter {};
+template <> struct fmt::formatter<mpeg_ps_packet_c> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/input/r_ogm_flac.cpp
+++ b/src/input/r_ogm_flac.cpp
@@ -104,7 +104,7 @@ fhe_metadata_cb(const FLAC__StreamDecoder *,
: metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ? "VORBIS COMMENT"
: metadata->type == FLAC__METADATA_TYPE_CUESHEET ? "CUESHEET"
: "UNDEFINED",
- metadata->type, metadata->length));
+ static_cast<unsigned int>(metadata->type), metadata->length));
break;
}
}
--- a/src/input/r_qtmp4.h
+++ b/src/input/r_qtmp4.h
@@ -590,3 +590,7 @@ protected:
virtual void process_atom(qt_atom_t const &parent, int level, std::function<void(qt_atom_t const &)> const &handler);
};
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<qt_atom_t> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/merge/item_selector.h
+++ b/src/merge/item_selector.h
@@ -139,3 +139,7 @@ operator <<(std::ostream &out,
return out;
}
+
+#if FMT_VERSION >= 90000
+template <typename T> struct fmt::formatter<item_selector_c<T>> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/propedit/attachment_target.cpp
+++ b/src/propedit/attachment_target.cpp
@@ -83,14 +83,14 @@ attachment_target_c::dump_info()
" selector_num_arg: {6}\n"
" selector_string_arg: {7}\n",
m_file_name,
- m_command,
+ static_cast<unsigned int>(m_command),
ac_add == m_command ? "add"
: ac_delete == m_command ? "delete"
: ac_replace == m_command ? "replace"
: ac_update == m_command ? "update"
: "unknown",
m_options,
- m_selector_type,
+ static_cast<unsigned int>(m_selector_type),
st_id == m_selector_type ? "ID"
: st_uid == m_selector_type ? "UID"
: st_name == m_selector_type ? "name"
--- a/src/propedit/attachment_target.h
+++ b/src/propedit/attachment_target.h
@@ -130,3 +130,7 @@ operator <<(std::ostream &out,
return out;
}
+
+#if FMT_VERSION >= 90000
+template <> struct fmt::formatter<attachment_target_c::options_t> : ostream_formatter {};
+#endif // FMT_VERSION >= 90000
--- a/src/propedit/tag_target.cpp
+++ b/src/propedit/tag_target.cpp
@@ -104,10 +104,10 @@ tag_target_c::dump_info()
" selection_track_type: {3}\n"
" track_uid: {4}\n"
" file_name: {5}\n",
- static_cast<int>(m_operation_mode),
- static_cast<int>(m_selection_mode),
+ static_cast<unsigned int>(m_operation_mode),
+ static_cast<unsigned int>(m_selection_mode),
m_selection_param,
- m_selection_track_type,
+ static_cast<unsigned int>(m_selection_track_type),
m_track_uid,
m_file_name));
--- a/src/propedit/track_target.cpp
+++ b/src/propedit/track_target.cpp
@@ -78,9 +78,9 @@ track_target_c::dump_info()
" selection_track_type: {2}\n"
" track_uid: {3}\n"
" file_name: {4}\n",
- static_cast<int>(m_selection_mode),
+ static_cast<unsigned int>(m_selection_mode),
m_selection_param,
- m_selection_track_type,
+ static_cast<unsigned int>(m_selection_track_type),
m_track_uid,
m_file_name));
GitLab

3
media-video/mkvtoolnix/mkvtoolnix-68.0.0.ebuild → media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild
View File

@@ -29,7 +29,6 @@ RDEPEND="
dev-libs/gmp:=
>=dev-libs/libebml-1.4.2:=
>=dev-libs/libfmt-8.0.1:=
<dev-libs/libfmt-9.0.0:=
>=dev-libs/pugixml-1.11:=
media-libs/flac:=
>=media-libs/libmatroska-1.6.3:=
@@ -38,6 +37,7 @@ RDEPEND="
sys-libs/zlib
dvd? ( media-libs/libdvdread:= )
dev-qt/qtcore:5
dev-qt/qtsvg:5
gui? (
dev-qt/qtgui:5
dev-qt/qtnetwork:5
@@ -67,6 +67,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
"${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
"${FILESDIR}"/${P}-fmt-9.patch
)
src_prepare() {

1
media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
View File

@@ -37,6 +37,7 @@ RDEPEND="
sys-libs/zlib
dvd? ( media-libs/libdvdread:= )
dev-qt/qtcore:5
dev-qt/qtsvg:5
gui? (
dev-qt/qtgui:5
dev-qt/qtnetwork:5

4
profiles/prefix/darwin/macos/package.mask
View File

@@ -4,5 +4,5 @@
# Fabian Groffen <grobian@gentoo.org> (2022-06-14)
# timer_create build-failure, corrected upstream in 5067
# https://github.com/vim/vim/commit/f78b52ba24d8d294869cd013dcc4cd5d4a65cea7
=app-editors/vim-8.2.5066
=app-editors/vim-core-8.2.5066
~app-editors/vim-8.2.5066
~app-editors/vim-core-8.2.5066

2
sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.52.ebuild
View File

@@ -35,7 +35,7 @@ SRC_URI+="
S=${WORKDIR}
LICENSE="GPL-2"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
RDEPEND="
!sys-kernel/gentoo-kernel:${SLOT}

2
sys-kernel/gentoo-kernel/gentoo-kernel-5.15.52.ebuild
View File

@@ -39,7 +39,7 @@ SRC_URI+="
S=${WORKDIR}/${MY_P}
LICENSE="GPL-2"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
IUSE="debug hardened"
REQUIRED_USE="arm? ( savedconfig )"

2
virtual/dist-kernel/dist-kernel-5.15.52.ebuild
View File

@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE=""
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
RDEPEND="
|| (