From caf3b755ac6cd4f15773fc9bb309db010b25befc Mon Sep 17 00:00:00 2001 From: Eli Burch Date: Tue, 18 Jun 2024 09:30:49 -0700 Subject: [PATCH 01/13] net-wireless/sdrpp: Patch out problem compiler flags Closes: https://bugs.gentoo.org/934413 Signed-off-by: Eli Burch --- .../files/sdrpp-1.2.0_pre20240607-lib64.patch | 10 +++++ ....0_pre20240607-remove-compiler-flags.patch | 43 +++++++++++++++++++ .../sdrpp/sdrpp-1.2.0_pre20240607.ebuild | 6 ++- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch create mode 100644 net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch diff --git a/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch new file mode 100644 index 0000000000..4aadaf719c --- /dev/null +++ b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch @@ -0,0 +1,10 @@ +# Patch lib directory +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -167,4 +167,4 @@ set(CORE_FILES ${RUNTIME_OUTPUT_DIRECTORY} PARENT_SCOPE) + # cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:/dev/vcpkg/scripts/buildsystems/vcpkg.cmake" + + # Install directives +-install(TARGETS sdrpp_core DESTINATION lib) +\ No newline at end of file ++install(TARGETS sdrpp_core DESTINATION lib64) diff --git a/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch new file mode 100644 index 0000000000..f37a443124 --- /dev/null +++ b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch @@ -0,0 +1,43 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0726e57..af67d19 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -85,9 +85,9 @@ else() + if (MSVC) + set(SDRPP_COMPILER_FLAGS /O2 /Ob2 /std:c++17 /EHsc) + elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(SDRPP_COMPILER_FLAGS -O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) ++ set(SDRPP_COMPILER_FLAGS -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) + else () +- set(SDRPP_COMPILER_FLAGS -O3 -std=c++17) ++ set(SDRPP_COMPILER_FLAGS -std=c++17) + endif () + endif() + set(SDRPP_MODULE_COMPILER_FLAGS ${SDRPP_COMPILER_FLAGS}) +@@ -354,4 +354,4 @@ endif () + configure_file(${CMAKE_SOURCE_DIR}/cmake_uninstall.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake @ONLY) + add_custom_target(uninstall ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) + +-# Create headers target +\ No newline at end of file ++# Create headers target +diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt +index 7fce281..5a26430 100644 +--- a/core/libcorrect/CMakeLists.txt ++++ b/core/libcorrect/CMakeLists.txt +@@ -27,12 +27,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") + endif() + else() + if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + else() +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + endif() + if(CMAKE_BUILD_TYPE STREQUAL "Profiling") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g3") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3") + endif() + endif() + endif(MSVC) diff --git a/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild b/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild index cac3f44497..f6d3016c4e 100644 --- a/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild +++ b/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild @@ -61,6 +61,10 @@ DEPEND="sci-libs/fftw " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch" +) + src_unpack(){ default mv SDRPlusPlus* "${P}" || die @@ -69,7 +73,7 @@ src_unpack(){ src_prepare(){ if [ "${ARCH}" = "amd64" ]; then - eapply "${FILESDIR}/lib64.patch" + eapply "${FILESDIR}/sdrpp-1.2.0_pre20240607-lib64.patch" fi cmake_src_prepare } From bec0211fee1fe14b381da77a9ec9347d89b8a962 Mon Sep 17 00:00:00 2001 From: Eli Burch Date: Tue, 18 Jun 2024 09:44:45 -0700 Subject: [PATCH 02/13] net-wireless/sdrpp: Add comments to patch file Signed-off-by: Eli Burch --- .../sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch index f37a443124..e092e2ec19 100644 --- a/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch +++ b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch @@ -1,5 +1,5 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0726e57..af67d19 100644 +# Remove problem compiler flags +# Bug: https://bugs.gentoo.org/934413 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,9 +85,9 @@ else() @@ -21,8 +21,7 @@ index 0726e57..af67d19 100644 -# Create headers target \ No newline at end of file +# Create headers target -diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt -index 7fce281..5a26430 100644 + --- a/core/libcorrect/CMakeLists.txt +++ b/core/libcorrect/CMakeLists.txt @@ -27,12 +27,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") From b926b85b8422a84065457a2b4769d630b7c50b72 Mon Sep 17 00:00:00 2001 From: Mykyta Holubakha Date: Tue, 18 Jun 2024 22:25:01 +0300 Subject: [PATCH 03/13] app-admin/chezmoi: add 2.49.0, drop 2.47.3 Signed-off-by: Mykyta Holubakha --- app-admin/chezmoi/Manifest | 4 ++-- .../chezmoi/{chezmoi-2.47.3.ebuild => chezmoi-2.49.0.ebuild} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename app-admin/chezmoi/{chezmoi-2.47.3.ebuild => chezmoi-2.49.0.ebuild} (90%) diff --git a/app-admin/chezmoi/Manifest b/app-admin/chezmoi/Manifest index 0015be04cf..7e6b63e359 100644 --- a/app-admin/chezmoi/Manifest +++ b/app-admin/chezmoi/Manifest @@ -1,2 +1,2 @@ -DIST chezmoi-2.47.3-vendor.tar.xz 5216784 BLAKE2B e366d255b7d25c01eb288dede779eb1b1767c5627bfb9869382e21f737b4449cfb10c6f32cc9a02fc0ae57343b9ce28d10adfeb25d2f6e63f552ba7fbd6c999c SHA512 e58f66ede06a01910bbb0692e97972f5f7eed627b9e502c584a2348558683550344229db937ab4a07d13042529062403d0917eaba0d8a58003baf32f08950801 -DIST chezmoi-2.47.3.tar.gz 2451368 BLAKE2B d2022eb49f7a4140a0b21df4ddd38c8c92c0b83a753608d28fcda2e0c0be6ebd1b555be088a7d7ae7cec14b6102ce6a711cec32e0fed62a6a86ee8d9574aa9bb SHA512 77b5e03ac4677b107ddd4fbcf9bb5eed00e3250b09f760624407304e8ce8edeb8f2fab88d359e7a53f20f0d36c3fdeb8bfd8a7cd8030d9d04524d527196cd6fa +DIST chezmoi-2.49.0-vendor.tar.xz 5048236 BLAKE2B 3b28e8cc9fcc9bdb23575f1243579c776bb1da16888a7b2223ed8546cd5d57b948d0a04bdec96f8ced2be80b7c274a2407fa1766b95a3a1b8525a4724f2f4ea9 SHA512 5b9fc4d2efa26de96014ef0a5208610da82eaf22b5c6df042b3bcb31f5aa06ad0f3182f2de6d0f3265a2dca3c31ec9ff65195b53b1b4887d6ddadada1226c986 +DIST chezmoi-2.49.0.tar.gz 2457390 BLAKE2B 7419b794396584b3cfeca86abde10b29e77ef726a378561240fe47c199ff1157f00d70f115117829855e2854f6e75d76e7f48a5a5a32b3fb3743ae6056307a8f SHA512 aa0a3121e57541c1d5078f65cae0b04ebae0f2e1f4268c82644384d6cabc00925d7df9b5a34c24c4a2ed09788fc4a360636f7c4a9a0d1a7c11f1872384d80f5a diff --git a/app-admin/chezmoi/chezmoi-2.47.3.ebuild b/app-admin/chezmoi/chezmoi-2.49.0.ebuild similarity index 90% rename from app-admin/chezmoi/chezmoi-2.47.3.ebuild rename to app-admin/chezmoi/chezmoi-2.49.0.ebuild index f0ebdcde12..2789bb391e 100644 --- a/app-admin/chezmoi/chezmoi-2.47.3.ebuild +++ b/app-admin/chezmoi/chezmoi-2.49.0.ebuild @@ -8,7 +8,7 @@ inherit go-module shell-completion DESCRIPTION="Manage your dotfiles across multiple machines, securely" HOMEPAGE="https://www.chezmoi.io/" SRC_URI="https://github.com/twpayne/chezmoi/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://github.com/MHaukelid/ebuild-vendored/releases/download/${P}/${P}-vendor.tar.xz" +SRC_URI+=" https://github.com/Hummer12007/distfiles/releases/download/${P}/${P}-vendor.tar.xz" LICENSE="BSD BSD-2 MIT Apache-2.0 MPL-2.0" SLOT="0" From 0852e6196ba5a82620c08a31b60693f69efc8156 Mon Sep 17 00:00:00 2001 From: Jason Blackwell Date: Tue, 18 Jun 2024 22:18:29 +0000 Subject: [PATCH 04/13] dev-util/pmbootstrap: Remove pypi from includes Signed-off-by: Jason Blackwell --- dev-util/pmbootstrap/pmbootstrap-2.3.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/pmbootstrap/pmbootstrap-2.3.1.ebuild b/dev-util/pmbootstrap/pmbootstrap-2.3.1.ebuild index 0600f45f11..40c32d65eb 100644 --- a/dev-util/pmbootstrap/pmbootstrap-2.3.1.ebuild +++ b/dev-util/pmbootstrap/pmbootstrap-2.3.1.ebuild @@ -6,7 +6,7 @@ DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 PYTHON_COMPAT=( python3_{10..13} ) -inherit distutils-r1 linux-info pypi +inherit distutils-r1 linux-info DESCRIPTION="Helper tool for developing and building postmarketOS" HOMEPAGE="https://postmarketos.org/" From 7a33665aae8f672c7013b6e1939eece68f77b3af Mon Sep 17 00:00:00 2001 From: Vitaly Zdanevich Date: Wed, 19 Jun 2024 02:49:59 +0400 Subject: [PATCH 05/13] dev-ml/ollama: new package From https://gpo.zugaina.org/dev-ml/ollama Signed-off-by: Vitaly Zdanevich --- dev-ml/ollama/files/ollama | 33 +++++++++++++++++++ dev-ml/ollama/metadata.xml | 15 +++++++++ dev-ml/ollama/ollama-9999.ebuild | 56 ++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 dev-ml/ollama/files/ollama create mode 100644 dev-ml/ollama/metadata.xml create mode 100644 dev-ml/ollama/ollama-9999.ebuild diff --git a/dev-ml/ollama/files/ollama b/dev-ml/ollama/files/ollama new file mode 100644 index 0000000000..ea8442e320 --- /dev/null +++ b/dev-ml/ollama/files/ollama @@ -0,0 +1,33 @@ +#!/sbin/openrc-run + +description="Ollama Service" +command="/usr/bin/ollama" +command_args="serve" +command_user="root" +command_group="users" +command_background="yes" +pidfile="/run/ollama.pid" +log="/var/log/ollama.log" + +# Environment variable pointing to models location +export OLLAMA_MODELS="/usr/share/ollama/models" + +# Ollama allows cross-origin requests from 127.0.0.1 and 0.0.0.0 by default. +# Additional origins can be configured with OLLAMA_ORIGINS. +# export OLLAMA_ORIGINS="" + +start() { + ebegin "Starting $description" + exec >> >(logger -t "$RC_SVCNAME Start daemon" -p daemon.info) + start-stop-daemon --start --background --user "$command_user" --group "$command_group" \ + --pidfile "$pidfile" --make-pidfile --exec $command $command_args -1 $log -2 $log + eend $? +} + +stop() { + ebegin "Stopping $description" + exec >> >(logger -t "$RC_SVCNAME Stop daemon" -p daemon.info) + start-stop-daemon --stop --pidfile "$pidfile" + eend $? +} + diff --git a/dev-ml/ollama/metadata.xml b/dev-ml/ollama/metadata.xml new file mode 100644 index 0000000000..64c220557b --- /dev/null +++ b/dev-ml/ollama/metadata.xml @@ -0,0 +1,15 @@ + + + + + zdanevich.vitaly@ya.ru + Vitaly Zdanevich + + + Add support of nvidia + Add support of amd + + + nulloy/nulloy + + diff --git a/dev-ml/ollama/ollama-9999.ebuild b/dev-ml/ollama/ollama-9999.ebuild new file mode 100644 index 0000000000..5e58c7a4f5 --- /dev/null +++ b/dev-ml/ollama/ollama-9999.ebuild @@ -0,0 +1,56 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit git-r3 go-module + +DESCRIPTION="Get up and running with Llama 3, Mistral, Gemma, and other language models." +HOMEPAGE="https://ollama.com" +EGIT_REPO_URI="https://github.com/ollama/ollama.git" +LICENSE="MIT" +SLOT="0" + +IUSE="nvidia amd" + +BDEPEND=" + >=dev-lang/go-1.21.0 + >=dev-build/cmake-3.24 + >=sys-devel/gcc-11.4.0 + nvidia? ( dev-util/nvidia-cuda-toolkit ) + amd? ( + sci-libs/clblast + dev-libs/rocm-opencl-runtime + ) +" + +DEPEND="${BDEPEND}" + +pkg_pretend() { + if use amd; then + ewarn "WARNING: AMD & Nvidia support in this ebuild are experimental" + einfo "If you run into issues, especially compiling dev-libs/rocm-opencl-runtime" + einfo "you may try the docker image here https://github.com/ROCm/ROCm-docker" + einfo "and follow instructions here" + einfo "https://rocm.docs.amd.com/projects/install-on-linux/en/latest/how-to/docker.html" + fi +} + +src_unpack() { + git-r3_src_unpack + go-module_live_vendor +} + +src_compile() { + ego generate ./... + ego build . +} + +src_install() { + dobin ollama + doinitd "${FILESDIR}"/ollama +} + +pkg_postinst() { + chmod 0755 /etc/init.d/ollama || die +} From 849ca32f8371e73a365a09e2c75a395083e2d5ee Mon Sep 17 00:00:00 2001 From: Eli Burch Date: Tue, 18 Jun 2024 16:40:33 -0700 Subject: [PATCH 06/13] dev-embedded/bcm2-utils: new package, add 0.9.8 Signed-off-by: Eli Burch --- dev-embedded/bcm2-utils/Manifest | 1 + .../bcm2-utils/bcm2-utils-0.9.8.ebuild | 25 +++++++++++++++++++ dev-embedded/bcm2-utils/metadata.xml | 11 ++++++++ 3 files changed, 37 insertions(+) create mode 100644 dev-embedded/bcm2-utils/Manifest create mode 100644 dev-embedded/bcm2-utils/bcm2-utils-0.9.8.ebuild create mode 100644 dev-embedded/bcm2-utils/metadata.xml diff --git a/dev-embedded/bcm2-utils/Manifest b/dev-embedded/bcm2-utils/Manifest new file mode 100644 index 0000000000..293cdbc9e6 --- /dev/null +++ b/dev-embedded/bcm2-utils/Manifest @@ -0,0 +1 @@ +DIST bcm2-utils-0.9.8.tar.gz 120559 BLAKE2B ae244bab2f3440a251d8453862d4431b3f6697f04584f93d4e737a3e9aaa0f3335cb2282957a998b740389779eedae319840a27d3c7663e4631275b7863cd0a2 SHA512 bc818a2233ff1d33b9bf36afb09d035512b565467384e6080ba405ebeabc33b7d22f537e8b88bf0d4db75bf2063f47a630bb5750cfea6dd7cf0a042ca49ac34a diff --git a/dev-embedded/bcm2-utils/bcm2-utils-0.9.8.ebuild b/dev-embedded/bcm2-utils/bcm2-utils-0.9.8.ebuild new file mode 100644 index 0000000000..7d13fc4c0b --- /dev/null +++ b/dev-embedded/bcm2-utils/bcm2-utils-0.9.8.ebuild @@ -0,0 +1,25 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Utilities for Broadcom-based cable modems" +HOMEPAGE="https://github.com/jclehner/bcm2-utils" +SRC_URI="https://github.com/jclehner/bcm2-utils/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="dev-libs/boost" +RDEPEND="${DEPEND}" + +src_prepare(){ + default + sed -i 's@shell git describe --always@shell git describe --always 2>/dev/null@' "Makefile" || die +} + +src_install(){ + mkdir -p "${D}/usr/bin" || die + emake PREFIX="${D}/usr" install +} diff --git a/dev-embedded/bcm2-utils/metadata.xml b/dev-embedded/bcm2-utils/metadata.xml new file mode 100644 index 0000000000..918dbb5589 --- /dev/null +++ b/dev-embedded/bcm2-utils/metadata.xml @@ -0,0 +1,11 @@ + + + + + eli.burch@burchbytes.com + Eli Burch + + + jclehner/bcm2-utils + + From d0472a69835ae372dfb4a0f6436cedd9cb3c656a Mon Sep 17 00:00:00 2001 From: Alberto Gireud Date: Tue, 18 Jun 2024 19:40:01 -0500 Subject: [PATCH 07/13] gui-apps/darkman: Fix systemd user unit installation Signed-off-by: Alberto Gireud --- .../darkman/{darkman-2.0.1.ebuild => darkman-2.0.1-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename gui-apps/darkman/{darkman-2.0.1.ebuild => darkman-2.0.1-r1.ebuild} (97%) diff --git a/gui-apps/darkman/darkman-2.0.1.ebuild b/gui-apps/darkman/darkman-2.0.1-r1.ebuild similarity index 97% rename from gui-apps/darkman/darkman-2.0.1.ebuild rename to gui-apps/darkman/darkman-2.0.1-r1.ebuild index de30c3f2c1..a5e896ee49 100644 --- a/gui-apps/darkman/darkman-2.0.1.ebuild +++ b/gui-apps/darkman/darkman-2.0.1-r1.ebuild @@ -33,7 +33,7 @@ src_compile() { src_install() { dobin ${PN} - systemd_dounit ${PN}.service + systemd_douserunit ${PN}.service doman ${PN}.1 use examples && DOCS+=( examples/. ) From f85c75b2e22c0c81704f1cf510be97b670d9bf68 Mon Sep 17 00:00:00 2001 From: Kyle Elbert Date: Tue, 18 Jun 2024 23:47:01 -0500 Subject: [PATCH 08/13] app-crypt/certbot-dns-cloudflare: adjust cloudflare requirement No longer blocked by cloudflare 3, just needs the most recent 2.x Signed-off-by: Kyle Elbert --- .../certbot-dns-cloudflare-2.10.0-r1.ebuild | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.10.0-r1.ebuild diff --git a/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.10.0-r1.ebuild b/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.10.0-r1.ebuild new file mode 100644 index 0000000000..90ae3f52bd --- /dev/null +++ b/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.10.0-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=(python3_{10..12}) +#DISTUTILS_USE_SETUPTOOLS=rdepend +DISTUTILS_USE_PEP517=setuptools + +MYPN="certbot" + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + inherit git-r3 + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/certbot/${MYPN}/archive/v${PV}.tar.gz -> ${MYPN}-${PV}.gh.tar.gz" + KEYWORDS="~amd64" + S=${WORKDIR}/certbot-${PV}/${PN} +fi + +inherit distutils-r1 + +DESCRIPTION="Cloudflare DNS Authenticator plugin for Certbot (Let's Encrypt Client)" +HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" + +LICENSE="Apache-2.0" +SLOT="0" + +RDEPEND="${CDEPEND} + >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] + >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + dev-python/dns-lexicon[${PYTHON_USEDEP}] + =dev-python/cloudflare-2.19*[${PYTHON_USEDEP}]" +BDEPEND="test? ( ${RDEPEND} )" +distutils_enable_tests pytest +distutils_enable_sphinx docs dev-python/sphinx-rtd-theme From e989281b378b5d623b2ec14ecdb194b273e7552d Mon Sep 17 00:00:00 2001 From: Kyle Elbert Date: Tue, 18 Jun 2024 23:49:55 -0500 Subject: [PATCH 09/13] app-crypt/certbot-dns-cloudflare: drop 2.9.0-r1, 2.10.0 Signed-off-by: Kyle Elbert --- app-crypt/certbot-dns-cloudflare/Manifest | 1 - .../certbot-dns-cloudflare-2.10.0.ebuild | 38 ------------------- .../certbot-dns-cloudflare-2.9.0-r1.ebuild | 38 ------------------- 3 files changed, 77 deletions(-) delete mode 100644 app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.10.0.ebuild delete mode 100644 app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.9.0-r1.ebuild diff --git a/app-crypt/certbot-dns-cloudflare/Manifest b/app-crypt/certbot-dns-cloudflare/Manifest index cc70ef2197..1bfef90919 100644 --- a/app-crypt/certbot-dns-cloudflare/Manifest +++ b/app-crypt/certbot-dns-cloudflare/Manifest @@ -1,2 +1 @@ DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd -DIST certbot-2.9.0.gh.tar.gz 1346993 BLAKE2B cf7fb4676dc31442abe11ef50d18073480a46f4ab19cc328da599b1372509af683b4c6010b46f31bce5703949e88b4702d404bd8582a1361caad43ec8f02cb94 SHA512 27c15ce8e4450f432fbc271cd847d27c7f1bce552cc6e5f2a91f1fbfc09ebe331b54bab17639b86c19605de059767015665c26e872c3b0699edb1c85392a0546 diff --git a/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.10.0.ebuild b/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.10.0.ebuild deleted file mode 100644 index d87767c367..0000000000 --- a/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.10.0.ebuild +++ /dev/null @@ -1,38 +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}) -#DISTUTILS_USE_SETUPTOOLS=rdepend -DISTUTILS_USE_PEP517=setuptools - -MYPN="certbot" - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/certbot/certbot.git" - inherit git-r3 - S=${WORKDIR}/${P}/${PN} -else - SRC_URI="https://github.com/certbot/${MYPN}/archive/v${PV}.tar.gz -> ${MYPN}-${PV}.gh.tar.gz" - KEYWORDS="~amd64" - S=${WORKDIR}/certbot-${PV}/${PN} -fi - -inherit distutils-r1 - -DESCRIPTION="Cloudflare DNS Authenticator plugin for Certbot (Let's Encrypt Client)" -HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" - -LICENSE="Apache-2.0" -SLOT="0" - -RDEPEND="${CDEPEND} - >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] - >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - dev-python/dns-lexicon[${PYTHON_USEDEP}] - !>=dev-python/cloudflare-2.21[${PYTHON_USEDEP}] - dev-python/cloudflare[${PYTHON_USEDEP}]" -BDEPEND="test? ( ${RDEPEND} )" -distutils_enable_tests pytest -distutils_enable_sphinx docs dev-python/sphinx-rtd-theme diff --git a/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.9.0-r1.ebuild b/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.9.0-r1.ebuild deleted file mode 100644 index d87767c367..0000000000 --- a/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.9.0-r1.ebuild +++ /dev/null @@ -1,38 +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}) -#DISTUTILS_USE_SETUPTOOLS=rdepend -DISTUTILS_USE_PEP517=setuptools - -MYPN="certbot" - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/certbot/certbot.git" - inherit git-r3 - S=${WORKDIR}/${P}/${PN} -else - SRC_URI="https://github.com/certbot/${MYPN}/archive/v${PV}.tar.gz -> ${MYPN}-${PV}.gh.tar.gz" - KEYWORDS="~amd64" - S=${WORKDIR}/certbot-${PV}/${PN} -fi - -inherit distutils-r1 - -DESCRIPTION="Cloudflare DNS Authenticator plugin for Certbot (Let's Encrypt Client)" -HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" - -LICENSE="Apache-2.0" -SLOT="0" - -RDEPEND="${CDEPEND} - >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] - >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - dev-python/dns-lexicon[${PYTHON_USEDEP}] - !>=dev-python/cloudflare-2.21[${PYTHON_USEDEP}] - dev-python/cloudflare[${PYTHON_USEDEP}]" -BDEPEND="test? ( ${RDEPEND} )" -distutils_enable_tests pytest -distutils_enable_sphinx docs dev-python/sphinx-rtd-theme From 7d8005c03542f78833c48741d7220c2fbf6733c8 Mon Sep 17 00:00:00 2001 From: Kyle Elbert Date: Wed, 19 Jun 2024 00:03:24 -0500 Subject: [PATCH 10/13] dev-python/cloudflare: add 3.0.0_beta10 Cloudflare 3 changed the case on the module so it can coexist with 2 Signed-off-by: Kyle Elbert --- dev-python/cloudflare/Manifest | 2 + .../cloudflare/cloudflare-3.0.0_beta10.ebuild | 90 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 dev-python/cloudflare/cloudflare-3.0.0_beta10.ebuild diff --git a/dev-python/cloudflare/Manifest b/dev-python/cloudflare/Manifest index 84a9ae7abf..d8d975fefb 100644 --- a/dev-python/cloudflare/Manifest +++ b/dev-python/cloudflare/Manifest @@ -1,2 +1,4 @@ DIST cloudflare-2.19.2.gh.tar.gz 145051 BLAKE2B cd7c9d9352b055b115af443341dcc4d0a446aaf1ac7b7f8030dce0ff19da185b1effc9a679b8018920ade98cafaaf599af8aea8c57a924e59eb40670a3854b70 SHA512 eac9601f9cb9ea5dc140e48fb0f0e042396f6a7ec354f18b815d6c51094799dc3f25e1e69e78f87ec5c612f4304d15f779090962a8f96282d9b2fe8a9abfb690 DIST cloudflare-2.19.4.gh.tar.gz 151397 BLAKE2B c91c95f52314c5177d823ef8f827ea2f76f6cc703260449aea12d54c1b77d061feca15d4bb845f84cfb4fd80789e5064e54d7530daf546d54d17054b9e0b4fda SHA512 8ae11e73760c57b610abfe5e2c8fdc83c2e0b9e07340884925ec9ac3bf5b40b4edf39b2b8ce7330538369d7573146a2ddac195efb0efb4ff657f75fdacb31aed +DIST cloudflare-3.0.0_beta10.gh.tar.gz 1445435 BLAKE2B 1717f36194ce5e8a292f4026463d9b05b12808ee2c8fbbae7d4817523a4c37d13d2935eef58fe83cebe64c6e7684018154482ee3e51538e7a5724179a2b280c0 SHA512 c7150c0cc056869a600cb440f6cd68801d4032d401192e156101cdf82484ba9b3a03649a2c0569c42c396b653517ad19ec841c3baab067709b4736bcc15e9be6 +DIST cloudflare-python-v3.0.0_beta10-prism.tar.gz 10658021 BLAKE2B 930259e5e1b967ca056804ede3f40d40b57602640d8ae308cc466f38c10eacb95dfb639309ea0b3d2a79fb6c0da6f4cc9dedae08f9a356a4c52ff4bf458d193d SHA512 60c8cb768cb18099c2f9384fd80ff34e2e2511b56433ca0aae02f4be949c2ac9ab72ea879c53aa1e7aaae284afe5547abb909dc733274d50154179a174429b53 diff --git a/dev-python/cloudflare/cloudflare-3.0.0_beta10.ebuild b/dev-python/cloudflare/cloudflare-3.0.0_beta10.ebuild new file mode 100644 index 0000000000..e9b2842da2 --- /dev/null +++ b/dev-python/cloudflare/cloudflare-3.0.0_beta10.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..12} ) +DISTUTILS_USE_PEP517="hatchling" +inherit distutils-r1 +DESCRIPTION="Python wrapper for the Cloudflare v4 API" +HOMEPAGE="https://pypi.org/project/cloudflare/" +if [ "${PV}" == 9999 ]; then + EGIT_REPO_URI="https://github.com/cloudflare/cloudflare-python" + inherit git-r3 +else + MYPV=$(ver_rs 3 -) + MYPV=${MYPV/beta/beta.} + MYPN="cloudflare-python" + SRC_URI="https://github.com/cloudflare/cloudflare-python/archive/refs/tags/v${MYPV}.tar.gz -> ${P}.gh.tar.gz + test? ( https://github.com/Phoenix591/${MYPN}/releases/download/v${PV}/${MYPN}-v${PV}-prism.tar.gz )" + #Prism archive generated by workflow + # https://github.com/Phoenix591/cloudflare-python/blob/v3.0.0_beta10/.github/workflows/test-tar.yml + S="${WORKDIR}/${MYPN}-${MYPV}" + KEYWORDS="~amd64 ~arm64" +fi +LICENSE="MIT test? ( ISC Apache-2.0 MIT BSD CC0-1.0 0BSD )" +# nodejs package and deps used to test +SLOT="3" +RDEPEND=" ${DEPEND} + >=dev-python/httpx-0.23.0[${PYTHON_USEDEP}] + >=dev-python/pydantic-1.9.0[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.7.0[${PYTHON_USEDEP}] + >=dev-python/anyio-4.3.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.7.0[${PYTHON_USEDEP}] + >=dev-python/sniffio-1.3.1[${PYTHON_USEDEP}] + " + +BDEPEND="test? ( + >=net-libs/nodejs-18.20.1 + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/time-machine[${PYTHON_USEDEP}] + dev-python/dirty-equals[${PYTHON_USEDEP}] + dev-python/respx[${PYTHON_USEDEP}] + ${RDEPEND} +)" + +distutils_enable_tests pytest +RESTRICT="mirror" #mirror restricted only because overlay +RESTRICT+=" !test? ( test )" + +src_unpack() { + unpack "${P}.gh.tar.gz" + use test && cd "${S}" && unpack "cloudflare-python-v${PV}-prism.tar.gz" +} + +#python_prepare_all() { +# # don't install tests or examples +# sed -i -e "s/'cli4', 'examples'/'cli4'/" \ +# -e "s#'CloudFlare/tests',##" \ +# setup.py || die +# sed -i -e "/def test_ips7_should_fail():/i@pytest.mark.xfail(reason='Now fails upstream')" \ +# -e "2s/^/import pytest/" \ +# CloudFlare/tests/test_cloudflare_calls.py || die +# distutils-r1_python_prepare_all +#} + +python_test() { + # these 2 tests fail in an ebuild environment for some reason + # help appreciated + local EPYTEST_DESELECT=( + tests/test_client.py::TestCloudflare::test_validate_headers + tests/test_client.py::TestAsyncCloudflare::test_validate_headers ) + + epytest +} + +src_test() { + # Run prism mock api server, this is what needs nodejs + node --no-warnings node_modules/@stoplight/prism-cli/dist/index.js mock \ + "cloudflare-spec.yml" >prism.log & + # Wait for server to come online + echo -n "Waiting for mockserver" + while ! grep -q "✖ fatal\|Prism is listening" "prism.log" ; do + echo -n "." + sleep 0.5 + done + if grep -q "✖ fatal" prism.log; then + die "Prism mock server failed" + fi + distutils-r1_src_test +} From 59bbfc30df2c59cf48c2e688aa4415006a814239 Mon Sep 17 00:00:00 2001 From: Kyle Elbert Date: Wed, 19 Jun 2024 01:19:25 -0500 Subject: [PATCH 11/13] dev-python/cloudflare: cleanup test server Signed-off-by: Kyle Elbert --- dev-python/cloudflare/cloudflare-3.0.0_beta10.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-python/cloudflare/cloudflare-3.0.0_beta10.ebuild b/dev-python/cloudflare/cloudflare-3.0.0_beta10.ebuild index e9b2842da2..eb7c347b87 100644 --- a/dev-python/cloudflare/cloudflare-3.0.0_beta10.ebuild +++ b/dev-python/cloudflare/cloudflare-3.0.0_beta10.ebuild @@ -77,6 +77,7 @@ src_test() { # Run prism mock api server, this is what needs nodejs node --no-warnings node_modules/@stoplight/prism-cli/dist/index.js mock \ "cloudflare-spec.yml" >prism.log & + local MOCK_PID=$! # Wait for server to come online echo -n "Waiting for mockserver" while ! grep -q "✖ fatal\|Prism is listening" "prism.log" ; do @@ -87,4 +88,5 @@ src_test() { die "Prism mock server failed" fi distutils-r1_src_test + kill "${MOCK_PID}" } From 4855e0c86879a54e58851e688232f47814c1acd2 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 19 Jun 2024 09:01:03 +0200 Subject: [PATCH 12/13] dev-embedded/esp-idf: drop failing rm in case of USE=riscv32 Signed-off-by: Florian Schmaus --- dev-embedded/esp-idf/esp-idf-5.2.2.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-embedded/esp-idf/esp-idf-5.2.2.ebuild b/dev-embedded/esp-idf/esp-idf-5.2.2.ebuild index c100d333ae..af3eb9ab0d 100644 --- a/dev-embedded/esp-idf/esp-idf-5.2.2.ebuild +++ b/dev-embedded/esp-idf/esp-idf-5.2.2.ebuild @@ -140,7 +140,6 @@ src_install() { 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 From b8d29619de43a844d6b94f313cbf1c94fd01c6f8 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 19 Jun 2024 09:14:49 +0200 Subject: [PATCH 13/13] dev-embedded/esp-idf: use estack.eclass and newbin with heredoc Signed-off-by: Florian Schmaus --- dev-embedded/esp-idf/esp-idf-5.2.2.ebuild | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dev-embedded/esp-idf/esp-idf-5.2.2.ebuild b/dev-embedded/esp-idf/esp-idf-5.2.2.ebuild index af3eb9ab0d..075aec06e3 100644 --- a/dev-embedded/esp-idf/esp-idf-5.2.2.ebuild +++ b/dev-embedded/esp-idf/esp-idf-5.2.2.ebuild @@ -10,7 +10,7 @@ GDB_VER="14.2_20240403" CROSSTOOL_URL="https://github.com/espressif/crosstool-NG/releases/download/esp-${VER}" -inherit python-r1 +inherit estack python-r1 DESCRIPTION="Espressif IoT Development Framework" HOMEPAGE="https://www.espressif.com/" @@ -67,7 +67,7 @@ PATCHES=( ) install_tool() { - shopt -s globstar + eshopts_push -s globstar into /opt/${1} @@ -119,12 +119,17 @@ install_tool() { done ) - shopt -u globstar + eshopts_pop } src_install() { - echo -e "#!/bin/sh\npython /usr/share/${PN}/tools/idf.py \"\$@\"" > idf - dobin idf + newbin - idf <<-EOF + #!/bin/sh + + # Silence a warning by idf.py + export IDF_PYTHON_ENV_PATH= + exec python /usr/share/${PN}/tools/idf.py \$@ +EOF install_tool xtensa-esp-elf install_tool xtensa-esp-elf/xtensa-esp-elf