From 5d0270aaf228fe067d2226de9888908bb23e6a09 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Mon, 3 Jun 2024 02:31:46 +0200 Subject: [PATCH 01/40] net-misc/FORT-validator: declare read-only parameter's type as const Fixes build failure due to -Wincompatible-pointer-types Closes: https://bugs.gentoo.org/928331 Signed-off-by: Lucio Sauer --- ....ebuild => FORT-validator-1.5.4-r1.ebuild} | 4 ++- ....ebuild => FORT-validator-1.6.1-r1.ebuild} | 4 ++- ....ebuild => FORT-validator-1.6.2-r1.ebuild} | 4 ++- .../files/FORT-validator-1.5.4-GCC14.patch | 28 +++++++++++++++++++ 4 files changed, 37 insertions(+), 3 deletions(-) rename net-misc/FORT-validator/{FORT-validator-1.5.4.ebuild => FORT-validator-1.5.4-r1.ebuild} (95%) rename net-misc/FORT-validator/{FORT-validator-1.6.1.ebuild => FORT-validator-1.6.1-r1.ebuild} (94%) rename net-misc/FORT-validator/{FORT-validator-1.6.2.ebuild => FORT-validator-1.6.2-r1.ebuild} (94%) create mode 100644 net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch diff --git a/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild similarity index 95% rename from net-misc/FORT-validator/FORT-validator-1.5.4.ebuild rename to net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild index 3d59fe3055..b6df06436f 100644 --- a/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,6 +18,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="caps" +PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch + DEPEND=" acct-group/fort acct-user/fort diff --git a/net-misc/FORT-validator/FORT-validator-1.6.1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild similarity index 94% rename from net-misc/FORT-validator/FORT-validator-1.6.1.ebuild rename to net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild index c4ee310edc..1eb18db5be 100644 --- a/net-misc/FORT-validator/FORT-validator-1.6.1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,6 +18,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="caps" +PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch + DEPEND=" acct-group/fort acct-user/fort diff --git a/net-misc/FORT-validator/FORT-validator-1.6.2.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild similarity index 94% rename from net-misc/FORT-validator/FORT-validator-1.6.2.ebuild rename to net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild index 89351a5ade..7e33ba2380 100644 --- a/net-misc/FORT-validator/FORT-validator-1.6.2.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,6 +16,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="caps" +PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch + DEPEND=" acct-group/fort acct-user/fort diff --git a/net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch b/net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch new file mode 100644 index 0000000000..7a417fd242 --- /dev/null +++ b/net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch @@ -0,0 +1,28 @@ +https://github.com/NICMx/FORT-validator/pull/137 + +Since we don't manipulate any struct members, I believe we can safely take a +const xmlError * argument instead, as per libxml2's documentation . + +I also believe we can drop the string-termination handling, because C strings +end with \0 and therefore ptr[strlen(ptr)-1] is always \0. + +Author: Lucio Sauer +--- a/src/xml/relax_ng.c ++++ b/src/xml/relax_ng.c +@@ -36,14 +36,9 @@ relax_ng_log_warn(void *ctx, const char *msg, ...) + } + + static void +-relax_ng_log_str_err(void *userData, xmlErrorPtr error) ++relax_ng_log_str_err(void *userData, const xmlError *error) + { +- char *ptr; +- +- ptr = error->message; +- if (ptr[strlen(ptr) - 1] == '\n') +- ptr[strlen(ptr) - 1] = '\0'; +- pr_val_err("%s (at line %d)", ptr, error->line); ++ pr_val_err("%s (at line %d)", error->message, error->line); + } + + /* Initialize global schema to parse RRDP files */ From 5abf0352fd409cdd1062292850243d6b8e1833f8 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Mon, 3 Jun 2024 02:51:19 +0200 Subject: [PATCH 02/40] net-misc/FORT-validator: fix build-time deps New test-dep also enables tests. Remove deps that we inherit inherit from the autotools eclass. Remove deps that we inherit from the system set. Signed-off-by: Lucio Sauer --- .../FORT-validator/FORT-validator-1.5.4-r1.ebuild | 12 +++++------- .../FORT-validator/FORT-validator-1.6.1-r1.ebuild | 10 ++++++---- .../FORT-validator/FORT-validator-1.6.2-r1.ebuild | 10 ++++++---- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild index b6df06436f..0b4f4d9cbf 100644 --- a/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild @@ -16,7 +16,8 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="caps" +IUSE="caps test" +RESTRICT="!test? ( test )" PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch @@ -27,13 +28,10 @@ DEPEND=" dev-libs/jansson dev-libs/openssl " -RDEPEND=" - ${DEPEND} - net-misc/rsync -" +RDEPEND="${DEPEND}" BDEPEND=" - dev-build/automake - dev-build/automake + virtual/pkgconfig + test? ( dev-libs/check ) " src_prepare() { diff --git a/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild index 1eb18db5be..192cce1c9f 100644 --- a/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild @@ -16,7 +16,8 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="caps" +IUSE="caps test" +RESTRICT="!test? ( test )" PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch @@ -29,9 +30,10 @@ DEPEND=" dev-libs/openssl net-misc/curl " -RDEPEND=" - ${DEPEND} - net-misc/rsync +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) " src_prepare() { diff --git a/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild index 7e33ba2380..b5735861eb 100644 --- a/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild @@ -14,7 +14,8 @@ SRC_URI="https://github.com/NICMx/${PN}/releases/download/${PV}/fort-${PV}.tar.g LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="caps" +IUSE="caps test" +RESTRICT="!test? ( test )" PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch @@ -27,9 +28,10 @@ DEPEND=" dev-libs/openssl[rfc3779] net-misc/curl " -RDEPEND=" - ${DEPEND} - net-misc/rsync +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) " S="${WORKDIR}/${MY_PN}-${PV}" From 5d8e3eb9012d1e57e75256471cd4a2bf823729af Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Mon, 3 Jun 2024 02:54:32 +0200 Subject: [PATCH 03/40] net-misc/FORT-validator: Fix DESTDIR to work with Makefile's "prefix" Default src_configure runs with --prefix="${EPREFIX}"/usr, so we shouldn't specify ${EPREFIX} in DESTDIR. Signed-off-by: Lucio Sauer --- net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild | 2 +- net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild | 2 +- net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild index 0b4f4d9cbf..b24747b385 100644 --- a/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild @@ -49,7 +49,7 @@ src_install() { newinitd "${FILESDIR}/${MY_PN}-1.5-initd" ${MY_PN} newconfd "${FILESDIR}/${MY_PN}-1.5-confd" ${MY_PN} - emake DESTDIR="${ED}" install + emake DESTDIR="${D}" install insinto /usr/share/${MY_PN}/ insopts -m0644 -o "${MY_PN}" diropts -m0755 -o "${MY_PN}" diff --git a/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild index 192cce1c9f..c8938f818d 100644 --- a/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild @@ -49,7 +49,7 @@ src_install() { newinitd "${FILESDIR}/${MY_PN}-1.5-initd" ${MY_PN} newconfd "${FILESDIR}/${MY_PN}-1.5-confd" ${MY_PN} - emake DESTDIR="${ED}" install + emake DESTDIR="${D}" install insinto /usr/share/${MY_PN}/ insopts -m0644 -o "${MY_PN}" diropts -m0755 -o "${MY_PN}" diff --git a/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild index b5735861eb..2d18fb5468 100644 --- a/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild @@ -49,7 +49,7 @@ src_install() { newinitd "${FILESDIR}/${MY_PN}-1.5-initd" ${MY_PN} newconfd "${FILESDIR}/${MY_PN}-1.5-confd" ${MY_PN} - emake DESTDIR="${ED}" install + emake DESTDIR="${D}" install insinto /usr/share/${MY_PN}/ insopts -m0644 -o "${MY_PN}" diropts -m0755 -o "${MY_PN}" From caa82c8f37701de4e8e312a099f866df71cbc092 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Mon, 3 Jun 2024 03:13:53 +0200 Subject: [PATCH 04/40] net-misc/FORT-validator/files: drop unused files from FILESDIR Signed-off-by: Lucio Sauer --- .../FORT-validator-skip-online-test.patch | 29 --------------- net-misc/FORT-validator/files/fort-1.4-confd | 15 -------- net-misc/FORT-validator/files/fort-1.4-initd | 26 -------------- .../FORT-validator/files/fort-1.4.service | 35 ------------------- 4 files changed, 105 deletions(-) delete mode 100644 net-misc/FORT-validator/files/FORT-validator-skip-online-test.patch delete mode 100644 net-misc/FORT-validator/files/fort-1.4-confd delete mode 100644 net-misc/FORT-validator/files/fort-1.4-initd delete mode 100644 net-misc/FORT-validator/files/fort-1.4.service diff --git a/net-misc/FORT-validator/files/FORT-validator-skip-online-test.patch b/net-misc/FORT-validator/files/FORT-validator-skip-online-test.patch deleted file mode 100644 index 91cbe23cec..0000000000 --- a/net-misc/FORT-validator/files/FORT-validator-skip-online-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/test/http_test.c b/test/http_test.c -index 765b722..c904440 100644 ---- a/test/http_test.c -+++ b/test/http_test.c -@@ -57,23 +57,7 @@ local_download(char const *url, long *response_code, struct response *resp) - - START_TEST(http_fetch_normal) - { -- struct response resp; -- long response_code; -- char const *url = "https://rrdp.ripe.net/notification.xml"; -- -- init_response(&resp); -- response_code = 0; -- -- ck_assert_int_eq(http_init(), 0); -- ck_assert_int_eq(local_download(url, &response_code, &resp), 0); -- ck_assert_int_gt(resp.size, 0); -- -- http_cleanup(); -- free(resp.content); -- if (response_code == 0) -- ck_abort_msg("NO response code received"); -- else if (response_code >= HTTP_BAD_REQUEST) -- ck_abort_msg("Received response code %ld", response_code); -+ - } - END_TEST - diff --git a/net-misc/FORT-validator/files/fort-1.4-confd b/net-misc/FORT-validator/files/fort-1.4-confd deleted file mode 100644 index 92936757c3..0000000000 --- a/net-misc/FORT-validator/files/fort-1.4-confd +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/init.d/fort - -# Options to pass to the fort process -# See man fort for options - -# If you want to use commands arguments instead of the configuration file and -# not the default TAL directory, please remove the comment for FORT_BASEDIR as -# well - -#FORT_BASEDIR="/var/lib/fort/" -#FORT_OPTS="--tal /usr/share/fort/tal/ \ -# --local-repository ${FORT_BASEDIR} -# --log.output syslog -# --server.address ::" -FORT_OPTS="--configuration-file /etc/fort/config.json" diff --git a/net-misc/FORT-validator/files/fort-1.4-initd b/net-misc/FORT-validator/files/fort-1.4-initd deleted file mode 100644 index 9a7e54a2bd..0000000000 --- a/net-misc/FORT-validator/files/fort-1.4-initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -name="fort validator daemon" -description="FORT validator is an open source RPKI validator." -command=/usr/bin/fort -command_args="${FORT_OPTS}" -command_user="fort" -pidfile="/run/${RC_SVCNAME}.pid" -command_background=true - -depend() { - need net -} - -start_pre() { - if [ -z "${FORT_BASEDIR}" ]; then - FORT_BASEDIR=$(awk -F '"' '/local-repository/ { print $4 }' \ - /etc/fort/config.json) - FORT_BASEDIR="${FORT_BASEDIR:-/var/cache/fort/repository/}" - fi - - checkpath -d -m 0755 -o fort:fort "$(dirname "${FORT_BASEDIR}")" - checkpath -d -m 0755 -o fort:fort "${FORT_BASEDIR}" -} diff --git a/net-misc/FORT-validator/files/fort-1.4.service b/net-misc/FORT-validator/files/fort-1.4.service deleted file mode 100644 index 4f24f8d126..0000000000 --- a/net-misc/FORT-validator/files/fort-1.4.service +++ /dev/null @@ -1,35 +0,0 @@ -[Unit] -Description=FORT RPKI validator -Documentation=man:fort(8) -Documentation=https://nicmx.github.io/FORT-validator/ - -[Service] -ExecStart=/usr/bin/fort --configuration-file /etc/fort/config.json -Type=simple -User=fort -AmbientCapabilities=CAP_NET_BIND_SERVICE -CapabilityBoundingSet=CAP_NET_BIND_SERVICE -ProtectSystem=strict -ProtectHome=yes -PrivateDevices=yes -PrivateTmp=yes -ProtectKernelTunables=yes -ProtectControlGroups=yes -ProtectKernelModules=yes -CacheDirectory=fort -ReadWritePaths=/var/lib/fort/ -ConfigurationDirectory=fort -ConfigurationDirectory=tals -StateDirectory=fort -NoNewPrivileges=yes -RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 -RestrictNamespaces=yes -RestrictRealtime=yes -LockPersonality=yes -MemoryDenyWriteExecute=yes -SystemCallArchitectures=native -SystemCallErrorNumber=EPERM -SystemCallFilter=@system-service - -[Install] -WantedBy=multi-user.target From 1bacbed01bffe46cb1351545228d3c789511b840 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Mon, 3 Jun 2024 03:14:33 +0200 Subject: [PATCH 05/40] net-misc/FORT-validator: fix variable order Signed-off-by: Lucio Sauer --- net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild index 2d18fb5468..c7d69b4de4 100644 --- a/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild @@ -11,6 +11,8 @@ DESCRIPTION="FORT validator is an open source RPKI validator" HOMEPAGE="https://fortproject.net/validator?2" SRC_URI="https://github.com/NICMx/${PN}/releases/download/${PV}/fort-${PV}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -34,8 +36,6 @@ BDEPEND=" test? ( dev-libs/check ) " -S="${WORKDIR}/${MY_PN}-${PV}" - src_prepare() { default # Don't strip CFLAGS From 41a53b182be1adb646e9f9d08b1256722071ebbb Mon Sep 17 00:00:00 2001 From: kernaltrap8 Date: Sun, 2 Jun 2024 22:06:24 -0500 Subject: [PATCH 06/40] net-proxy/ngrok-bin-3.10.0: update SRC_URI manifests Signed-off-by: kernaltrap8 --- net-proxy/ngrok-bin/Manifest | 8 +------- ...ok-bin-3.0.0.ebuild => ngrok-bin-3.10.0.ebuild} | 14 +++++++------- 2 files changed, 8 insertions(+), 14 deletions(-) rename net-proxy/ngrok-bin/{ngrok-bin-3.0.0.ebuild => ngrok-bin-3.10.0.ebuild} (80%) diff --git a/net-proxy/ngrok-bin/Manifest b/net-proxy/ngrok-bin/Manifest index 21a3edd650..e7c95ef859 100644 --- a/net-proxy/ngrok-bin/Manifest +++ b/net-proxy/ngrok-bin/Manifest @@ -1,7 +1 @@ -DIST ngrok-v3-stable-linux-386.tgz 8175989 BLAKE2B 72d36693552e290d4b3261df0c48a76e76f3ae944eea280f888fe33dda36e05d3d8d6a162c35a2b0a94417133328c47f2de5d992fbd1ef6bea15d12026396244 SHA512 0ebb8b8b67bb5f0210fb0427c50a5d9847e5eb4521f8987498ec42729fd31d5865bddc42936b57668787b4b2d5cfad9e45ee4283b88b2a51b8711baa4573aa09 -DIST ngrok-v3-stable-linux-amd64.tgz 8659626 BLAKE2B ca3e031f485460169a880938a1d063f90365a74c076f9720bbee7b1f435a643fa96e07b7c3fdc45e016d81e52c26b53c1a41928d0591d7371b4648f663adbd3e SHA512 22a73696a536d3f1d03392c115a5c7b41d3541be23fa85b064b6ea8d5dc2a861dbc6ea80859fb8bd9c0bc89c47f08a5715c8f6c93b0d8887a84203f307f46d8d -DIST ngrok-v3-stable-linux-arm.tgz 8321472 BLAKE2B 06282cdf504a5eb639a0c4d0dd22725806e482fe7fbb4c4d83dae79fd480076ca423331eade6a64c9ea56b06c88b14d8dcd7361ad53dbeff87991e12bd6a2e6b SHA512 fda874a93799f9caf0b14379d9006069d3ec445d708609307c8d8a70aedb080efc5ddd9f7626e77ad5ae42b4c305eb6071d5404353c1b352a44499c9f4b1ec40 -DIST ngrok-v3-stable-linux-arm64.tgz 8046642 BLAKE2B d848f2495061842dac916b00a331db86864d0a490a31a40c3081336ec02c433304d4c8cd5f92ab2be8961d6d9b76a6a07e2418b9d089d497cfb6880a21904717 SHA512 a205920d68847e9e521f42981231e0de90692020ebac535d86beb0e64bb3dfd7df0218386bdca5330d90a2974797134c1053bb478dae12e656d08289719f70eb -DIST ngrok-v3-stable-linux-mips.tgz 7605022 BLAKE2B 13c119210e4d0d50ff8d44f9fd21590ab2664425a9d412985b637ab4d4d495df73788d7b9a35c037ddd3e37ef9b55f3cbf92442d37515e332dc5708d43e24203 SHA512 80e3207500829be61d3a714a6e5b44b5cdbb5667f38b19c8f884a60cd8e1140b1a799ec32b50b9d2f3978929d9bad1d72e4c3fe6fdf78e31f02322503a5a9424 -DIST ngrok-v3-stable-linux-ppc64.tgz 7802935 BLAKE2B ec9f091c05401316210fbb8d2ee16e8f839bd62383a5350ec6c0182880b0c600ca21da981947558e256423fdf7b076c271dfa320e214579a18ccd781114439df SHA512 8027d31e53905d98405f41762dcfaa9b8caa1a0b61df353a3f86a8a3e29f930c058d7c74f141d67d5dbf8d99e69c91685e7bda036e5afdd3cfabcb05d21c326b -DIST ngrok-v3-stable-linux-s390x.tgz 8385976 BLAKE2B 017b74f4f5e7239c012c9f2895670bf1b36ed15b4ccd59fa1c0bab15acd7951bdb927a86f10bb5b5801d171a317846ec92941ab3a2d797a8d6961b2ee540ff26 SHA512 55b591d279929fabcd64fd0d35dd75d19202b7a81729dc952bef65b57a94c554c6b7b14487dec8fdd65544b7a17a15254839a5ee76fddb88a3e826f3a367ab6a +DIST ngrok-bin-3.10.0.tgz 8965855 BLAKE2B 172905f9f92ede31c7e139728b2bffb83c09a7a3610997062b634811ac81edc95abefcd78fb02410878b6b76a9eba6f87645a127427fe0cdc33de24754b71b28 SHA512 5e2a4ba092914d1ce745f22c401243d0d13dbe0026c15aa4b46d9281b0bc590421883cb7fa30b11cd4c822b448295f45ee2ac8dc8ef56586fd8bf63ccaa6b1a7 diff --git a/net-proxy/ngrok-bin/ngrok-bin-3.0.0.ebuild b/net-proxy/ngrok-bin/ngrok-bin-3.10.0.ebuild similarity index 80% rename from net-proxy/ngrok-bin/ngrok-bin-3.0.0.ebuild rename to net-proxy/ngrok-bin/ngrok-bin-3.10.0.ebuild index beeb9e381c..e69b2e910e 100644 --- a/net-proxy/ngrok-bin/ngrok-bin-3.0.0.ebuild +++ b/net-proxy/ngrok-bin/ngrok-bin-3.10.0.ebuild @@ -7,13 +7,13 @@ DESCRIPTION="ngrok is a reverse proxy, firewall, and API gateway" HOMEPAGE="https://ngrok.org" # Each supported arch should get their own bins SRC_URI=" - amd64? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz ) - arm? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-arm.tgz ) - arm64? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-arm64.tgz ) - mips? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-mips.tgz ) - ppc64? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-ppc64.tgz ) - s390? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-s390x.tgz ) - x86? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-386.tgz ) + amd64? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz -> ${P}.tgz ) + arm? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-arm.tgz -> ${P}.tgz ) + arm64? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-arm64.tgz -> ${P}.tgz ) + mips? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-mips.tgz -> ${P}.tgz ) + ppc64? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-ppc64.tgz -> ${P}.tgz ) + s390? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-s390x.tgz -> ${P}.tgz ) + x86? ( https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-386.tgz -> ${P}.tgz ) " S="${WORKDIR}/" From 4eba2c2785e6957deae55e8767c9c7392a0ba144 Mon Sep 17 00:00:00 2001 From: Kostadin Shishmanov Date: Mon, 3 Jun 2024 10:19:59 +0300 Subject: [PATCH 07/40] app-misc/kmon: suppress QA warnings about {C,LD}FLAGS Closes: https://bugs.gentoo.org/933455 Closes: https://bugs.gentoo.org/933456 Signed-off-by: Kostadin Shishmanov --- app-misc/kmon/kmon-1.6.5.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/app-misc/kmon/kmon-1.6.5.ebuild b/app-misc/kmon/kmon-1.6.5.ebuild index 6eb2f1cfd1..6d8e7c523a 100644 --- a/app-misc/kmon/kmon-1.6.5.ebuild +++ b/app-misc/kmon/kmon-1.6.5.ebuild @@ -133,3 +133,4 @@ LICENSE="GPL-3" LICENSE+=" Apache-2.0 Boost-1.0 ISC MIT Unicode-DFS-2016" SLOT="0" KEYWORDS="~amd64" +QA_FLAGS_IGNORED="usr/bin/kmon" From eb3051c2bbbc8f722ddaebc1e72ec53dfe70ccbd Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Mon, 3 Jun 2024 19:33:26 +0900 Subject: [PATCH 08/40] net-misc/megasync: add missing dependency Closes: https://bugs.gentoo.org/933082 Signed-off-by: Takuya Wakazono --- .../{megasync-5.2.1.0.ebuild => megasync-5.2.1.0-r1.ebuild} | 1 + net-misc/megasync/megasync-9999.ebuild | 1 + 2 files changed, 2 insertions(+) rename net-misc/megasync/{megasync-5.2.1.0.ebuild => megasync-5.2.1.0-r1.ebuild} (99%) diff --git a/net-misc/megasync/megasync-5.2.1.0.ebuild b/net-misc/megasync/megasync-5.2.1.0-r1.ebuild similarity index 99% rename from net-misc/megasync/megasync-5.2.1.0.ebuild rename to net-misc/megasync/megasync-5.2.1.0-r1.ebuild index 5c874d29c7..f9b4f301f7 100644 --- a/net-misc/megasync/megasync-5.2.1.0.ebuild +++ b/net-misc/megasync/megasync-5.2.1.0-r1.ebuild @@ -50,6 +50,7 @@ DEPEND=" dev-qt/qtx11extras:5 media-libs/libmediainfo media-libs/libraw + media-libs/libzen net-dns/c-ares:= net-misc/curl[ssl,curl_ssl_openssl(-)] sys-libs/zlib diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild index 5c874d29c7..f9b4f301f7 100644 --- a/net-misc/megasync/megasync-9999.ebuild +++ b/net-misc/megasync/megasync-9999.ebuild @@ -50,6 +50,7 @@ DEPEND=" dev-qt/qtx11extras:5 media-libs/libmediainfo media-libs/libraw + media-libs/libzen net-dns/c-ares:= net-misc/curl[ssl,curl_ssl_openssl(-)] sys-libs/zlib From 5331bf76cbb8a2fd863da0227f41f800dd4692ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?= Date: Sun, 2 Jun 2024 23:14:59 +0100 Subject: [PATCH 09/40] games-util/mangohud: add 0.7.2 ,drop 0.7.1-r6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * possible to compile with older spdlog but it requires revision bump after spdlog bump, preventing future break 9999 Closes: https://bugs.gentoo.org/931794 Signed-off-by: Gonçalo Negrier Duarte --- games-util/mangohud/Manifest | 2 +- .../{mangohud-0.7.1-r6.ebuild => mangohud-0.7.2.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename games-util/mangohud/{mangohud-0.7.1-r6.ebuild => mangohud-0.7.2.ebuild} (100%) diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest index 500e807d71..bbdc3e84b9 100644 --- a/games-util/mangohud/Manifest +++ b/games-util/mangohud/Manifest @@ -1,3 +1,3 @@ -DIST mangohud-0.7.1.tar.gz 14901139 BLAKE2B 722b1caa21225a15d175e0f83dbb4b4a6ac2be92443628dcfe82fe4e36773174121f95deaf078fae9ed25ea74242f5f9acd3e2a4e94111b4a32fbc7c9a852705 SHA512 981b20f0ca986a8e0ee5349dc3d9a5580c1e3eb0a40a1a0e81c390f85d25e3f175fdcca75cd2f18bf0af9f49c7d144de6d85406b6a3c96bdf204a7557f530300 +DIST mangohud-0.7.2.tar.gz 14906751 BLAKE2B a88e6497d8a8bcd899fc41d555dec429a69c864a10476c1d549acead58a7fc7c5f5d14d901b75bd2aed1d8c8088a027417a74480b89501d947333d665d0567c0 SHA512 edc3e380f9f58b65ae04c970e84eec9ff3458eafb2d89b2208c0afa6978a745a634aab6b0e025996175981e80c66475ef92ffe326d31a67055895b8fd1213e63 DIST vulkan-headers-1.2.158-2-meson-wrap.zip 1107 BLAKE2B 35e4bb1f7410a009243fe7d4a4ba6cede7f01e0b56ad6ff72ad30c00c2452bd6d2a4fb44ab92c296147e2506a92acc6de1f817cb5433b96d66652cbcd8885595 SHA512 30cbbb90580399839e1bba8881b9b8cc33fdeead93f37d5f3398c9d53fb3ab050ca2562fd68f376fa4ee0825ee3787f560d70d55a170c780dd575ff2eeb66efd DIST vulkan-headers-1.2.158.tar.gz 831647 BLAKE2B 792d7e895e27c4a8fbc93fc4d9c9e696d2ceb946e745709c050c0693b77afbeb6411a4267fc59508ddeb58167d469349fedc1c5d4b4a7415b590c97248b244bc SHA512 f7aa9222f9deb1316d22deacc2c6cd85c409f0f2b2d37ecd55e0fc8466d381bbe3bed287881b993a01c5f33736e1607014f820980b7a54a3721fab6980960c91 diff --git a/games-util/mangohud/mangohud-0.7.1-r6.ebuild b/games-util/mangohud/mangohud-0.7.2.ebuild similarity index 100% rename from games-util/mangohud/mangohud-0.7.1-r6.ebuild rename to games-util/mangohud/mangohud-0.7.2.ebuild From d38b1ad7fccabb3b3b22c649817a655098c35561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?= Date: Mon, 3 Jun 2024 11:39:31 +0100 Subject: [PATCH 10/40] media-libs/imgui: improve meson build system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gonçalo Negrier Duarte --- media-libs/imgui/files/imgui-meson.build | 73 +++++++++++-------- .../imgui/files/imgui-meson_options.txt | 4 +- ....89.9-r1.ebuild => imgui-1.89.9-r2.ebuild} | 8 +- media-libs/imgui/imgui-1.90.7.ebuild | 68 ----------------- media-libs/imgui/metadata.xml | 4 +- 5 files changed, 55 insertions(+), 102 deletions(-) rename media-libs/imgui/{imgui-1.89.9-r1.ebuild => imgui-1.89.9-r2.ebuild} (87%) delete mode 100644 media-libs/imgui/imgui-1.90.7.ebuild diff --git a/media-libs/imgui/files/imgui-meson.build b/media-libs/imgui/files/imgui-meson.build index cb27420aab..2cdbad9605 100644 --- a/media-libs/imgui/files/imgui-meson.build +++ b/media-libs/imgui/files/imgui-meson.build @@ -20,6 +20,8 @@ sources = files( 'imgui_widgets.cpp', ) +headers = files() + cpp = meson.get_compiler('cpp') dependencies = [] @@ -29,46 +31,66 @@ dx9_dep = cpp.find_library('d3d9', required: get_option('dx9')) if dx9_dep.found() sources += 'backends/imgui_impl_dx9.cpp' dependencies += dx9_dep + headers += files('backends/imgui_impl_dx9.h') endif dx10_dep = cpp.find_library('d3d10', required: get_option('dx10')) if dx10_dep.found() sources += 'backends/imgui_impl_dx10.cpp' dependencies += dx10_dep + headers += files('backends/imgui_impl_dx10.h') endif dx11_dep = cpp.find_library('d3d11', required: get_option('dx11')) if dx11_dep.found() sources += 'backends/imgui_impl_dx11.cpp' dependencies += dx11_dep + headers += files('backends/imgui_impl_dx11.h') endif dx12_dep = cpp.find_library('d3d12', required: get_option('dx12')) # MinGW does not work. See https://github.com/ocornut/imgui/pull/4604 if dx12_dep.found() and cpp.get_argument_syntax() == 'msvc' sources += 'backends/imgui_impl_dx12.cpp' dependencies += dx12_dep + headers += files('backends/imgui_impl_dx12.h') endif metal_dep = dependency('appleframeworks', modules: ['Foundation', 'AppKit', 'GameController', 'Metal'], required: get_option('metal')) if metal_dep.found() sources += 'backends/imgui_impl_metal.mm' dependencies += metal_dep + headers += files('backends/imgui_impl_metal.h') endif libgl_dep = dependency('gl', required: get_option('opengl')) +opengl_src = files( + 'backends/imgui_impl_opengl2.cpp', + 'backends/imgui_impl_opengl3.cpp') if libgl_dep.found() - sources += 'backends/imgui_impl_opengl3.cpp' + sources += opengl_src dependencies += libgl_dep dependencies += cpp.find_library('dl', required: false) + headers = files('backends/imgui_impl_opengl2.h', + 'backends/imgui_impl_opengl3.h', + 'backends/imgui_impl_opengl3_loader.h') endif -sdl2_renderer_dep = dependency('sdl2', version: '>=2.0.17', required: get_option('sdl_renderer')) +sdl2_renderer_dep = dependency('sdl2', version: '>=2.0.17', required: get_option('sdl2_renderer')) if sdl2_renderer_dep.found() sources += 'backends/imgui_impl_sdlrenderer2.cpp' dependencies += sdl2_renderer_dep + headers += files('backends/imgui_impl_sdlrenderer2.h') +endif +sdl3_renderer_dep = dependency('sdl3', version: '>=3.0.0', required: get_option('sdl3_renderer')) +if sdl3_renderer_dep.found() + sources += 'backends/imgui_impl_sdlrenderer3.cpp' + dependencies += sdl3_renderer_dep + headers += files('backends/imgui_impl_sdlrenderer3.h') endif vulkan_dep = dependency('vulkan', required: get_option('vulkan')) if vulkan_dep.found() sources += 'backends/imgui_impl_vulkan.cpp' dependencies += vulkan_dep + headers += files('backends/imgui_impl_vulkan.h') endif if cpp.has_header('webgpu/webgpu.h', required: get_option('webgpu')) sources += 'backends/imgui_impl_wgpu.cpp' + headers += files('backends/imgui_impl_wgpu.h') endif # platform backends @@ -76,20 +98,30 @@ glfw_dep = dependency('glfw3', required: get_option('glfw')) if glfw_dep.found() sources += 'backends/imgui_impl_glfw.cpp' dependencies += glfw_dep + headers += files('backends/imgui_impl_glfw.h') endif sdl2_dep = dependency('sdl2', required: get_option('sdl2')) if sdl2_dep.found() sources += 'backends/imgui_impl_sdl2.cpp' dependencies += sdl2_dep + headers += files('backends/imgui_impl_sdl2.h') +endif +sdl3_dep = dependency('sdl3', required: get_option('sdl3')) +if sdl3_dep.found() + sources += 'backends/imgui_impl_sdl3.cpp' + dependencies += sdl3_dep + headers += files('backends/imgui_impl_sdl3.h') endif osx_dep = dependency('appleframeworks', modules: ['Carbon', 'Cocoa', 'GameController'], required: get_option('osx')) if osx_dep.found() sources += 'backends/imgui_impl_osx.mm' + headers += files('backends/imgui_impl_osx.h') endif win_dep = cpp.find_library('dwmapi', required: get_option('win')) if win_dep.found() sources += 'backends/imgui_impl_win32.cpp' dependencies += win_dep + headers += files('backends/imgui_impl_win32.h') endif # frameworks @@ -98,6 +130,7 @@ allegro5_primitives_dep = dependency('allegro_primitives-5', required: get_optio if allegro5_dep.found() and allegro5_primitives_dep.found() sources += 'backends/imgui_impl_allegro5.cpp' dependencies += [allegro5_dep, allegro5_primitives_dep] + headers+= files('backends/imgui_impl_allegro5.h') endif api = '-DIMGUI_API=__attribute__((visibility("default")))' @@ -116,38 +149,20 @@ imgui = library( install: true ) -pkg_mod = import('pkgconfig') -pkg_mod.generate(imgui, - description : 'Dear ImGui: Bloat-free Graphical User interface for C++ with minimal dependencies' -) - -install_headers( +headers += files( 'imconfig.h', 'imgui.h', 'imgui_internal.h', 'imstb_rectpack.h', 'imstb_textedit.h', - 'imstb_truetype.h', - 'backends/imgui_impl_allegro5.h', - 'backends/imgui_impl_android.h', - 'backends/imgui_impl_dx10.h', - 'backends/imgui_impl_dx11.h', - 'backends/imgui_impl_dx12.h', - 'backends/imgui_impl_glfw.h', - 'backends/imgui_impl_glut.h', - 'backends/imgui_impl_metal.h', - 'backends/imgui_impl_opengl2.h', - 'backends/imgui_impl_opengl3.h', - 'backends/imgui_impl_opengl3_loader.h', - 'backends/imgui_impl_osx.h', - 'backends/imgui_impl_sdl2.h', - 'backends/imgui_impl_sdl3.h', - 'backends/imgui_impl_sdlrenderer2.h', - 'backends/imgui_impl_sdlrenderer3.h', - 'backends/imgui_impl_vulkan.h', - 'backends/imgui_impl_wgpu.h', - 'backends/imgui_impl_win32.h', - subdir: 'imgui') + 'imstb_truetype.h',) + +install_headers(headers, subdir: 'imgui') + +pkg_mod = import('pkgconfig') +pkg_mod.generate(imgui, + description : 'Dear ImGui: Bloat-free Graphical User interface for C++ with minimal dependencies' +) if host_machine.system() == 'windows' api = '-DIMGUI_API=@0@'.format(get_option('default_library') != 'static' ? '__declspec(dllimport)' : '') diff --git a/media-libs/imgui/files/imgui-meson_options.txt b/media-libs/imgui/files/imgui-meson_options.txt index 967c85f64f..d5941684af 100644 --- a/media-libs/imgui/files/imgui-meson_options.txt +++ b/media-libs/imgui/files/imgui-meson_options.txt @@ -5,13 +5,15 @@ option('dx11', type : 'feature', value : 'auto') option('dx12', type : 'feature', value : 'auto') option('metal', type : 'feature', value : 'auto') option('opengl', type : 'feature', value : 'auto') -option('sdl_renderer', type : 'feature', value : 'auto') +option('sdl2_renderer', type : 'feature', value : 'auto') +option('sdl3_renderer', type : 'feature', value : 'auto') option('vulkan', type : 'feature', value : 'auto') option('webgpu', type : 'feature', value : 'auto') # platform backends option('glfw', type : 'feature', value : 'auto') option('sdl2', type : 'feature', value : 'auto') +option('sdl3', type : 'feature', value : 'auto') option('osx', type : 'feature', value : 'auto') option('win', type : 'feature', value : 'auto') diff --git a/media-libs/imgui/imgui-1.89.9-r1.ebuild b/media-libs/imgui/imgui-1.89.9-r2.ebuild similarity index 87% rename from media-libs/imgui/imgui-1.89.9-r1.ebuild rename to media-libs/imgui/imgui-1.89.9-r2.ebuild index 917ecd30c0..80fab10f6d 100644 --- a/media-libs/imgui/imgui-1.89.9-r1.ebuild +++ b/media-libs/imgui/imgui-1.89.9-r2.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> imgui-${PV}.t LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~amd64" -IUSE="opengl vulkan glfw sdl2 sdl_renderer webgpu allegro5" +IUSE="opengl vulkan glfw sdl2 sdl3 sdl2_renderer sdl3_renderer webgpu allegro5" RDEPEND=" dev-libs/stb:= @@ -26,7 +26,7 @@ RDEPEND=" glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] ) opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) sdl2? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) - sdl_renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) + sdl2_renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) webgpu? ( dev-util/webgpu-headers ) " @@ -58,7 +58,9 @@ multilib_src_configure() { $(meson_feature vulkan) $(meson_feature glfw) $(meson_feature sdl2) - $(meson_feature sdl_renderer) + $(meson_feature sdl2_renderer) + -Dsdl3=disabled + -Dsdl3_renderer=disabled $(meson_feature webgpu) -Dosx=disabled -Dwin=disabled diff --git a/media-libs/imgui/imgui-1.90.7.ebuild b/media-libs/imgui/imgui-1.90.7.ebuild deleted file mode 100644 index 917ecd30c0..0000000000 --- a/media-libs/imgui/imgui-1.90.7.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson-multilib - -MESON_WRAP_VER="1" - -DESCRIPTION="Bloat-free graphical user interface library for C++" -HOMEPAGE=" - https://github.com/ocornut/imgui -" - -SRC_URI="https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> imgui-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="opengl vulkan glfw sdl2 sdl_renderer webgpu allegro5" - -RDEPEND=" - dev-libs/stb:= - media-libs/glew[${MULTILIB_USEDEP}] - allegro5? ( media-libs/allegro:5[${MULTILIB_USEDEP}] ) - glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] ) - opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) - sdl2? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) - sdl_renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) - vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) - webgpu? ( dev-util/webgpu-headers ) -" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND=" - virtual/pkgconfig -" - -src_prepare() { - default - - # Use custom meson.build and meson_options.txt to install instead of relay on packages - cp "${FILESDIR}/${PN}-meson.build" "${S}/meson.build" || die - cp "${FILESDIR}/${PN}-meson_options.txt" "${S}/meson_options.txt" || die - sed -i "s/ version: 'PV',/ version: '${PV}',/g" "${S}/meson.build" || die -} - -multilib_src_configure() { - local emesonargs=( - -Ddx9=disabled - -Ddx10=disabled - -Ddx11=disabled - -Ddx12=disabled - -Dmetal=disabled - $(meson_feature opengl) - $(meson_feature vulkan) - $(meson_feature glfw) - $(meson_feature sdl2) - $(meson_feature sdl_renderer) - $(meson_feature webgpu) - -Dosx=disabled - -Dwin=disabled - $(meson_feature allegro5) - ) - meson_src_configure -} diff --git a/media-libs/imgui/metadata.xml b/media-libs/imgui/metadata.xml index 6719588bc6..6273590a21 100644 --- a/media-libs/imgui/metadata.xml +++ b/media-libs/imgui/metadata.xml @@ -15,7 +15,9 @@ Enable opengl renderer Enable vulkan renderer Enable SDL2 backend - Enable SDL renderer backend + Enable SDL2 renderer backend + Enable SDL3 backend + Enable SDL3 renderer backend Enable webgpu renderer backend From 7a72553a6edec0094bc40ab6ff3cdb3be1a82ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?= Date: Mon, 3 Jun 2024 11:48:51 +0100 Subject: [PATCH 11/40] media-libs/imgui: use mesa useflags instead of virtual/opengl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gonçalo Negrier Duarte --- ....89.9-r2.ebuild => imgui-1.89.9-r3.ebuild} | 5 +- media-libs/imgui/imgui-1.90.7-r2.ebuild | 73 +++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) rename media-libs/imgui/{imgui-1.89.9-r2.ebuild => imgui-1.89.9-r3.ebuild} (91%) create mode 100644 media-libs/imgui/imgui-1.90.7-r2.ebuild diff --git a/media-libs/imgui/imgui-1.89.9-r2.ebuild b/media-libs/imgui/imgui-1.89.9-r3.ebuild similarity index 91% rename from media-libs/imgui/imgui-1.89.9-r2.ebuild rename to media-libs/imgui/imgui-1.89.9-r3.ebuild index 80fab10f6d..17e6f6e5b3 100644 --- a/media-libs/imgui/imgui-1.89.9-r2.ebuild +++ b/media-libs/imgui/imgui-1.89.9-r3.ebuild @@ -24,7 +24,10 @@ RDEPEND=" media-libs/glew[${MULTILIB_USEDEP}] allegro5? ( media-libs/allegro:5[${MULTILIB_USEDEP}] ) glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] ) - opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) + opengl? ( || ( + >=media-libs/mesa-24.1.0_rc1[opengl,X?,${MULTILIB_USEDEP}] + Date: Mon, 3 Jun 2024 12:01:09 +0100 Subject: [PATCH 12/40] media-libs/imgui: fix useflags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gonçalo Negrier Duarte --- media-libs/imgui/imgui-1.89.9-r3.ebuild | 10 +++++----- media-libs/imgui/imgui-1.90.7-r2.ebuild | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/media-libs/imgui/imgui-1.89.9-r3.ebuild b/media-libs/imgui/imgui-1.89.9-r3.ebuild index 17e6f6e5b3..50baf8ec3d 100644 --- a/media-libs/imgui/imgui-1.89.9-r3.ebuild +++ b/media-libs/imgui/imgui-1.89.9-r3.ebuild @@ -17,19 +17,19 @@ SRC_URI="https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> imgui-${PV}.t LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~amd64" -IUSE="opengl vulkan glfw sdl2 sdl3 sdl2_renderer sdl3_renderer webgpu allegro5" +IUSE="allegro5 glfw sdl2 sdl3 sdl2_renderer sdl3_renderer opengl vulkan webgpu" RDEPEND=" dev-libs/stb:= media-libs/glew[${MULTILIB_USEDEP}] allegro5? ( media-libs/allegro:5[${MULTILIB_USEDEP}] ) glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] ) - opengl? ( || ( - >=media-libs/mesa-24.1.0_rc1[opengl,X?,${MULTILIB_USEDEP}] - =media-libs/mesa-24.1.0_rc1[opengl,${MULTILIB_USEDEP}] + Date: Mon, 3 Jun 2024 17:41:05 +0500 Subject: [PATCH 13/40] sys-fs/dwarfs: add 0.9.10 Signed-off-by: Denis Reva --- sys-fs/dwarfs/Manifest | 1 + sys-fs/dwarfs/dwarfs-0.9.10.ebuild | 137 +++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) create mode 100644 sys-fs/dwarfs/dwarfs-0.9.10.ebuild diff --git a/sys-fs/dwarfs/Manifest b/sys-fs/dwarfs/Manifest index 65abf39d25..c92152d6df 100644 --- a/sys-fs/dwarfs/Manifest +++ b/sys-fs/dwarfs/Manifest @@ -1,2 +1,3 @@ +DIST dwarfs-0.9.10.tar.xz 18618308 BLAKE2B be992c645b76c277e08c5ccaa80665c7303a8a218ead430b2f382b1f537d42debd095c94697dfff24246985d70efb70aeae8d4f4e68f3461bc0dca3f6135a184 SHA512 c67ac3586a7f36e4439a1c63b292ad1f1c61e6bc307b9711785a97d7146c686bc3918ff031188bfaa741829114a661e80bb7e4b5d7ce4f4b3f6d1e86e8532ec9 DIST dwarfs-0.9.6.tar.xz 15665392 BLAKE2B 305587de0e31390f4d3c2701cc1b0fe9f29d2a37a363f575ae770c0037d69b77685bd593f900c71e4e9fe8dbfdf4644f1ea3158f9fdc3596583eda89d0040e88 SHA512 c1a094df448bd5820be71f4d950ff4f515e5be137d1343acb00298986495b41c4223d0b2e7e4501a94a0d019789e54bf041bba4f7b83efac43d6fa4b1d60c68a DIST dwarfs-0.9.9.tar.xz 18614744 BLAKE2B c8f98b737d86444a6a074f7de2704edb94c86bd80e4024d021d4887240f9e1a5b52187ca2e82257427b2392d4afc7c7081985d5b5cc5d8b593f7221c4bc12126 SHA512 7f7f2d49f25856b6e88cf8bda0f194efeeac88eab9f0b9079d02fa871af2b8181879ece7170e36653b75246b421e6a1c54c04a5156b4e1803a0a202472232da0 diff --git a/sys-fs/dwarfs/dwarfs-0.9.10.ebuild b/sys-fs/dwarfs/dwarfs-0.9.10.ebuild new file mode 100644 index 0000000000..42bdd10ad7 --- /dev/null +++ b/sys-fs/dwarfs/dwarfs-0.9.10.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit check-reqs cmake flag-o-matic python-any-r1 + +DESCRIPTION="A fast very high compression read-only FUSE file system" +HOMEPAGE="https://github.com/mhx/dwarfs" +SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${P}.tar.xz" + +S="${WORKDIR}/dwarfs-${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+jemalloc test man" #Tests is broken at this moment +# See https://github.com/mhx/dwarfs/issues/194 + +RESTRICT="!test? ( test )" + +RDEPEND=" + app-arch/brotli + app-arch/libarchive + app-arch/lz4 + app-arch/snappy + app-arch/xz-utils + app-arch/zstd + dev-cpp/range-v3 + dev-cpp/gflags + dev-cpp/glog[gflags] + dev-cpp/parallel-hashmap:= + dev-libs/boost[context] + dev-libs/date + dev-libs/double-conversion + dev-libs/libevent + dev-libs/libfmt + dev-libs/utfcpp + dev-libs/xxhash + dev-libs/fsst + media-libs/flac + sys-fs/fuse:3 + sys-libs/binutils-libs + sys-libs/zlib + jemalloc? ( >=dev-libs/jemalloc-5.3.0-r1 ) +" + +DEPEND="${RDEPEND} + sys-libs/libunwind" +BDEPEND=" + ${PYTHON_DEPS} + dev-util/patchelf + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + man? ( app-text/ronn-ng ) + test? ( dev-cpp/gtest ) + $(python_gen_any_dep 'dev-python/mistletoe[${PYTHON_USEDEP}]') +" + +DOCS=( "README.md" "CHANGES.md" "TODO" ) + +CHECKREQS_DISK_BUILD="1300M" +CMAKE_IN_SOURCE_BUILD=1 +CMAKE_WARN_UNUSED_CLI=0 + +python_check_deps() { + python_has_version -b "dev-python/mistletoe[${PYTHON_USEDEP}]" +} + +src_prepare() { + rm -r zstd xxHash parallel-hashmap || die + sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die + + # Bug #900016, but upstream discourages O3 + sed '/FLAGS_RELEASE/s# -O2 -g##' -i CMakeLists.txt || die + sed '/CMAKE_CXX_FLAGS_COMMON/s#-g ##' -i folly/CMake/FollyCompilerUnix.cmake || die + sed '/^\s*-g$/d' -i folly/CMake/FollyCompilerUnix.cmake || die + replace-flags -O3 -O2 + # Fixes building with test when using system-gtest + # https://github.com/mhx/dwarfs/issues/188 + sed '/utils_test/d' -i CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + append-cxxflags "-I/usr/include" + filter-ldflags "-Wl,--as-needed" + append-ldflags $(no-as-needed) + + # FIXME: Requires dev-cpp/gtest to be built with -fchar8_t or -std=c++20. + # This is unfortunately too aggressive: + # append-cxxflags "-fno-char8_t" + + mycmakeargs=( + -DUSE_JEMALLOC=$(usex jemalloc ON OFF) + -DWITH_TESTS=$(usex test ON OFF) + -DWITH_MAN_PAGES=$(usex man ON OFF) + -DPREFER_SYSTEM_ZSTD=ON + -DPREFER_SYSTEM_XXHASH=ON + -DPREFER_SYSTEM_GTEST=ON + -DPREFER_SYSTEM_LIBFMT=ON + -DWITH_LEGACY_FUSE=OFF + -DDISABLE_CCACHE=ON # Use FEATURES=ccache + -DBUILD_SHARED_LIBS=OFF # It can be very difficult to explain + # Shared libs is not fully supported by upstream + # https://github.com/mhx/dwarfs/issues/184#issuecomment-1873820859 + # So if we disable shared libs we dramatically reduce install code and + # remove libs collision with dev-cpp/folly, dev-cpp/fbthrift, + # dev-cpp/fizz, and dev-cpp/wangle + # We do NOT enable the full static build, but eradicate bundled libs + # such as libfolly.so and libdwarfs_compression.so + -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" + ) + cmake_src_configure +} + +src_test() { + local CMAKE_SKIP_TESTS=( + # Tests don't work in sandbox + # fuse: failed to open /dev/fuse: Permission denied + dwarfs/tools_test + # Some tests doesn't work because of sed '/utils_test/d' + dwarfsextract_test.perfmon + dwarfs/segmenter_repeating_sequence_test.github161 + ) + cmake_src_test +} + +pkg_postinst() { + elog "You may find more information in the" + elog "${HOMEPAGE}" + elog "About creating: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md" + elog "About mounting: ${HOMEPAGE}/blob/main/doc/dwarfs.md" +} From 95a78f38491cd8e1f9336733380e3e5ea12ca0c3 Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Mon, 3 Jun 2024 17:41:39 +0500 Subject: [PATCH 14/40] sys-fs/dwarfs: drop 0.9.6 Signed-off-by: Denis Reva --- sys-fs/dwarfs/Manifest | 1 - sys-fs/dwarfs/dwarfs-0.9.6.ebuild | 137 ------------------------------ 2 files changed, 138 deletions(-) delete mode 100644 sys-fs/dwarfs/dwarfs-0.9.6.ebuild diff --git a/sys-fs/dwarfs/Manifest b/sys-fs/dwarfs/Manifest index c92152d6df..2c3f9d4012 100644 --- a/sys-fs/dwarfs/Manifest +++ b/sys-fs/dwarfs/Manifest @@ -1,3 +1,2 @@ DIST dwarfs-0.9.10.tar.xz 18618308 BLAKE2B be992c645b76c277e08c5ccaa80665c7303a8a218ead430b2f382b1f537d42debd095c94697dfff24246985d70efb70aeae8d4f4e68f3461bc0dca3f6135a184 SHA512 c67ac3586a7f36e4439a1c63b292ad1f1c61e6bc307b9711785a97d7146c686bc3918ff031188bfaa741829114a661e80bb7e4b5d7ce4f4b3f6d1e86e8532ec9 -DIST dwarfs-0.9.6.tar.xz 15665392 BLAKE2B 305587de0e31390f4d3c2701cc1b0fe9f29d2a37a363f575ae770c0037d69b77685bd593f900c71e4e9fe8dbfdf4644f1ea3158f9fdc3596583eda89d0040e88 SHA512 c1a094df448bd5820be71f4d950ff4f515e5be137d1343acb00298986495b41c4223d0b2e7e4501a94a0d019789e54bf041bba4f7b83efac43d6fa4b1d60c68a DIST dwarfs-0.9.9.tar.xz 18614744 BLAKE2B c8f98b737d86444a6a074f7de2704edb94c86bd80e4024d021d4887240f9e1a5b52187ca2e82257427b2392d4afc7c7081985d5b5cc5d8b593f7221c4bc12126 SHA512 7f7f2d49f25856b6e88cf8bda0f194efeeac88eab9f0b9079d02fa871af2b8181879ece7170e36653b75246b421e6a1c54c04a5156b4e1803a0a202472232da0 diff --git a/sys-fs/dwarfs/dwarfs-0.9.6.ebuild b/sys-fs/dwarfs/dwarfs-0.9.6.ebuild deleted file mode 100644 index 42bdd10ad7..0000000000 --- a/sys-fs/dwarfs/dwarfs-0.9.6.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit check-reqs cmake flag-o-matic python-any-r1 - -DESCRIPTION="A fast very high compression read-only FUSE file system" -HOMEPAGE="https://github.com/mhx/dwarfs" -SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${P}.tar.xz" - -S="${WORKDIR}/dwarfs-${PV}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+jemalloc test man" #Tests is broken at this moment -# See https://github.com/mhx/dwarfs/issues/194 - -RESTRICT="!test? ( test )" - -RDEPEND=" - app-arch/brotli - app-arch/libarchive - app-arch/lz4 - app-arch/snappy - app-arch/xz-utils - app-arch/zstd - dev-cpp/range-v3 - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-cpp/parallel-hashmap:= - dev-libs/boost[context] - dev-libs/date - dev-libs/double-conversion - dev-libs/libevent - dev-libs/libfmt - dev-libs/utfcpp - dev-libs/xxhash - dev-libs/fsst - media-libs/flac - sys-fs/fuse:3 - sys-libs/binutils-libs - sys-libs/zlib - jemalloc? ( >=dev-libs/jemalloc-5.3.0-r1 ) -" - -DEPEND="${RDEPEND} - sys-libs/libunwind" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/patchelf - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - man? ( app-text/ronn-ng ) - test? ( dev-cpp/gtest ) - $(python_gen_any_dep 'dev-python/mistletoe[${PYTHON_USEDEP}]') -" - -DOCS=( "README.md" "CHANGES.md" "TODO" ) - -CHECKREQS_DISK_BUILD="1300M" -CMAKE_IN_SOURCE_BUILD=1 -CMAKE_WARN_UNUSED_CLI=0 - -python_check_deps() { - python_has_version -b "dev-python/mistletoe[${PYTHON_USEDEP}]" -} - -src_prepare() { - rm -r zstd xxHash parallel-hashmap || die - sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die - - # Bug #900016, but upstream discourages O3 - sed '/FLAGS_RELEASE/s# -O2 -g##' -i CMakeLists.txt || die - sed '/CMAKE_CXX_FLAGS_COMMON/s#-g ##' -i folly/CMake/FollyCompilerUnix.cmake || die - sed '/^\s*-g$/d' -i folly/CMake/FollyCompilerUnix.cmake || die - replace-flags -O3 -O2 - # Fixes building with test when using system-gtest - # https://github.com/mhx/dwarfs/issues/188 - sed '/utils_test/d' -i CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - append-cxxflags "-I/usr/include" - filter-ldflags "-Wl,--as-needed" - append-ldflags $(no-as-needed) - - # FIXME: Requires dev-cpp/gtest to be built with -fchar8_t or -std=c++20. - # This is unfortunately too aggressive: - # append-cxxflags "-fno-char8_t" - - mycmakeargs=( - -DUSE_JEMALLOC=$(usex jemalloc ON OFF) - -DWITH_TESTS=$(usex test ON OFF) - -DWITH_MAN_PAGES=$(usex man ON OFF) - -DPREFER_SYSTEM_ZSTD=ON - -DPREFER_SYSTEM_XXHASH=ON - -DPREFER_SYSTEM_GTEST=ON - -DPREFER_SYSTEM_LIBFMT=ON - -DWITH_LEGACY_FUSE=OFF - -DDISABLE_CCACHE=ON # Use FEATURES=ccache - -DBUILD_SHARED_LIBS=OFF # It can be very difficult to explain - # Shared libs is not fully supported by upstream - # https://github.com/mhx/dwarfs/issues/184#issuecomment-1873820859 - # So if we disable shared libs we dramatically reduce install code and - # remove libs collision with dev-cpp/folly, dev-cpp/fbthrift, - # dev-cpp/fizz, and dev-cpp/wangle - # We do NOT enable the full static build, but eradicate bundled libs - # such as libfolly.so and libdwarfs_compression.so - -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" - ) - cmake_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=( - # Tests don't work in sandbox - # fuse: failed to open /dev/fuse: Permission denied - dwarfs/tools_test - # Some tests doesn't work because of sed '/utils_test/d' - dwarfsextract_test.perfmon - dwarfs/segmenter_repeating_sequence_test.github161 - ) - cmake_src_test -} - -pkg_postinst() { - elog "You may find more information in the" - elog "${HOMEPAGE}" - elog "About creating: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md" - elog "About mounting: ${HOMEPAGE}/blob/main/doc/dwarfs.md" -} From f445ee7b4149d549cc2645e3b650a13150522f2f Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Mon, 3 Jun 2024 17:42:38 +0500 Subject: [PATCH 15/40] sys-fs/dwarfs-bin: add 0.9.10, drop 0.9.9 Signed-off-by: Denis Reva --- sys-fs/dwarfs-bin/Manifest | 4 ++-- .../{dwarfs-bin-0.9.9.ebuild => dwarfs-bin-0.9.10.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename sys-fs/dwarfs-bin/{dwarfs-bin-0.9.9.ebuild => dwarfs-bin-0.9.10.ebuild} (100%) diff --git a/sys-fs/dwarfs-bin/Manifest b/sys-fs/dwarfs-bin/Manifest index 1ff3f3bb35..b16395d5f4 100644 --- a/sys-fs/dwarfs-bin/Manifest +++ b/sys-fs/dwarfs-bin/Manifest @@ -1,2 +1,2 @@ -DIST dwarfs-bin-0.9.9-amd64.tar.xz 7633552 BLAKE2B d4ae21125ce26347259a96d678959e49dfe91f9558d102b69b83743c83f65769b6e8ad926e8dbf14e5b82c18502865492963d09b239b6cd0a6f37d6b76768110 SHA512 b0fc212c3a6bce3a6dfd7c4009849501130f71a5cee3fd3e822f9fe7960fec44bf8be41ae3924d04e6816a80ac7053f7e4e64adac6647a37075affd555c51f52 -DIST dwarfs-bin-0.9.9-arm64.tar.gz 7034576 BLAKE2B a477af305ffa1ca8d91ea827f779c20256886f0d25350a090f1d93624c02ad42795795f44e33da2907466987e825309429d18f2dc1f4af3a7e49c665ff5f7d65 SHA512 5406d06a5214cf4c641a9328a8359b0bfcfcab20e67b63a3bb3b5a1feb0fd7527f7edab78103f932bac871f5172a72269d2f802bb0f93ee57e2f5f4b5b6a3f28 +DIST dwarfs-bin-0.9.10-amd64.tar.xz 8076224 BLAKE2B c2ed06683c5bb1989a6c3d9381514c750274cae9ba9fed7eedb96fd6a6202f09e14df1a45362a570b5f112e15e472ddf7e9bc368ad70a848aecf3b09bc94402a SHA512 9633f59fa1afdc9ebe8260ce6d29b78fbb6b2c5905edf8884b2e6b608c1c04fdcb1b464d4842e0e75eb5e16d766bf8aaf6f890b7aa1fae8cb7127309e7f2c49a +DIST dwarfs-bin-0.9.10-arm64.tar.gz 7044940 BLAKE2B a893efa702423a5cfbe87117fe0674e8cba33bdaef95535ef6779e096d58c5002cd672c6e6ae378ae9f5641a19eb4b5e601e929a1bd1b4416208910ef80507ed SHA512 e32e9693a825335b311e454c5556decf8ccd74ce872cd4d61f2243e1fb000950436bb1b7336bf4341cd26820b9ffe6d383b2d2425329ba3ceac78fb415a1edf2 diff --git a/sys-fs/dwarfs-bin/dwarfs-bin-0.9.9.ebuild b/sys-fs/dwarfs-bin/dwarfs-bin-0.9.10.ebuild similarity index 100% rename from sys-fs/dwarfs-bin/dwarfs-bin-0.9.9.ebuild rename to sys-fs/dwarfs-bin/dwarfs-bin-0.9.10.ebuild From 1a8ef5ad238dd5302f7871ce41f0892ff1728e29 Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Mon, 3 Jun 2024 17:55:28 +0300 Subject: [PATCH 16/40] dev-python/dropbox: add 12.0.1 Signed-off-by: Viorel Munteanu --- dev-python/dropbox/Manifest | 1 + dev-python/dropbox/dropbox-12.0.1.ebuild | 44 ++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 dev-python/dropbox/dropbox-12.0.1.ebuild diff --git a/dev-python/dropbox/Manifest b/dev-python/dropbox/Manifest index 99464a7c3a..ee47bf8cdf 100644 --- a/dev-python/dropbox/Manifest +++ b/dev-python/dropbox/Manifest @@ -1,2 +1,3 @@ DIST dropbox-sdk-python-11.36.2.gh.tar.gz 1166700 BLAKE2B afd0592bd1e18416f91d1fd673f2b7b7f605eaab80c02a9d8535fefa7fb23c8bc6a08c191492e1ced5d4b2d17fa72e8e5b6a58ba797f170c0efb75e755a451c9 SHA512 ec27685b4e5344e706bffb68b110ef2d7b307a5865bed3e042d6835f3666d2eefca646627a07bae1a3142e5f0346865fe285b037b00f3da081eb5797f9a768f5 DIST dropbox-sdk-python-12.0.0.gh.tar.gz 1155006 BLAKE2B dc75c8c0be5d8c44820cddf8e39b8e86180fc8ddc482ef4656ad5525e268f6f13fa1529138290205acd0a946b6d8d90a3df48aff9fb14f410d5c2c409ee399c3 SHA512 5cf28c0e338a3399e4448c64fde823bfc872a6a6a93dc25241c96f55c21abe194b9e882d32d098f4c329941f36d0dec79786e521f2686c7d4c0eeb64bd745f21 +DIST dropbox-sdk-python-12.0.1.gh.tar.gz 1155009 BLAKE2B 615aa4650d030fbbf7e6f487c2a314f763a4b153cd94c1e2f9720c4b426bf53007e4e01883f1cde2fab25b6df8f9bc35cc376ced9100c4c023c2685366b2456c SHA512 4346ced633f07f255ac23089bb8e4ed22dbba18b25e1e36dc3c083bb4afa45a8824ac772db04cd0b679b43c08c61dcca1dfa70fbb367b3dc625d5f6647d31589 diff --git a/dev-python/dropbox/dropbox-12.0.1.ebuild b/dev-python/dropbox/dropbox-12.0.1.ebuild new file mode 100644 index 0000000000..d32005804c --- /dev/null +++ b/dev-python/dropbox/dropbox-12.0.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +GH_PN=dropbox-sdk-python + +DESCRIPTION="The offical Dropbox SDK for Python" +HOMEPAGE="https://www.dropbox.com/developers" +# pypi does not have tests, stick with gh +SRC_URI="https://github.com/dropbox/${GH_PN}/archive/refs/tags/v${PV}.tar.gz -> ${GH_PN}-${PV}.gh.tar.gz" +S="${WORKDIR}"/${GH_PN}-${PV} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/requests[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/stone[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] +" + +# disable tests that need SCOPED_USER_DROPBOX_TOKEN +# and tests that fail +EPYTEST_DESELECT=( + test/integration/test_dropbox.py + test/unit/test_dropbox_unit.py::TestClient + test/unit/test_dropbox_unit.py::TestOAuth::test_NoRedirect_whole_flow +) + +distutils_enable_tests pytest + +python_prepare_all() { + # this is wrong + sed -i -e "s/^import mock$/from unittest import mock/" test/unit/test_dropbox_unit.py || die + + distutils-r1_python_prepare_all +} From d2682374323d659850f342d62c8191dfca75952c Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Mon, 3 Jun 2024 17:55:33 +0300 Subject: [PATCH 17/40] dev-python/dropbox: drop 12.0.0 Signed-off-by: Viorel Munteanu --- dev-python/dropbox/Manifest | 1 - dev-python/dropbox/dropbox-12.0.0.ebuild | 44 ------------------------ 2 files changed, 45 deletions(-) delete mode 100644 dev-python/dropbox/dropbox-12.0.0.ebuild diff --git a/dev-python/dropbox/Manifest b/dev-python/dropbox/Manifest index ee47bf8cdf..0f28e5ad58 100644 --- a/dev-python/dropbox/Manifest +++ b/dev-python/dropbox/Manifest @@ -1,3 +1,2 @@ DIST dropbox-sdk-python-11.36.2.gh.tar.gz 1166700 BLAKE2B afd0592bd1e18416f91d1fd673f2b7b7f605eaab80c02a9d8535fefa7fb23c8bc6a08c191492e1ced5d4b2d17fa72e8e5b6a58ba797f170c0efb75e755a451c9 SHA512 ec27685b4e5344e706bffb68b110ef2d7b307a5865bed3e042d6835f3666d2eefca646627a07bae1a3142e5f0346865fe285b037b00f3da081eb5797f9a768f5 -DIST dropbox-sdk-python-12.0.0.gh.tar.gz 1155006 BLAKE2B dc75c8c0be5d8c44820cddf8e39b8e86180fc8ddc482ef4656ad5525e268f6f13fa1529138290205acd0a946b6d8d90a3df48aff9fb14f410d5c2c409ee399c3 SHA512 5cf28c0e338a3399e4448c64fde823bfc872a6a6a93dc25241c96f55c21abe194b9e882d32d098f4c329941f36d0dec79786e521f2686c7d4c0eeb64bd745f21 DIST dropbox-sdk-python-12.0.1.gh.tar.gz 1155009 BLAKE2B 615aa4650d030fbbf7e6f487c2a314f763a4b153cd94c1e2f9720c4b426bf53007e4e01883f1cde2fab25b6df8f9bc35cc376ced9100c4c023c2685366b2456c SHA512 4346ced633f07f255ac23089bb8e4ed22dbba18b25e1e36dc3c083bb4afa45a8824ac772db04cd0b679b43c08c61dcca1dfa70fbb367b3dc625d5f6647d31589 diff --git a/dev-python/dropbox/dropbox-12.0.0.ebuild b/dev-python/dropbox/dropbox-12.0.0.ebuild deleted file mode 100644 index d32005804c..0000000000 --- a/dev-python/dropbox/dropbox-12.0.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 - -GH_PN=dropbox-sdk-python - -DESCRIPTION="The offical Dropbox SDK for Python" -HOMEPAGE="https://www.dropbox.com/developers" -# pypi does not have tests, stick with gh -SRC_URI="https://github.com/dropbox/${GH_PN}/archive/refs/tags/v${PV}.tar.gz -> ${GH_PN}-${PV}.gh.tar.gz" -S="${WORKDIR}"/${GH_PN}-${PV} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/requests[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/stone[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] -" - -# disable tests that need SCOPED_USER_DROPBOX_TOKEN -# and tests that fail -EPYTEST_DESELECT=( - test/integration/test_dropbox.py - test/unit/test_dropbox_unit.py::TestClient - test/unit/test_dropbox_unit.py::TestOAuth::test_NoRedirect_whole_flow -) - -distutils_enable_tests pytest - -python_prepare_all() { - # this is wrong - sed -i -e "s/^import mock$/from unittest import mock/" test/unit/test_dropbox_unit.py || die - - distutils-r1_python_prepare_all -} From c1e7d7e60047deb138bb00ebd84108deb62556e2 Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Mon, 3 Jun 2024 18:00:21 +0300 Subject: [PATCH 18/40] media-libs/imgui: fix pkgdev issues There was a typo in metadata.xml. Also underscores are not allowed in flag names. Signed-off-by: Viorel Munteanu --- media-libs/imgui/imgui-1.89.9-r3.ebuild | 8 ++++---- media-libs/imgui/imgui-1.90.7-r2.ebuild | 8 ++++---- media-libs/imgui/metadata.xml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/media-libs/imgui/imgui-1.89.9-r3.ebuild b/media-libs/imgui/imgui-1.89.9-r3.ebuild index 50baf8ec3d..e03ac218f4 100644 --- a/media-libs/imgui/imgui-1.89.9-r3.ebuild +++ b/media-libs/imgui/imgui-1.89.9-r3.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> imgui-${PV}.t LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~amd64" -IUSE="allegro5 glfw sdl2 sdl3 sdl2_renderer sdl3_renderer opengl vulkan webgpu" +IUSE="allegro5 glfw sdl2 sdl3 sdl2-renderer sdl3-renderer opengl vulkan webgpu" RDEPEND=" dev-libs/stb:= @@ -25,7 +25,7 @@ RDEPEND=" allegro5? ( media-libs/allegro:5[${MULTILIB_USEDEP}] ) glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] ) sdl2? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) - sdl2_renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) + sdl2-renderer? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) opengl? ( || ( >=media-libs/mesa-24.1.0_rc1[opengl,${MULTILIB_USEDEP}] =media-libs/mesa-24.1.0_rc1[opengl,${MULTILIB_USEDEP}] Enable opengl renderer Enable vulkan renderer Enable SDL2 backend - Enable SDL2 renderer backend + Enable SDL2 renderer backend Enable SDL3 backend - Enable SDL3 renderer backend + Enable SDL3 renderer backend Enable webgpu renderer backend From 89b4fc5766ccdc7a21744ccbf9762faa56434789 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Mon, 3 Jun 2024 21:30:32 +0200 Subject: [PATCH 19/40] dev-libs/open62541: add 1.4.1 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/Manifest | 1 + dev-libs/open62541/open62541-1.4.1.ebuild | 82 +++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 dev-libs/open62541/open62541-1.4.1.ebuild diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index b826df8490..80e8a48459 100644 --- a/dev-libs/open62541/Manifest +++ b/dev-libs/open62541/Manifest @@ -1 +1,2 @@ DIST open62541-1.4.0.tar.gz 4193601 BLAKE2B 9285c2e8e7d59c306d575579b7935881536c3b2b4d1765a3fb2b6e342540dcae4b65662e2672641b446b0f4d737692af21f62efe497a83fbe42a400bd18f0048 SHA512 2c0a3caea48d4708f37cc084ee8d683a02190f4402fd51bbd5cba763bfab8afa92ecbfb129aa4cfa94930a785ab6037fc4b71de363a374b8952e483464c5e7d3 +DIST open62541-1.4.1.tar.gz 4191270 BLAKE2B 6d186eee099803a1501642ad4dd78d196a0b9e51bdc2f426ed4b8a7efea9939b05ec3d21f0cbaf87289d983168084080df530405d5b71f409feb25ab614e3c95 SHA512 e0a2f9e748ee1b27b0bd400d56b6e90602d545c7a5c794ba9a1ccd1ab15bde3c2908440ec1662b4a6980b9e7ffcf532018f8894821405f8edbd5f0168ca4ccf3 diff --git a/dev-libs/open62541/open62541-1.4.1.ebuild b/dev-libs/open62541/open62541-1.4.1.ebuild new file mode 100644 index 0000000000..7fc876bf81 --- /dev/null +++ b/dev-libs/open62541/open62541-1.4.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-single-r1 + +DESCRIPTION="Open source C implementation of OPC UA" +HOMEPAGE="https://www.open62541.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc encryption examples mbedtls pubsub openssl tools" +# Requires network access +RESTRICT="test" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + encryption? ( || ( mbedtls openssl ) ) +" + +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + doc? ( + media-gfx/graphviz + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ') + ) +" +DEPEND=" + mbedtls? ( net-libs/mbedtls:= ) + openssl? ( dev-libs/openssl:0= ) +" +RDEPEND=" + ${PYTHON_DEPS} + ${DEPEND} +" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DOPEN62541_VERSION=v${PV} + -DUA_BUILD_EXAMPLES=OFF + -DUA_BUILD_TOOLS=$(usex tools) + -DUA_BUILD_UNIT_TESTS=OFF + -DUA_ENABLE_PUBSUB=$(usex pubsub) + -DUA_FORCE_WERROR=OFF + ) + + if use encryption; then + use mbedtls && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=MBEDTLS) + use openssl && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=OPENSSL) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_build doc +} + +src_install() { + use doc && local HTML_DOCS=( "${WORKDIR}"/${P}_build/doc/. ) + cmake_src_install + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples/ + fi +} + +src_test() { + cmake_src_test -j1 +} From e29e4f1844dd59f927501551b4a4173a47c76703 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Mon, 3 Jun 2024 21:30:48 +0200 Subject: [PATCH 20/40] dev-libs/open62541: drop 1.4.0 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/Manifest | 1 - dev-libs/open62541/open62541-1.4.0.ebuild | 82 ----------------------- 2 files changed, 83 deletions(-) delete mode 100644 dev-libs/open62541/open62541-1.4.0.ebuild diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index 80e8a48459..203351ffbb 100644 --- a/dev-libs/open62541/Manifest +++ b/dev-libs/open62541/Manifest @@ -1,2 +1 @@ -DIST open62541-1.4.0.tar.gz 4193601 BLAKE2B 9285c2e8e7d59c306d575579b7935881536c3b2b4d1765a3fb2b6e342540dcae4b65662e2672641b446b0f4d737692af21f62efe497a83fbe42a400bd18f0048 SHA512 2c0a3caea48d4708f37cc084ee8d683a02190f4402fd51bbd5cba763bfab8afa92ecbfb129aa4cfa94930a785ab6037fc4b71de363a374b8952e483464c5e7d3 DIST open62541-1.4.1.tar.gz 4191270 BLAKE2B 6d186eee099803a1501642ad4dd78d196a0b9e51bdc2f426ed4b8a7efea9939b05ec3d21f0cbaf87289d983168084080df530405d5b71f409feb25ab614e3c95 SHA512 e0a2f9e748ee1b27b0bd400d56b6e90602d545c7a5c794ba9a1ccd1ab15bde3c2908440ec1662b4a6980b9e7ffcf532018f8894821405f8edbd5f0168ca4ccf3 diff --git a/dev-libs/open62541/open62541-1.4.0.ebuild b/dev-libs/open62541/open62541-1.4.0.ebuild deleted file mode 100644 index 7fc876bf81..0000000000 --- a/dev-libs/open62541/open62541-1.4.0.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake python-single-r1 - -DESCRIPTION="Open source C implementation of OPC UA" -HOMEPAGE="https://www.open62541.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc encryption examples mbedtls pubsub openssl tools" -# Requires network access -RESTRICT="test" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - encryption? ( || ( mbedtls openssl ) ) -" - -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( - media-gfx/graphviz - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] - ') - ) -" -DEPEND=" - mbedtls? ( net-libs/mbedtls:= ) - openssl? ( dev-libs/openssl:0= ) -" -RDEPEND=" - ${PYTHON_DEPS} - ${DEPEND} -" - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DOPEN62541_VERSION=v${PV} - -DUA_BUILD_EXAMPLES=OFF - -DUA_BUILD_TOOLS=$(usex tools) - -DUA_BUILD_UNIT_TESTS=OFF - -DUA_ENABLE_PUBSUB=$(usex pubsub) - -DUA_FORCE_WERROR=OFF - ) - - if use encryption; then - use mbedtls && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=MBEDTLS) - use openssl && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=OPENSSL) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_build doc -} - -src_install() { - use doc && local HTML_DOCS=( "${WORKDIR}"/${P}_build/doc/. ) - cmake_src_install - - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples/ - fi -} - -src_test() { - cmake_src_test -j1 -} From 918baeec3d1a95d9f3608253ea88dca71e4345fc Mon Sep 17 00:00:00 2001 From: kernaltrap8 Date: Mon, 3 Jun 2024 17:33:02 -0500 Subject: [PATCH 21/40] app-misc/proctl: new package, version 9999 Signed-off-by: kernaltrap8 --- app-misc/proctl/metadata.xml | 17 +++++++++++++++++ app-misc/proctl/proctl-9999.ebuild | 24 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 app-misc/proctl/metadata.xml create mode 100644 app-misc/proctl/proctl-9999.ebuild diff --git a/app-misc/proctl/metadata.xml b/app-misc/proctl/metadata.xml new file mode 100644 index 0000000000..e4fcf5dba9 --- /dev/null +++ b/app-misc/proctl/metadata.xml @@ -0,0 +1,17 @@ + + + + + + kernaltrap@gmail.com + Primary maintainer + + + proctl is a C program that allows the controlling of other processes. + it can execute, kill, and restart processes my passing arguments to + the proctl command. + + + kernaltrap8/proctl + + diff --git a/app-misc/proctl/proctl-9999.ebuild b/app-misc/proctl/proctl-9999.ebuild new file mode 100644 index 0000000000..a6a804a1e0 --- /dev/null +++ b/app-misc/proctl/proctl-9999.ebuild @@ -0,0 +1,24 @@ +EAPI=8 + +inherit meson + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/kernaltrap8/proctl" + S="${WORKDIR}/${PN}-9999" +fi + +DESCRIPTION="small C program that can control processes" +HOMEPAGE="https://github.com/kernaltrap8/proctl" + +LICENSE="GPL-3" +SLOT="0" + +DEPEND="${BDEPEND}" +BDEPEND=" + dev-build/meson +" + +src_configure() { + meson_src_configure +} From 16f42236e2e73378dc5a33e5b230e0d0b01c0e95 Mon Sep 17 00:00:00 2001 From: kernaltrap8 Date: Mon, 3 Jun 2024 17:36:22 -0500 Subject: [PATCH 22/40] app-misc/proctl: update metadata.xml with correct email Signed-off-by: kernaltrap8 --- app-misc/proctl/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/proctl/metadata.xml b/app-misc/proctl/metadata.xml index e4fcf5dba9..8999d33ef3 100644 --- a/app-misc/proctl/metadata.xml +++ b/app-misc/proctl/metadata.xml @@ -3,7 +3,7 @@ - kernaltrap@gmail.com + aidenwingard2@gmail.com Primary maintainer From 47b8a7f10293f6eb2d86f231354dd51c21f48ef5 Mon Sep 17 00:00:00 2001 From: Zen Date: Mon, 3 Jun 2024 20:17:20 -0500 Subject: [PATCH 23/40] sys-kernel/ugrd: Add 1.11.2, drop 1.11.1 Signed-off-by: Zen --- sys-kernel/ugrd/Manifest | 2 +- sys-kernel/ugrd/{ugrd-1.11.1.ebuild => ugrd-1.11.2.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename sys-kernel/ugrd/{ugrd-1.11.1.ebuild => ugrd-1.11.2.ebuild} (97%) diff --git a/sys-kernel/ugrd/Manifest b/sys-kernel/ugrd/Manifest index f6dbc6ab42..d4eef6d0f1 100644 --- a/sys-kernel/ugrd/Manifest +++ b/sys-kernel/ugrd/Manifest @@ -1,4 +1,4 @@ -DIST ugrd-1.11.1.tar.gz 63209 BLAKE2B d6b0db4ba39eca8d1995ad4c03de3735dd549998e8c74122896917c2a897135a2a6ebb41b9411183f95961bbd376444c18ac4d6934d60d229db5ae1348eb3026 SHA512 68471a27cfde3cf209f6d031847929e2e48cf685ff0c77912e807da06593c746671232da4e11eb410f62358eb0e6b9cc40d63ca4f9db8a6ce32f567ee633367b +DIST ugrd-1.11.2.tar.gz 63195 BLAKE2B 059d2e734feb62f028da0ae004f538599557666863608e9e7fecc73b5db1a17e075c7753a57d1692a14d834071aa0434e47255e94a4fb085f18bda7e984f2adb SHA512 26a87ba78263ead981857dd9b9e1bdadc78caf2ce45bc94fe7556c142208d5c89bad9650cfcccea4b4b87b2c19e68f707c3b2c4cd16021c6e3c977119e37f5d6 DIST ugrd-1.2.2.tar.gz 49312 BLAKE2B 819457ae44cb278b93ef24af5e0aa2e23bf2d31d07fccec86e597f658a5cb13aad7838b08df644090417719402673b63087d27b6edbdb46dea04b98b48d26fb0 SHA512 6348458708406408973534ac5f15f8f9f6d9427bbac48443f7ff362bb97627be6288ba2d138355f92fc1c79a4eb5e51081485adb051cadf523a58f1ef618667e DIST ugrd-1.3.8.tar.gz 50142 BLAKE2B 0a61977eb6c0fb6af31db445061385057acf825b4fd300aecda25b70a3ee0ce941c34a2c4d8a712e5d737c4aa2a01f0eb6e5e4dfabc4cd4436f343356d1890ea SHA512 95f5b9b2ea60409b6e5f33e813c7a5c4c8c2613c724b15d9a2b482fd8dd4eb59a209473cade9496fb901f633c3a06357a2cd9477cc3de1f2e2f759162065eb6e DIST ugrd-1.4.0.tar.gz 50372 BLAKE2B aa5b253d78f82d9a35d812d8090441e7c068c048530a5a4e27c6dd0e15d4e3c4b59582311043a5a55904b09c8468d2600c2548e32e1c918b5f7db45c367e9653 SHA512 020eaae8659f5143a63c122fe6f30ed48b231f96d8ae9eb4f3c2861684d9dbe8999fcc5d6d7fa68d473bd565089f96a36f3fa01c61f8113955eac2aef1f3fe2c diff --git a/sys-kernel/ugrd/ugrd-1.11.1.ebuild b/sys-kernel/ugrd/ugrd-1.11.2.ebuild similarity index 97% rename from sys-kernel/ugrd/ugrd-1.11.1.ebuild rename to sys-kernel/ugrd/ugrd-1.11.2.ebuild index 68e5c83d5d..544525b1cb 100644 --- a/sys-kernel/ugrd/ugrd-1.11.1.ebuild +++ b/sys-kernel/ugrd/ugrd-1.11.2.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64" RDEPEND=" app-misc/pax-utils >=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}] - >=dev-python/pycpio-1.1.2[${PYTHON_USEDEP}] + >=dev-python/pycpio-1.1.4[${PYTHON_USEDEP}] sys-apps/pciutils " From 5f17d5e99ac614593446d9c8a71eea9ad1354245 Mon Sep 17 00:00:00 2001 From: kernaltrap8 Date: Mon, 3 Jun 2024 20:27:22 -0500 Subject: [PATCH 24/40] app-misc/proctl, app-misc/tinyfetch: remove unnecessary BDEPEND and src_configure() Signed-off-by: kernaltrap8 --- app-misc/proctl/proctl-9999.ebuild | 12 +++--------- app-misc/tinyfetch/tinyfetch-9999.ebuild | 9 --------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/app-misc/proctl/proctl-9999.ebuild b/app-misc/proctl/proctl-9999.ebuild index a6a804a1e0..e818370c16 100644 --- a/app-misc/proctl/proctl-9999.ebuild +++ b/app-misc/proctl/proctl-9999.ebuild @@ -1,3 +1,6 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + EAPI=8 inherit meson @@ -13,12 +16,3 @@ HOMEPAGE="https://github.com/kernaltrap8/proctl" LICENSE="GPL-3" SLOT="0" - -DEPEND="${BDEPEND}" -BDEPEND=" - dev-build/meson -" - -src_configure() { - meson_src_configure -} diff --git a/app-misc/tinyfetch/tinyfetch-9999.ebuild b/app-misc/tinyfetch/tinyfetch-9999.ebuild index 0b17207949..f05ed1281f 100644 --- a/app-misc/tinyfetch/tinyfetch-9999.ebuild +++ b/app-misc/tinyfetch/tinyfetch-9999.ebuild @@ -13,12 +13,3 @@ HOMEPAGE="https://github.com/kernaltrap8/tinyfetch" LICENSE="GPL-3" SLOT="0" - -DEPEND="${BDEPEND}" -BDEPEND=" - dev-build/meson -" - -src_configure() { - meson_src_configure -} From ded6bed8ff8e535994d1c726e67e1590f90d8e63 Mon Sep 17 00:00:00 2001 From: kernaltrap8 Date: Mon, 3 Jun 2024 20:30:01 -0500 Subject: [PATCH 25/40] app-misc/tinyfetch: add copyright header Signed-off-by: kernaltrap8 --- app-misc/tinyfetch/tinyfetch-9999.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-misc/tinyfetch/tinyfetch-9999.ebuild b/app-misc/tinyfetch/tinyfetch-9999.ebuild index f05ed1281f..c37b0ee295 100644 --- a/app-misc/tinyfetch/tinyfetch-9999.ebuild +++ b/app-misc/tinyfetch/tinyfetch-9999.ebuild @@ -1,3 +1,6 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + EAPI=8 inherit meson From b108a723b33408eb72c505ba4cc4e5d1d708c943 Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Tue, 4 Jun 2024 07:28:03 +0300 Subject: [PATCH 26/40] dev-python/dropbox: add 12.0.2 Signed-off-by: Viorel Munteanu --- dev-python/dropbox/Manifest | 1 + dev-python/dropbox/dropbox-12.0.2.ebuild | 44 ++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 dev-python/dropbox/dropbox-12.0.2.ebuild diff --git a/dev-python/dropbox/Manifest b/dev-python/dropbox/Manifest index 0f28e5ad58..a22c7acaf9 100644 --- a/dev-python/dropbox/Manifest +++ b/dev-python/dropbox/Manifest @@ -1,2 +1,3 @@ DIST dropbox-sdk-python-11.36.2.gh.tar.gz 1166700 BLAKE2B afd0592bd1e18416f91d1fd673f2b7b7f605eaab80c02a9d8535fefa7fb23c8bc6a08c191492e1ced5d4b2d17fa72e8e5b6a58ba797f170c0efb75e755a451c9 SHA512 ec27685b4e5344e706bffb68b110ef2d7b307a5865bed3e042d6835f3666d2eefca646627a07bae1a3142e5f0346865fe285b037b00f3da081eb5797f9a768f5 DIST dropbox-sdk-python-12.0.1.gh.tar.gz 1155009 BLAKE2B 615aa4650d030fbbf7e6f487c2a314f763a4b153cd94c1e2f9720c4b426bf53007e4e01883f1cde2fab25b6df8f9bc35cc376ced9100c4c023c2685366b2456c SHA512 4346ced633f07f255ac23089bb8e4ed22dbba18b25e1e36dc3c083bb4afa45a8824ac772db04cd0b679b43c08c61dcca1dfa70fbb367b3dc625d5f6647d31589 +DIST dropbox-sdk-python-12.0.2.gh.tar.gz 1155008 BLAKE2B cc0006909a204f0b9efab7605680027b144dfff5c91ddf31460884ada4948b285ff0777f19f9395a1fc447a906018c3a43b40bc7651bdbb715c597849e7ecba9 SHA512 73834c89e2dc8b129a549d082a7862ec81f731c4977c6650cc421c08b62903b78c9fa1e191a330022591e2cb0e29b825e89e2d04056e2f4e6362a168b57fec39 diff --git a/dev-python/dropbox/dropbox-12.0.2.ebuild b/dev-python/dropbox/dropbox-12.0.2.ebuild new file mode 100644 index 0000000000..d32005804c --- /dev/null +++ b/dev-python/dropbox/dropbox-12.0.2.ebuild @@ -0,0 +1,44 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +GH_PN=dropbox-sdk-python + +DESCRIPTION="The offical Dropbox SDK for Python" +HOMEPAGE="https://www.dropbox.com/developers" +# pypi does not have tests, stick with gh +SRC_URI="https://github.com/dropbox/${GH_PN}/archive/refs/tags/v${PV}.tar.gz -> ${GH_PN}-${PV}.gh.tar.gz" +S="${WORKDIR}"/${GH_PN}-${PV} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/requests[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/stone[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] +" + +# disable tests that need SCOPED_USER_DROPBOX_TOKEN +# and tests that fail +EPYTEST_DESELECT=( + test/integration/test_dropbox.py + test/unit/test_dropbox_unit.py::TestClient + test/unit/test_dropbox_unit.py::TestOAuth::test_NoRedirect_whole_flow +) + +distutils_enable_tests pytest + +python_prepare_all() { + # this is wrong + sed -i -e "s/^import mock$/from unittest import mock/" test/unit/test_dropbox_unit.py || die + + distutils-r1_python_prepare_all +} From b581d55c9d831508758ca1b51016d9245dd618a1 Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Tue, 4 Jun 2024 07:28:09 +0300 Subject: [PATCH 27/40] dev-python/dropbox: drop 12.0.1 Signed-off-by: Viorel Munteanu --- dev-python/dropbox/Manifest | 1 - dev-python/dropbox/dropbox-12.0.1.ebuild | 44 ------------------------ 2 files changed, 45 deletions(-) delete mode 100644 dev-python/dropbox/dropbox-12.0.1.ebuild diff --git a/dev-python/dropbox/Manifest b/dev-python/dropbox/Manifest index a22c7acaf9..bae8fd436a 100644 --- a/dev-python/dropbox/Manifest +++ b/dev-python/dropbox/Manifest @@ -1,3 +1,2 @@ DIST dropbox-sdk-python-11.36.2.gh.tar.gz 1166700 BLAKE2B afd0592bd1e18416f91d1fd673f2b7b7f605eaab80c02a9d8535fefa7fb23c8bc6a08c191492e1ced5d4b2d17fa72e8e5b6a58ba797f170c0efb75e755a451c9 SHA512 ec27685b4e5344e706bffb68b110ef2d7b307a5865bed3e042d6835f3666d2eefca646627a07bae1a3142e5f0346865fe285b037b00f3da081eb5797f9a768f5 -DIST dropbox-sdk-python-12.0.1.gh.tar.gz 1155009 BLAKE2B 615aa4650d030fbbf7e6f487c2a314f763a4b153cd94c1e2f9720c4b426bf53007e4e01883f1cde2fab25b6df8f9bc35cc376ced9100c4c023c2685366b2456c SHA512 4346ced633f07f255ac23089bb8e4ed22dbba18b25e1e36dc3c083bb4afa45a8824ac772db04cd0b679b43c08c61dcca1dfa70fbb367b3dc625d5f6647d31589 DIST dropbox-sdk-python-12.0.2.gh.tar.gz 1155008 BLAKE2B cc0006909a204f0b9efab7605680027b144dfff5c91ddf31460884ada4948b285ff0777f19f9395a1fc447a906018c3a43b40bc7651bdbb715c597849e7ecba9 SHA512 73834c89e2dc8b129a549d082a7862ec81f731c4977c6650cc421c08b62903b78c9fa1e191a330022591e2cb0e29b825e89e2d04056e2f4e6362a168b57fec39 diff --git a/dev-python/dropbox/dropbox-12.0.1.ebuild b/dev-python/dropbox/dropbox-12.0.1.ebuild deleted file mode 100644 index d32005804c..0000000000 --- a/dev-python/dropbox/dropbox-12.0.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 - -GH_PN=dropbox-sdk-python - -DESCRIPTION="The offical Dropbox SDK for Python" -HOMEPAGE="https://www.dropbox.com/developers" -# pypi does not have tests, stick with gh -SRC_URI="https://github.com/dropbox/${GH_PN}/archive/refs/tags/v${PV}.tar.gz -> ${GH_PN}-${PV}.gh.tar.gz" -S="${WORKDIR}"/${GH_PN}-${PV} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/requests[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/stone[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] -" - -# disable tests that need SCOPED_USER_DROPBOX_TOKEN -# and tests that fail -EPYTEST_DESELECT=( - test/integration/test_dropbox.py - test/unit/test_dropbox_unit.py::TestClient - test/unit/test_dropbox_unit.py::TestOAuth::test_NoRedirect_whole_flow -) - -distutils_enable_tests pytest - -python_prepare_all() { - # this is wrong - sed -i -e "s/^import mock$/from unittest import mock/" test/unit/test_dropbox_unit.py || die - - distutils-r1_python_prepare_all -} From f16b93e42facee8d09f213e2e988289ab0f98b26 Mon Sep 17 00:00:00 2001 From: Filip Hoffmann Date: Tue, 4 Jun 2024 08:56:44 +0200 Subject: [PATCH 28/40] dev-cpp/dpp: add 10.0.30 Signed-off-by: Filip Hoffmann --- dev-cpp/dpp/Manifest | 1 + dev-cpp/dpp/dpp-10.0.30.ebuild | 52 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 dev-cpp/dpp/dpp-10.0.30.ebuild diff --git a/dev-cpp/dpp/Manifest b/dev-cpp/dpp/Manifest index 2fbae9794b..493816edf9 100644 --- a/dev-cpp/dpp/Manifest +++ b/dev-cpp/dpp/Manifest @@ -2,3 +2,4 @@ DIST dpp-10.0.23.tar.gz 13721815 BLAKE2B abbe6849025270554f8462dcbef6adefff412ee DIST dpp-10.0.24.tar.gz 13739463 BLAKE2B 0531d9d14b943302293aac62a3972a4628487332107b77ca6d09ae39ae8a9d1cfeceae1a656790cc8699932af9c5d46a0ae5bc26885a9c29cc970388cdb60f3f SHA512 2f1e5415c121d5f19d2abb1b389512ad22c3cac6779ed897403d430b2c4e62c758ab25d46a3fd02538add711073fadd616a690b4981f3782e46c18ff05d116dc DIST dpp-10.0.25.tar.gz 14312767 BLAKE2B 52263024ad615198fe901f3cc79290e1b88c4e44c22c318fb7df2e9a3d4069611282b18650602f29f40bff3b042b16d0b8a47b8d3ff9c5b5ea89fa9514777609 SHA512 49cb6fedcb75d3dd146243f46f9e34cfe79e1c9a6ae76fc69c8c6935d9a10ccf562452311085791674ff659913befe1dc6f8a191b518d45151cb23d779396572 DIST dpp-10.0.29.tar.gz 15560520 BLAKE2B 491730da342e2db08e061ec71d5488be3c23addc4ef5ae537631a83d3a461a53f34033da72d387f8202c45d529d39ff6bcc70e8a69f94006b2e1fb607aed2d23 SHA512 fcb9b8181827fc63fb2f9aff44e697d18a0bfd94714888492a63a04e0112f42f9506bfab8181e822aa5ce85e6b6a8aa44e0774baeac3e52c3f41348cbf55a76a +DIST dpp-10.0.30.tar.gz 15726421 BLAKE2B 647571d5c7434c3b5636a66a3365d2af8b2d11c81165666d3df2b2ad36d4b61b683a8e3c7ef304fba96a4ac365365272fffa3f0d7d05f697dfe48ba7f972ced6 SHA512 4842e5e688893275e524f998bdcac1d308165a02c280f69eaa898aa8f9986a97fe687e20e3428f30777c49f1feb47905da462bbdba8c9a5ea00067e560208f91 diff --git a/dev-cpp/dpp/dpp-10.0.30.ebuild b/dev-cpp/dpp/dpp-10.0.30.ebuild new file mode 100644 index 0000000000..04c8913832 --- /dev/null +++ b/dev-cpp/dpp/dpp-10.0.30.ebuild @@ -0,0 +1,52 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Lightweight C++ Discord bot library" +HOMEPAGE="https://dpp.dev/ https://github.com/brainboxdotcc/DPP" +SRC_URI=" + https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz +" + +S="${WORKDIR}/DPP-${PV}" + +LICENSE="Apache-2.0" +# DPP is extremely ABI instable due to frequent changes in the Discord API +# See https://github.com/brainboxdotcc/DPP/issues/207#issuecomment-1007030157 +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="voice" + +RDEPEND=" + dev-libs/openssl:= + sys-libs/zlib:= + + voice? ( + dev-libs/libsodium:= + media-libs/opus + ) +" +DEPEND=" + ${RDEPEND} + + dev-cpp/nlohmann_json +" + +DOCS=( "README.md" "SECURITY.md" ) + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=true + -DBUILD_VOICE_SUPPORT="$(usex voice)" + -DRUN_LDCONFIG=false + # Tests require network access + -DDPP_BUILD_TEST=false + -DDPP_NO_VCPKG=true + -DDPP_USE_EXTERNAL_JSON=true + ) + + cmake_src_configure +} From 7c532767cd17e89226e9d9619d28c04ea43a7feb Mon Sep 17 00:00:00 2001 From: Filip Hoffmann Date: Tue, 4 Jun 2024 08:58:18 +0200 Subject: [PATCH 29/40] dev-cpp/dpp: add coroutine support via USE flag Signed-off-by: Filip Hoffmann --- dev-cpp/dpp/dpp-10.0.30.ebuild | 3 ++- dev-cpp/dpp/metadata.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-cpp/dpp/dpp-10.0.30.ebuild b/dev-cpp/dpp/dpp-10.0.30.ebuild index 04c8913832..6904bfef40 100644 --- a/dev-cpp/dpp/dpp-10.0.30.ebuild +++ b/dev-cpp/dpp/dpp-10.0.30.ebuild @@ -18,7 +18,7 @@ LICENSE="Apache-2.0" # See https://github.com/brainboxdotcc/DPP/issues/207#issuecomment-1007030157 SLOT="0/${PV}" KEYWORDS="~amd64" -IUSE="voice" +IUSE="voice coro" RDEPEND=" dev-libs/openssl:= @@ -46,6 +46,7 @@ src_configure() { -DDPP_BUILD_TEST=false -DDPP_NO_VCPKG=true -DDPP_USE_EXTERNAL_JSON=true + -DDPP_CORO="$(usex coro)" ) cmake_src_configure diff --git a/dev-cpp/dpp/metadata.xml b/dev-cpp/dpp/metadata.xml index fe07685949..1316324eb7 100644 --- a/dev-cpp/dpp/metadata.xml +++ b/dev-cpp/dpp/metadata.xml @@ -10,6 +10,7 @@ Enable voice-chat support + Enable coroutine support brainboxdotcc/dpp From d47e831359fc4ec7d5de2a62796a9788450f098f Mon Sep 17 00:00:00 2001 From: Filip Hoffmann Date: Tue, 4 Jun 2024 08:59:35 +0200 Subject: [PATCH 30/40] dev-cpp/dpp: fix copyright header Signed-off-by: Filip Hoffmann --- dev-cpp/dpp/dpp-10.0.30.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/dpp/dpp-10.0.30.ebuild b/dev-cpp/dpp/dpp-10.0.30.ebuild index 6904bfef40..bcd0165583 100644 --- a/dev-cpp/dpp/dpp-10.0.30.ebuild +++ b/dev-cpp/dpp/dpp-10.0.30.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 From bb131bb149bdd812601c3494a57e6017b63f61e6 Mon Sep 17 00:00:00 2001 From: Filip Hoffmann Date: Tue, 4 Jun 2024 09:03:21 +0200 Subject: [PATCH 31/40] dev-cpp/dpp: add myself as a maintainer Signed-off-by: Filip Hoffmann --- dev-cpp/dpp/metadata.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev-cpp/dpp/metadata.xml b/dev-cpp/dpp/metadata.xml index 1316324eb7..bfac808630 100644 --- a/dev-cpp/dpp/metadata.xml +++ b/dev-cpp/dpp/metadata.xml @@ -8,6 +8,10 @@ samuel@seals-are-bouncy.tech + + Filip Hoffmann + folosp2@gmail.com + Enable voice-chat support Enable coroutine support From 3e6390be5c1d89b3c05ddcc5923cbfa0e7463fab Mon Sep 17 00:00:00 2001 From: Vitaly Zdanevich Date: Tue, 4 Jun 2024 12:14:00 +0400 Subject: [PATCH 32/40] games-strategy/gigalomania: new package Signed-off-by: Vitaly Zdanevich --- games-strategy/gigalomania/Manifest | 1 + .../gigalomania/gigalomania-1.0.1.ebuild | 43 +++++++++++++++++++ games-strategy/gigalomania/metadata.xml | 11 +++++ 3 files changed, 55 insertions(+) create mode 100644 games-strategy/gigalomania/Manifest create mode 100644 games-strategy/gigalomania/gigalomania-1.0.1.ebuild create mode 100644 games-strategy/gigalomania/metadata.xml diff --git a/games-strategy/gigalomania/Manifest b/games-strategy/gigalomania/Manifest new file mode 100644 index 0000000000..1839391f1e --- /dev/null +++ b/games-strategy/gigalomania/Manifest @@ -0,0 +1 @@ +DIST gigalomaniasrc.zip 26975134 BLAKE2B bada94b266e30e54e4f0929673c5d9d53f25a69e84516d6f7fe5905b627a73501714b8ac307488b3ef6872b85023f67d0c862b6e58b40c25ea2091846803fd0d SHA512 255eb3d5ce566fbff42c1075c850cd2c7e2490f91bcf97954aa36ad9fb8bb787c1e817e682b0954e53c758c79ec76c431bedbf37b8197764ee40b48d09e75bcc diff --git a/games-strategy/gigalomania/gigalomania-1.0.1.ebuild b/games-strategy/gigalomania/gigalomania-1.0.1.ebuild new file mode 100644 index 0000000000..5b0b110b03 --- /dev/null +++ b/games-strategy/gigalomania/gigalomania-1.0.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 2024 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit wrapper + +DESCRIPTION="Libra clone of Mega-Lo-Mania (original from ~1990), supports original resources" +HOMEPAGE="https://gigalomania.sourceforge.net" +SRC_URI="http://launchpad.net/$PN/trunk/$PV/+download/${PN}src.zip" + +S="$WORKDIR/${PN}src" + +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND=" + app-arch/unzip + media-libs/libsdl2 + media-libs/sdl2-image + media-libs/sdl2-mixer +" + +src_compile() { + emake +} + +src_install() { + DESTDIR="$D" emake install + + dosym -r /opt/$PN/$PN /usr/bin/$PN + + make_wrapper $PN "./$PN" /opt/$PN/ +} + +pkg_postinst() { + einfo "Supports using the graphics from Mega-Lo-Mania (from the Amiga version - should be in hard disk format, e.g., Whdload version) if you have that game." + einfo "The data/ folder should be copied into the main gigalomania/ folder" + einfo "and then rename the gfx/ folder to something else (e.g., xgfx/)." + einfo "It's up to you to legally obtain the game if you want this feature!" +} diff --git a/games-strategy/gigalomania/metadata.xml b/games-strategy/gigalomania/metadata.xml new file mode 100644 index 0000000000..00bbb6c0e4 --- /dev/null +++ b/games-strategy/gigalomania/metadata.xml @@ -0,0 +1,11 @@ + + + + + Vitaly Zdanevich + zdanevich.vitaly@ya.ru + + + gigalomania + + From c58da28fb0735a1fbab8159d9599ca2a02977441 Mon Sep 17 00:00:00 2001 From: Vitaly Zdanevich Date: Tue, 4 Jun 2024 12:14:30 +0400 Subject: [PATCH 33/40] games-strategy/gigalomania: typo Libra -> Libre Signed-off-by: Vitaly Zdanevich --- games-strategy/gigalomania/gigalomania-1.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-strategy/gigalomania/gigalomania-1.0.1.ebuild b/games-strategy/gigalomania/gigalomania-1.0.1.ebuild index 5b0b110b03..fe31e9b41e 100644 --- a/games-strategy/gigalomania/gigalomania-1.0.1.ebuild +++ b/games-strategy/gigalomania/gigalomania-1.0.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit wrapper -DESCRIPTION="Libra clone of Mega-Lo-Mania (original from ~1990), supports original resources" +DESCRIPTION="Libre clone of Mega-Lo-Mania (original from ~1990), supports original resources" HOMEPAGE="https://gigalomania.sourceforge.net" SRC_URI="http://launchpad.net/$PN/trunk/$PV/+download/${PN}src.zip" From af69ac831050a70f28fb4b59986a002794ef4153 Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 4 Jun 2024 10:37:00 +0200 Subject: [PATCH 34/40] sci-electronics/logic-bin: drop 2.4.9 Signed-off-by: David Roman --- sci-electronics/logic-bin/Manifest | 1 - .../logic-bin/logic-bin-2.4.9.ebuild | 26 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 sci-electronics/logic-bin/logic-bin-2.4.9.ebuild diff --git a/sci-electronics/logic-bin/Manifest b/sci-electronics/logic-bin/Manifest index b743ce4a22..0f8c9727c0 100644 --- a/sci-electronics/logic-bin/Manifest +++ b/sci-electronics/logic-bin/Manifest @@ -1,2 +1 @@ DIST Logic-2.4.14-linux-x64.AppImage 187591212 BLAKE2B 744e3266e8545c700ac2fd5ad31f9df569a2d5fe5b796a88934b7c6b730dd6282f44827748bc134960babebbf47ab9dfc12fb078d3a5b38f3eff22d1e835c2b0 SHA512 c32626eb359cad568a5871e29b4aa291294f92fd21052c80a3a21ed3a49ac3803cf0bee0af26a1b9f53e95ad47e4f71c86b241699dee59fefcd24e056de5c4d5 -DIST Logic-2.4.9-linux-x64.AppImage 170151103 BLAKE2B b37b727064ba31abd5ea114e1cb43e1b4a1c23bce78b9387e2bf399a05ebe01a6d25df7e2e43a5bfb0c2210f24e2c584030e5576e3433cce87e09c41f1df82a7 SHA512 91fcdde099a083d825f575e855469b14377e3dab6ea80a6b0b5bcd4e8da334945d727199fde4dd3b6b5f49568cb6814b2e0ded3731aa03b76baab37430b4d7d4 diff --git a/sci-electronics/logic-bin/logic-bin-2.4.9.ebuild b/sci-electronics/logic-bin/logic-bin-2.4.9.ebuild deleted file mode 100644 index 229d3d50ab..0000000000 --- a/sci-electronics/logic-bin/logic-bin-2.4.9.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2023 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Saleae logic analyzer" -HOMEPAGE="https://www.saleae.com" - -SRC_URI="https://downloads.saleae.com/logic2/Logic-${PV}-linux-x64.AppImage" - -S="${WORKDIR}" -LICENSE="Saleae" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="bindist mirror strip" - -QA_PREBUILT="*" - -src_unpack() { - cp "${DISTDIR}/Logic-${PV}-linux-x64.AppImage" saleae-logic || die -} - -src_install() { - dobin saleae-logic -} From 225966e984abb31f1e5ddcf256fc260289b02435 Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 4 Jun 2024 10:37:34 +0200 Subject: [PATCH 35/40] sci-electronics/logic-bin: add missing RDEPEND Closes: https://bugs.gentoo.org/933181 Signed-off-by: David Roman --- sci-electronics/logic-bin/logic-bin-2.4.14.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sci-electronics/logic-bin/logic-bin-2.4.14.ebuild b/sci-electronics/logic-bin/logic-bin-2.4.14.ebuild index 229d3d50ab..2f49623ae4 100644 --- a/sci-electronics/logic-bin/logic-bin-2.4.14.ebuild +++ b/sci-electronics/logic-bin/logic-bin-2.4.14.ebuild @@ -15,6 +15,8 @@ KEYWORDS="~amd64" RESTRICT="bindist mirror strip" +RDEPEND="sys-libs/zlib" + QA_PREBUILT="*" src_unpack() { From 4d0d2fdc1c0dc57e50c355dd0d8956bc11b7bdd9 Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 4 Jun 2024 10:41:02 +0200 Subject: [PATCH 36/40] gui-apps/showmethekey: drop 1.11.1 Signed-off-by: David Roman --- gui-apps/showmethekey/Manifest | 1 - .../showmethekey/showmethekey-1.11.1.ebuild | 34 ------------------- 2 files changed, 35 deletions(-) delete mode 100644 gui-apps/showmethekey/showmethekey-1.11.1.ebuild diff --git a/gui-apps/showmethekey/Manifest b/gui-apps/showmethekey/Manifest index 7617402cbd..d557b63235 100644 --- a/gui-apps/showmethekey/Manifest +++ b/gui-apps/showmethekey/Manifest @@ -1,2 +1 @@ -DIST showmethekey-1.11.1.tar.gz 5268069 BLAKE2B dcd00aa3e424ce30f56dfeb07f024df93173f8c1fe8dda4494de4577605fd46f9c28e5f02ce784c1b92e2f1e64259cb9955622f2fec60fad1bedd31ad57976a1 SHA512 afd9759a9a01a4487a9a0915a645020e89088afd1a2d910fcd19cb0e7142c4005574eea5f3265e6321844275c026a3ebb4c6d9a596229496c0e3c636fdd5139d DIST showmethekey-1.12.0.tar.gz 5269307 BLAKE2B b5c3f84456c84b3906a619fdc88a4c4605592562d40f05e9d0ab75aa116604812c60f89b9a681eeea79f53f4420f20b526478dd667da2ea90006911b07917fe3 SHA512 bba78950da4d7e834172cdb8e6daf58f4946e21cda349e7c94fefd86dca0416459bbaa130c10925d90c1239abb41f8b3d0641fb9b8e2d19824eec512d1ec3e84 diff --git a/gui-apps/showmethekey/showmethekey-1.11.1.ebuild b/gui-apps/showmethekey/showmethekey-1.11.1.ebuild deleted file mode 100644 index a405f25940..0000000000 --- a/gui-apps/showmethekey/showmethekey-1.11.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome2 meson - -DESCRIPTION="Show keys you typed on screen." -HOMEPAGE="https://showmethekey.alynx.one/" -SRC_URI="https://github.com/AlynxZhou/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" - dev-libs/glib - dev-libs/json-glib - dev-libs/libevdev - dev-libs/libinput - dev-util/gtk-update-icon-cache - gui-libs/gtk:4 - gui-libs/libadwaita - virtual/udev - x11-libs/cairo - x11-libs/libxkbcommon - x11-libs/pango -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i 's/gtk4-update-icon-/gtk-update-icon-/g' meson.build || die -} From de0d832f6d0bff5349e0b256c19f846a3dfcc304 Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 4 Jun 2024 10:49:10 +0200 Subject: [PATCH 37/40] dev-embedded/esp-idf: drop 5.2 Signed-off-by: David Roman --- dev-embedded/esp-idf/Manifest | 1 - dev-embedded/esp-idf/esp-idf-5.2.ebuild | 145 ------------------ .../allow-system-install-esp-idf-5.0.2.patch | 39 ----- 3 files changed, 185 deletions(-) delete mode 100644 dev-embedded/esp-idf/esp-idf-5.2.ebuild delete mode 100644 dev-embedded/esp-idf/files/allow-system-install-esp-idf-5.0.2.patch diff --git a/dev-embedded/esp-idf/Manifest b/dev-embedded/esp-idf/Manifest index 883f507997..46f0627658 100644 --- a/dev-embedded/esp-idf/Manifest +++ b/dev-embedded/esp-idf/Manifest @@ -1,5 +1,4 @@ DIST esp-idf-5.2.1.zip 1300409360 BLAKE2B a55ee7852165bd14fcc72fd0bc9c8f1dbfeb3a0f86766b5354112c54d3081709d192b87e368bf31502629e6a85cd9a75055fb0a20ee20a755f9d3951fb14b3ce SHA512 bbcfcbbec38ffc0f7d07c57bb8a3431e0237d0f61a02b176bfb222b71cff0f3065fadbdcf43221b33f14565fc646a3e287ce5fde7d5d7dae2d036b2e11d113e4 -DIST esp-idf-5.2.zip 1287699728 BLAKE2B d91d69da49423afa1c5345053af1da65d0c2d610f72a9a0c30a56bf9d4d2a9f10d2d30a2187e6db63953d5b9547877240cda8ff2d31032e7b4b9f2fad74c21e9 SHA512 fbbdd08aff3fe310638312d46a61466f97a039906a7766cc4ab5343b41a66f742b065b375695f8b2e749104bb7214eb31a1357e24c231048fc03fc81a615c90e DIST openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz 2193783 BLAKE2B 8f94d628bb415ab75daa85d51c94e8d2a9a1d9399b706963b8bd663d145e440a9e86d7f29000f196d1c9e2585c24882739a80ba29c5b83a96ada384f262f0941 SHA512 8ca3c932c5b7b236133c2a305d95b8059d9db14640efc077e34c256390da05e177479a973aa974005f34fba4a74119dcdb59d876344bdef8940b58c3c948c9f7 DIST riscv32-esp-elf-13.2.0_20230928-x86_64-linux-gnu.tar.xz 143575940 BLAKE2B a888291f4b2c482cf2f3620519fc02607ba22d99f8d02e20415daf58cf2eecfa96144b0fc6fdbf98b3569ff0e5755d854650735e30cbfab56701a3d61627ddba SHA512 71b5def3d291eb80ab98adfbd23626ea4c6c5d8b30ab34a9f8a100013df58c4867044b974d8ced9405b5b45b26232835806746814051f55b650dde82bffe40f4 DIST xtensa-esp-elf-13.2.0_20230928-x86_64-linux-gnu.tar.xz 112588084 BLAKE2B 9b462426d09f0071d205066d6e9897d035a3c65bef6c9bf2cccefdbcbb3629af38cec5b5411e5f32c1e0b19d51c78675e264544c1f730a1b0554262c9b6dd7d1 SHA512 60e718d8bc4007966d4b66ca57a56b144ac6614e6a283ceb6681a29aab60f1f621049e3b691440e3da38a47d7260467a06c91c190d383aeb5c915df2dd908b94 diff --git a/dev-embedded/esp-idf/esp-idf-5.2.ebuild b/dev-embedded/esp-idf/esp-idf-5.2.ebuild deleted file mode 100644 index 906a2a6568..0000000000 --- a/dev-embedded/esp-idf/esp-idf-5.2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11,12} ) - -VER="13.2.0_20230928" - -CROSSTOOL_URL="https://github.com/espressif/crosstool-NG/releases/download/esp-${VER}" - -inherit python-r1 - -DESCRIPTION="Espressif IoT Development Framework" -HOMEPAGE="https://www.espressif.com/" - -# https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-linux-amd64-2.28.51-esp-20191205.tar.gz -SRC_URI="https://dl.espressif.com/github_assets/espressif/${PN}/releases/download/v${PV}/${PN}-v${PV}.zip -> ${P}.zip - https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz - https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v12.1_20231023/xtensa-esp-elf-gdb-12.1_20231023-x86_64-linux-gnu.tar.gz - ${CROSSTOOL_URL}/xtensa-esp-elf-${VER}-x86_64-linux-gnu.tar.xz - riscv32? ( ${CROSSTOOL_URL}/riscv32-esp-elf-${VER}-x86_64-linux-gnu.tar.xz )" -#https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-linux-amd64.tar.gz - -S="${WORKDIR}/${PN}-v${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="riscv32" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="strip" - -BDEPEND="app-arch/unzip" -RDEPEND=" - ${PYTHON_DEPS} - - dev-libs/libusb:1 - dev-python/click[${PYTHON_USEDEP}] - dev-python/pyserial[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/pyelftools[${PYTHON_USEDEP}] - dev-embedded/esp-coredump[${PYTHON_USEDEP}] - dev-embedded/esptool[${PYTHON_USEDEP}] - dev-embedded/esp-idf-kconfig[${PYTHON_USEDEP}] - dev-embedded/esp-idf-monitor[${PYTHON_USEDEP}] - dev-embedded/esp-idf-panic-decoder[${PYTHON_USEDEP}] - dev-embedded/esp-idf-size[${PYTHON_USEDEP}] - dev-embedded/freertos-gdb[${PYTHON_USEDEP}] - dev-embedded/idf-component-manager[${PYTHON_USEDEP}] -" - -QA_PREBUILT="opt/* usr/lib* usr/share/esp-idf/*" -QA_PRESTRIPPED="opt/*" - -PATCHES=( - "${FILESDIR}/allow-system-install-${PN}-5.1.2.patch" -) - -install_tool() { - shopt -s globstar - - into /opt/${1} - - if [[ -d "../${1}/lib" ]]; then - if stat *.so &>/dev/null; then - for i in ../${1}/lib/**/*.so*; do - dolib.so ${i} - done - fi - - if stat *.a &>/dev/null; then - for i in ../${1}/lib/**/*.a*; do - dolib.a ${i} - done - fi - - insinto /opt/${1}/lib - doins -r ../${1}/lib/* - fi - - exeinto /opt/${1}/bin - doexe ../${1}/bin/* - ( - cd ../${1} - for i in libexec/**/*; do - exeinto /opt/${1}/$(dirname ${i}) - if [[ -x "${i}" && ! -d "${i}" ]]; then - doexe ${i} - fi - done - - if [[ -d "include" ]]; then - insinto /opt/${1} - doins -r include - fi - - if [[ -d "share" ]]; then - insinto /opt/${1} - doins -r share - fi - ) - - ( - cd "${D}"/opt/${1}/bin/ || die - for i in *; do - dodir /opt/bin - cd "${D}"/opt/bin || die - dosym ../${1}/bin/${i} /opt/bin/${i} - done - ) - - shopt -u globstar -} - -src_install() { - echo -e "#!/bin/sh\npython /usr/share/${PN}/tools/idf.py \"\$@\"" > idf - dobin idf - - install_tool xtensa-esp-elf - install_tool xtensa-esp-elf/xtensa-esp-elf - - if use riscv32; then - install_tool riscv32-esp-elf - install_tool riscv32-esp-elf/riscv32-esp-elf - fi - - install_tool openocd-esp32 - - # Remove unsupported python versions - rm "${WORKDIR}"/xtensa-esp-elf-gdb/bin/xtensa-esp-elf-gdb-3.{6..10} || die - install_tool xtensa-esp-elf-gdb - - echo "IDF_PATH=/usr/share/${PN}" > 99esp-idf || die - doenvd 99esp-idf - - insinto /usr/share/${PN} - - rm -r .git || die - find . -name ".git" -exec rm -rf {} \; || die - doins -r . -} diff --git a/dev-embedded/esp-idf/files/allow-system-install-esp-idf-5.0.2.patch b/dev-embedded/esp-idf/files/allow-system-install-esp-idf-5.0.2.patch deleted file mode 100644 index 1bd97c6f41..0000000000 --- a/dev-embedded/esp-idf/files/allow-system-install-esp-idf-5.0.2.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/tools/idf.py b/tools/idf.py -index 10226bcfef..5f4556f71a 100755 ---- a/tools/idf.py -+++ b/tools/idf.py -@@ -31,16 +31,12 @@ sys.dont_write_bytecode = True - - import python_version_checker # noqa: E402 - --try: -- from idf_py_actions.errors import FatalError # noqa: E402 -- from idf_py_actions.tools import (PROG, SHELL_COMPLETE_RUN, SHELL_COMPLETE_VAR, PropertyDict, # noqa: E402 -- debug_print_idf_version, get_target, merge_action_lists, print_warning) -- if os.getenv('IDF_COMPONENT_MANAGER') != '0': -- from idf_component_manager import idf_extensions --except ImportError: -- # For example, importing click could cause this. -- print('Please use idf.py only in an ESP-IDF shell environment.', file=sys.stderr) -- sys.exit(1) -+from idf_py_actions.errors import FatalError # noqa: E402 -+from idf_py_actions.tools import (PROG, SHELL_COMPLETE_RUN, SHELL_COMPLETE_VAR, PropertyDict, # noqa: E402 -+ debug_print_idf_version, get_target, merge_action_lists, print_warning) -+ -+if os.getenv('IDF_COMPONENT_MANAGER') != '0': -+ from idf_component_manager import idf_extensions - - # Use this Python interpreter for any subprocesses we launch - PYTHON = sys.executable -diff --git a/tools/idf_tools.py b/tools/idf_tools.py -index 8a17ed224d..2103e9d60a 100755 ---- a/tools/idf_tools.py -+++ b/tools/idf_tools.py -@@ -2113,6 +2113,7 @@ def action_install_python_env(args): # type: ignore - - - def action_check_python_dependencies(args): # type: ignore -+ return - use_constraints = not args.no_constraints - req_paths = get_requirements('') # no new features -> just detect the existing ones - From 91f9d185f9748ffddb9c8e40ed7a9a1e068ed89c Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 4 Jun 2024 11:16:24 +0200 Subject: [PATCH 38/40] dev-embedded/esp-idf: add 5.2.2 Signed-off-by: David Roman --- dev-embedded/esp-idf/Manifest | 4 + dev-embedded/esp-idf/esp-idf-5.2.2.ebuild | 155 ++++++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 dev-embedded/esp-idf/esp-idf-5.2.2.ebuild diff --git a/dev-embedded/esp-idf/Manifest b/dev-embedded/esp-idf/Manifest index 46f0627658..efac7275b6 100644 --- a/dev-embedded/esp-idf/Manifest +++ b/dev-embedded/esp-idf/Manifest @@ -1,5 +1,9 @@ DIST esp-idf-5.2.1.zip 1300409360 BLAKE2B a55ee7852165bd14fcc72fd0bc9c8f1dbfeb3a0f86766b5354112c54d3081709d192b87e368bf31502629e6a85cd9a75055fb0a20ee20a755f9d3951fb14b3ce SHA512 bbcfcbbec38ffc0f7d07c57bb8a3431e0237d0f61a02b176bfb222b71cff0f3065fadbdcf43221b33f14565fc646a3e287ce5fde7d5d7dae2d036b2e11d113e4 +DIST esp-idf-5.2.2.zip 1488330027 BLAKE2B 00ba4c6f6a08ff1a8a398b8fea3dff1cb23e9f61435d9b69035df81579b65a026030f7fc67bb1b43c90484b5c4cfbd5143383b4171f0fed70931e58718c906fa SHA512 35b2b6ab028a9075702e7441b0354e7c30deaabc97da1b758a6206e2c78760b415ed5d60cbaf7b90b5fdce95f9faeb99d6ae1ad4991635024e2a3cfcbc8c38f2 DIST openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz 2193783 BLAKE2B 8f94d628bb415ab75daa85d51c94e8d2a9a1d9399b706963b8bd663d145e440a9e86d7f29000f196d1c9e2585c24882739a80ba29c5b83a96ada384f262f0941 SHA512 8ca3c932c5b7b236133c2a305d95b8059d9db14640efc077e34c256390da05e177479a973aa974005f34fba4a74119dcdb59d876344bdef8940b58c3c948c9f7 +DIST openocd-esp32-linux-amd64-0.12.0-esp32-20240318.tar.gz 2252682 BLAKE2B fbec39f77c7e2d423eacaf45d0f8c3373e24c65c3d5e2db0edf5b952945edcc838dd41f8c852ff0b2104dce62184b3b0803014e53d8dd4dcf6427955ec18f194 SHA512 5acb5d90740ea8b54be57fe80956c2bbcc6bb3c48dc4969043a7d49da7e9135ede4add8bdf8f7d772681867aca1faa72594fa8f70e7e8d2bc7ed93128ff1ec8d DIST riscv32-esp-elf-13.2.0_20230928-x86_64-linux-gnu.tar.xz 143575940 BLAKE2B a888291f4b2c482cf2f3620519fc02607ba22d99f8d02e20415daf58cf2eecfa96144b0fc6fdbf98b3569ff0e5755d854650735e30cbfab56701a3d61627ddba SHA512 71b5def3d291eb80ab98adfbd23626ea4c6c5d8b30ab34a9f8a100013df58c4867044b974d8ced9405b5b45b26232835806746814051f55b650dde82bffe40f4 +DIST riscv32-esp-elf-gdb-14.2_20240403-x86_64-linux-gnu.tar.gz 30707431 BLAKE2B 99809fbd5abe99c4890fbf4edd964ee53bc9269b9bb15f487316d0092a9d7aae9d3f9f61f7597f5721aec4f95813908c8ce6a3f6f97cd453d1610a5caa7dc42e SHA512 1ad4854c53f435b08d634f8e5e1a9169037745684b13972876176483badc7ebf5a6c38109e7ac5c3f484df76e82bf790244661ac70b1e52dd3b2fc8a4956e5ff DIST xtensa-esp-elf-13.2.0_20230928-x86_64-linux-gnu.tar.xz 112588084 BLAKE2B 9b462426d09f0071d205066d6e9897d035a3c65bef6c9bf2cccefdbcbb3629af38cec5b5411e5f32c1e0b19d51c78675e264544c1f730a1b0554262c9b6dd7d1 SHA512 60e718d8bc4007966d4b66ca57a56b144ac6614e6a283ceb6681a29aab60f1f621049e3b691440e3da38a47d7260467a06c91c190d383aeb5c915df2dd908b94 DIST xtensa-esp-elf-gdb-12.1_20231023-x86_64-linux-gnu.tar.gz 36942094 BLAKE2B ecb04aacb864ad625d603b59fb39df9e76ff63cbbab39fa2370154c939e5113e56fc7eeff03411c33d73adf05376531f8d107c6da55e5b619390b5272d4f1ad5 SHA512 7afee5aa9919420d847d5dc351598ba7a0ba41c61e20647501b62d83c65868fd1673f45065b0563204cd30049e5dcceb3a0c095f7f0382d7166904ee202ea730 +DIST xtensa-esp-elf-gdb-14.2_20240403-x86_64-linux-gnu.tar.gz 31010320 BLAKE2B dcca888811260e86f9cde19ee1a2e7737c73de6a8060d100a362a4c41a606779b82cb04ff62184c5dfa226e6ac9b81b018f4da30e748cbcd644a80ff2122b86a SHA512 8b224393345b45124d5f0698e01e8e465d785c62cea6845eefd7ff852463966dc13ae94f6edb9a6b16871a6cfaa43b4d275740173579994d352303359c122deb diff --git a/dev-embedded/esp-idf/esp-idf-5.2.2.ebuild b/dev-embedded/esp-idf/esp-idf-5.2.2.ebuild new file mode 100644 index 0000000000..c100d333ae --- /dev/null +++ b/dev-embedded/esp-idf/esp-idf-5.2.2.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11,12} ) + +VER="13.2.0_20230928" +GDB_VER="14.2_20240403" + +CROSSTOOL_URL="https://github.com/espressif/crosstool-NG/releases/download/esp-${VER}" + +inherit python-r1 + +DESCRIPTION="Espressif IoT Development Framework" +HOMEPAGE="https://www.espressif.com/" + +# https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-linux-amd64-2.28.51-esp-20191205.tar.gz +SRC_URI="https://dl.espressif.com/github_assets/espressif/${PN}/releases/download/v${PV}/${PN}-v${PV}.zip -> ${P}.zip + https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20240318/openocd-esp32-linux-amd64-0.12.0-esp32-20240318.tar.gz + https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v${GDB_VER}/xtensa-esp-elf-gdb-${GDB_VER}-x86_64-linux-gnu.tar.gz" +SRC_URI+=" ${CROSSTOOL_URL}/xtensa-esp-elf-${VER}-x86_64-linux-gnu.tar.xz" +SRC_URI+=" riscv32? ( + ${CROSSTOOL_URL}/riscv32-esp-elf-${VER}-x86_64-linux-gnu.tar.xz + https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v${GDB_VER}/riscv32-esp-elf-gdb-${GDB_VER}-x86_64-linux-gnu.tar.gz +)" + +#https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-linux-amd64.tar.gz + +S="${WORKDIR}/${PN}-v${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="riscv32" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND="app-arch/unzip" +RDEPEND=" + ${PYTHON_DEPS} + + dev-libs/libusb:1 + dev-python/click[${PYTHON_USEDEP}] + dev-python/pyserial[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/pyelftools[${PYTHON_USEDEP}] + dev-embedded/esp-coredump[${PYTHON_USEDEP}] + dev-embedded/esptool[${PYTHON_USEDEP}] + dev-embedded/esp-idf-kconfig[${PYTHON_USEDEP}] + dev-embedded/esp-idf-monitor[${PYTHON_USEDEP}] + dev-embedded/esp-idf-panic-decoder[${PYTHON_USEDEP}] + dev-embedded/esp-idf-size[${PYTHON_USEDEP}] + dev-embedded/freertos-gdb[${PYTHON_USEDEP}] + dev-embedded/idf-component-manager[${PYTHON_USEDEP}] + sys-libs/zlib +" + +RESTRICT="strip" + +QA_PREBUILT="opt/* usr/lib* usr/share/esp-idf/*" +QA_PRESTRIPPED="opt/*" + +PATCHES=( + "${FILESDIR}/allow-system-install-${PN}-5.1.2.patch" +) + +install_tool() { + shopt -s globstar + + into /opt/${1} + + if [[ -d "../${1}/lib" ]]; then + if stat *.so &>/dev/null; then + for i in ../${1}/lib/**/*.so*; do + dolib.so ${i} + done + fi + + if stat *.a &>/dev/null; then + for i in ../${1}/lib/**/*.a*; do + dolib.a ${i} + done + fi + + insinto /opt/${1}/lib + doins -r ../${1}/lib/* + fi + + exeinto /opt/${1}/bin + doexe ../${1}/bin/* + ( + cd ../${1} + for i in libexec/**/*; do + exeinto /opt/${1}/$(dirname ${i}) + if [[ -x "${i}" && ! -d "${i}" ]]; then + doexe ${i} + fi + done + + if [[ -d "include" ]]; then + insinto /opt/${1} + doins -r include + fi + + if [[ -d "share" ]]; then + insinto /opt/${1} + doins -r share + fi + ) + + ( + cd "${D}"/opt/${1}/bin/ || die + for i in *; do + dodir /opt/bin + cd "${D}"/opt/bin || die + dosym ../${1}/bin/${i} /opt/bin/${i} + done + ) + + shopt -u globstar +} + +src_install() { + echo -e "#!/bin/sh\npython /usr/share/${PN}/tools/idf.py \"\$@\"" > idf + dobin idf + + install_tool xtensa-esp-elf + install_tool xtensa-esp-elf/xtensa-esp-elf + + if use riscv32; then + install_tool riscv32-esp-elf + install_tool riscv32-esp-elf/riscv32-esp-elf + fi + + install_tool openocd-esp32 + + # Remove unsupported python versions + rm "${WORKDIR}"/xtensa-esp-elf-gdb/bin/xtensa-esp-elf-gdb-3.{8..10} || die + install_tool xtensa-esp-elf-gdb + if use riscv32; then + rm "${WORKDIR}"/riscv32-esp-elf-gdb/bin/xtensa-esp-elf-gdb-3.{8..10} || die + install_tool riscv32-esp-elf-gdb + fi + + echo "IDF_PATH=/usr/share/${PN}" > 99esp-idf || die + doenvd 99esp-idf + + insinto /usr/share/${PN} + + rm -r .git || die + find . -name ".git" -exec rm -rf {} \; || die + doins -r . +} From 044f1412b145c8b2c67b762a4338e10821ddf180 Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 4 Jun 2024 11:17:14 +0200 Subject: [PATCH 39/40] dev-embedded/esp-idf: add missing RDEPEND Closes: https://bugs.gentoo.org/932344 Signed-off-by: David Roman --- dev-embedded/esp-idf/esp-idf-5.2.1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-embedded/esp-idf/esp-idf-5.2.1.ebuild b/dev-embedded/esp-idf/esp-idf-5.2.1.ebuild index f6219e94f6..a7de0c9cd5 100644 --- a/dev-embedded/esp-idf/esp-idf-5.2.1.ebuild +++ b/dev-embedded/esp-idf/esp-idf-5.2.1.ebuild @@ -50,6 +50,7 @@ RDEPEND=" dev-embedded/esp-idf-size[${PYTHON_USEDEP}] dev-embedded/freertos-gdb[${PYTHON_USEDEP}] dev-embedded/idf-component-manager[${PYTHON_USEDEP}] + sys-libs/zlib " RESTRICT="strip" From 3202c15b42e29591bf18a6b203f692f4f6e3893b Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 4 Jun 2024 11:18:13 +0200 Subject: [PATCH 40/40] dev-embedded/esp-idf: remove unused USE flags Signed-off-by: David Roman --- dev-embedded/esp-idf/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/dev-embedded/esp-idf/metadata.xml b/dev-embedded/esp-idf/metadata.xml index 97ea39c78f..ed8aadb34c 100644 --- a/dev-embedded/esp-idf/metadata.xml +++ b/dev-embedded/esp-idf/metadata.xml @@ -6,9 +6,6 @@ David Roman - Enable support for esp32 - Enable support for esp32s2 - Enable support for esp32s3 Enable support for riscv32