diff --git a/app-crypt/pinentry-bemenu/Manifest b/app-crypt/pinentry-bemenu/Manifest index 21554c504e..dfb0aa29bd 100644 --- a/app-crypt/pinentry-bemenu/Manifest +++ b/app-crypt/pinentry-bemenu/Manifest @@ -1,2 +1 @@ -DIST pinentry-bemenu-0.11.0.tar.gz 34352 BLAKE2B 54059a506fbc3e5034af7ffdf6fdac8f131abbac94662a35d487072f292b380a8b81d5a2916a8ef85ac3ae0c4f479119fadac541eb6bd32eb3033ce762ea5679 SHA512 3c35733b52d1b096904585ee0f37b0a2c7390158a94b2f13fe387fd738c004a2f1f474e3ca66d35f364ad057dc6b4520700d2a71f4d1c431bb428b6de513313a -DIST pinentry-bemenu-0.12.0.tar.gz 34781 BLAKE2B 58268a7c6bbe9d49a93f4d0b0bc7c2caa5a8cac2a6d54243d42f533b18bad36bf6177d742f4525a2199fe9f5d891ebd1cdb8c24880e13ef0283cf0b7d997760d SHA512 243b0572ae80f9fe95269545f13f71a85a84afd75f212872ccb7f34c078b86ba92faca2cdf772e333390bd1367b9e5272247ba1dfb40fc86a1bbd0efb5da2991 +DIST pinentry-bemenu-0.13.1.tar.gz 34933 BLAKE2B 3e71ca3ddd7836149e7dd6b208ac2664ccd4b00b914112e767cc659c3da8dcf22219f85029ea095d0096caccb3fa48402a724318941631b5454fd031228c8ac7 SHA512 9cdb4a3876c96900dc5ae31ad8520e0f5bc337a7e97e30c35fc0898c5f25dea322b9f41afa191a75eb3502455a96f2cb03f3699802ac38dcd1af67445fb8a3b2 diff --git a/app-crypt/pinentry-bemenu/pinentry-bemenu-0.11.0.ebuild b/app-crypt/pinentry-bemenu/pinentry-bemenu-0.11.0.ebuild deleted file mode 100644 index e2b75bf1b6..0000000000 --- a/app-crypt/pinentry-bemenu/pinentry-bemenu-0.11.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -DESCRIPTION="Pinentry based on bemenu" -HOMEPAGE="https://github.com/t-8ch/pinentry-bemenu" -SRC_URI="https://github.com/t-8ch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" - dev-libs/bemenu - dev-libs/libgpg-error - dev-libs/libassuan - dev-libs/popt -" -RDEPEND="${DEPEND}" -BDEPEND="" - -pkg_postinst() { - elog "To use pinentry-bemenu, edit your gpg-agent.conf file to include:" - elog "pinentry-program /usr/bin/pinentry-bemenu" -} diff --git a/app-crypt/pinentry-bemenu/pinentry-bemenu-0.12.0.ebuild b/app-crypt/pinentry-bemenu/pinentry-bemenu-0.13.1.ebuild similarity index 90% rename from app-crypt/pinentry-bemenu/pinentry-bemenu-0.12.0.ebuild rename to app-crypt/pinentry-bemenu/pinentry-bemenu-0.13.1.ebuild index 034b576068..299cc1efbd 100644 --- a/app-crypt/pinentry-bemenu/pinentry-bemenu-0.12.0.ebuild +++ b/app-crypt/pinentry-bemenu/pinentry-bemenu-0.13.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ DESCRIPTION="Pinentry based on bemenu" HOMEPAGE="https://github.com/t-8ch/pinentry-bemenu" SRC_URI="https://github.com/t-8ch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" diff --git a/app-portage/portage-lostfiles/Manifest b/app-portage/portage-lostfiles/Manifest index 4afe784d56..30cb443f85 100644 --- a/app-portage/portage-lostfiles/Manifest +++ b/app-portage/portage-lostfiles/Manifest @@ -1 +1 @@ -DIST portage-lostfiles-0.5.4.tar.gz 12495 BLAKE2B bcf3af787978ba604c0fd6348f4ec2352398790d68f1d2e7e8b5de159820be13807a83cd98255d4f7fe7f0224079d3c9edc22b744bb39ba236aed2607020f7c2 SHA512 a1fd0229b9fd6913982d2c41015364ac1ee78cbee9e0d213cfc7e280fee920c4c8e2b3bfe29979f2110ceb744978d8f255b67b63cd8ff73b1b2cb7ed45a11c74 +DIST portage-lostfiles-0.5.5.tar.gz 12496 BLAKE2B 99d16719ef3065a3284603743c408d69a4db40f901dde2d89025ea403c6e9531128d49978fdd087bf919e961f7f4777b6317e59e251a9c1953a812adb81efd58 SHA512 30062820b9365d4ca7b6303e4732e55dba020d99efe3f0b4bd4023b9f70b03cc151700679710f998939363060d666a1c44460e958a80d7a4397ffa1da4fda331 diff --git a/app-portage/portage-lostfiles/portage-lostfiles-0.5.4.ebuild b/app-portage/portage-lostfiles/portage-lostfiles-0.5.5.ebuild similarity index 100% rename from app-portage/portage-lostfiles/portage-lostfiles-0.5.4.ebuild rename to app-portage/portage-lostfiles/portage-lostfiles-0.5.5.ebuild diff --git a/app-text/klogg/files/klogg-22.06.0.1289-missing-include.patch b/app-text/klogg/files/klogg-22.06.0.1289-missing-include.patch new file mode 100644 index 0000000000..d8a045ba8f --- /dev/null +++ b/app-text/klogg/files/klogg-22.06.0.1289-missing-include.patch @@ -0,0 +1,20 @@ +From 6b5df18387316a706eb5f1fd05e049871eb6d153 Mon Sep 17 00:00:00 2001 +From: Anton Filimonov +Date: Thu, 8 Jun 2023 01:01:27 +0200 +Subject: [PATCH] build: fix arch aur builds + +Taken from upstream commit +https://github.com/variar/klogg/commit/6b5df18387316a706eb5f1fd05e049871eb6d153 + +diff --git a/src/crash_handler/src/memory_info.cpp b/src/crash_handler/src/memory_info.cpp +index 670918163..06ef8b75f 100644 +--- a/src/crash_handler/src/memory_info.cpp ++++ b/src/crash_handler/src/memory_info.cpp +@@ -89,6 +89,7 @@ uint64_t usedMemory() + #include + + #include ++#include + + uint64_t systemPhysicalMemory() + { diff --git a/app-text/klogg/klogg-22.06.0.1289.ebuild b/app-text/klogg/klogg-22.06.0.1289-r1.ebuild similarity index 94% rename from app-text/klogg/klogg-22.06.0.1289.ebuild rename to app-text/klogg/klogg-22.06.0.1289-r1.ebuild index 7f2ec907e6..2e0f3cd108 100644 --- a/app-text/klogg/klogg-22.06.0.1289.ebuild +++ b/app-text/klogg/klogg-22.06.0.1289-r1.ebuild @@ -27,7 +27,7 @@ DEPEND=" dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtconcurrent:5 - >=dev-libs/hyperscan-5.4.0 + dev-libs/vectorscan:= >=dev-libs/xxhash-0.8.0 >=app-i18n/uchardet-0.0.7 >=dev-cpp/tbb-2021.5 @@ -42,6 +42,10 @@ BDEPEND=" test? ( dev-qt/qttest:5 >=dev-cpp/catch-2.13.8 ) " +PATCHES=( + "${FILESDIR}/${P}-missing-include.patch" +) + src_unpack() { unpack ${P}.tar.gz mv "${WORKDIR}/${PN}-${MAJOR_VERSION}" "${WORKDIR}/${P}" diff --git a/dev-cpp/rang/rang-3.2.ebuild b/dev-cpp/rang/rang-3.2.ebuild index a06d69c754..323b239753 100644 --- a/dev-cpp/rang/rang-3.2.ebuild +++ b/dev-cpp/rang/rang-3.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/agauniyal/rang/archive/refs/tags/v${PV}.tar.gz LICENSE="Unlicense" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~ppc64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-embedded/esp-idf-kconfig/Manifest b/dev-embedded/esp-idf-kconfig/Manifest index fdb827e44a..6b7e0b8de6 100644 --- a/dev-embedded/esp-idf-kconfig/Manifest +++ b/dev-embedded/esp-idf-kconfig/Manifest @@ -1,3 +1,2 @@ DIST esp-idf-kconfig-1.4.1.tar.gz 39687 BLAKE2B aa4500a1d9ebf9cae5e0d1daa47549a5f4730e907f0963b485c4e019bf9d88103da41e49b48a381450b4000d92a9f4b87fe9bf23064457b9a4c66a39f7198746 SHA512 e710c4b8015d0b321a20d32d20735d48991d97c718469dee0096da19de451aaa3f22774669d1f39dd979a037f94bdb5ad59a9d9e02f4e3a2a7e9e4ccc00f4191 -DIST esp-idf-kconfig-2.0.1.tar.gz 25516 BLAKE2B fc771546608fb4d1c720e2d4fccdf8aa17d08a9fdf6d40cc809a3a0b87a82cd5e4e24de6276149e0049d6abad45ab35f5326304ef9e1f0966aedaf25afe6e254 SHA512 8d502bb8fe0c140beb66c002b578e3de07376720217450c20ee29548875e22c3e8e25b435f10bd48d02724711c8895d142ec9e24e1e5193d1627745a5a7b3386 DIST esp-idf-kconfig-2.1.0.tar.gz 40056 BLAKE2B 88a2bdc81b1b500e4db4fc7be3dc1bd2c62f2cda02aae902c0adfc3c1e3fdfee3a9a7ef3d1f8f9fd2e7f610c48c3926cd310851a3851bdfbe9785fd0288328f2 SHA512 d2028d781428a3861fa85d826cf3693425b6f4c79c44c380d484572196a5bc40e28a9a47e32a73251ae63c64439bf26987db811943ce34ab49f4276a7f3f16ec diff --git a/dev-embedded/esp-idf/Manifest b/dev-embedded/esp-idf/Manifest index 6bbd06ed71..6385383b8b 100644 --- a/dev-embedded/esp-idf/Manifest +++ b/dev-embedded/esp-idf/Manifest @@ -1,4 +1,5 @@ DIST esp-idf-5.1.2.zip 1200519153 BLAKE2B d8714163e3a449e24bec8a93ce666d269ddb7d406d7e3dc0b5db0845b7a9c05f6a5186796f8bbda68bb0a8e40a2743a88792eb341e72a276e4ec1e3e8b04c34d SHA512 46e96419b5f58d8b41d5b7b35f6e96beee94f6c1e20ba22eaf48a7f3d3cf4f3c9b8aa79468e6ea95718f598f6e30e7b72be616d1fb856045758191eb244151c8 +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-12.2.0_20230208-x86_64-linux-gnu.tar.xz 131410024 BLAKE2B 6961ddad1570aa69cbe7a4b1cd6722831d725b83a2d865b5babeea9b2d1762e4dda3cf35bdd4c5137758e15267a229136439387ff72577d5d558a924cd6161aa SHA512 dd0a95408fb487d444cb2c1efc9a0d21404eba2080b16cd9958dd9a9d22c5bf36f3c5e0309b082a226b39e4aeaf9a07ac89af740e2d5c01f85147d26dff7d233 diff --git a/dev-embedded/esp-idf/esp-idf-5.2.1.ebuild b/dev-embedded/esp-idf/esp-idf-5.2.1.ebuild new file mode 100644 index 0000000000..6036f9efe5 --- /dev/null +++ b/dev-embedded/esp-idf/esp-idf-5.2.1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2023 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" +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://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-linux-amd64.tar.gz + +KEYWORDS="~amd64" +LICENSE="Apache-2.0" +IUSE="riscv32" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +SLOT="0" + +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 + 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}] +" + +RESTRICT="strip" + +QA_PREBUILT="opt/* usr/lib* usr/share/esp-idf/*" +QA_PRESTRIPPED="opt/*" + +PATCHES=( + "${FILESDIR}/allow-system-install-${PN}-5.1.2.patch" +) + +S="${WORKDIR}/${PN}-v${PV}" + +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/freertos-gdb/Manifest b/dev-embedded/freertos-gdb/Manifest index ef54760fc5..616b8476b1 100644 --- a/dev-embedded/freertos-gdb/Manifest +++ b/dev-embedded/freertos-gdb/Manifest @@ -1 +1,2 @@ DIST freertos-gdb-1.0.2.tar.gz 13895 BLAKE2B 75535e5bc4de49074504cd6369a6b9f1be00b7dce7485ebfb2f5e1d628b092fe6f02579ef04db7db6bd9d9b910dc98d23cba79484809c16b350840730c75df9e SHA512 142afc1a24e3583b28873386ad6d903666eceaaa32581cd1fba7da1a82af7336f960b8e72d741cad05acff7031434b34bfc794ae2fdec2ee99de7694d38217b7 +DIST freertos-gdb-1.0.3.tar.gz 14057 BLAKE2B e5e251e8e51b9a2f631c7efd8934a1699d84036e0895f11040e51785a680ac011f91bdc9f775690fd2b8a1de0f59fe38ec7a55b25cfe10b48bc439aff74bd6e4 SHA512 d6dc4ece08fd7a9b6e07679133b851c5c21105efd2044d9a9edbf3d38c03ab87ba342fe07b5a424aca26277266aaae774158b806e7f4176b80d9e546f4d728d7 diff --git a/dev-embedded/esp-idf-kconfig/esp-idf-kconfig-2.0.1.ebuild b/dev-embedded/freertos-gdb/freertos-gdb-1.0.3.ebuild similarity index 62% rename from dev-embedded/esp-idf-kconfig/esp-idf-kconfig-2.0.1.ebuild rename to dev-embedded/freertos-gdb/freertos-gdb-1.0.3.ebuild index 56678fca27..8c71ae210c 100644 --- a/dev-embedded/esp-idf-kconfig/esp-idf-kconfig-2.0.1.ebuild +++ b/dev-embedded/freertos-gdb/freertos-gdb-1.0.3.ebuild @@ -9,17 +9,11 @@ PYTHON_COMPAT=( python3_{11,12} ) inherit distutils-r1 pypi -DESCRIPTION="Kconfig tooling for esp-idf" -HOMEPAGE="https://github.com/espressif/esp-idf-kconfig" +DESCRIPTION="Python module for operating with freeRTOS-kernel objects in GDB" +HOMEPAGE="https://github.com/espressif/freertos-gdb" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" RESTRICT="test" - -RDEPEND=" - dev-python/kconfiglib[${PYTHON_USEDEP}] -" - -DEPEND="${RDEPEND}" diff --git a/dev-embedded/idf-component-manager/Manifest b/dev-embedded/idf-component-manager/Manifest index 7eb190add5..f9a0eba845 100644 --- a/dev-embedded/idf-component-manager/Manifest +++ b/dev-embedded/idf-component-manager/Manifest @@ -1,2 +1,2 @@ DIST idf-component-manager-1.4.1.gh.tar.gz 222994 BLAKE2B 659272939460a95f67156aaa978ad78e00f9dd138a63310559e8229927e6328d0c2939a9df15dd5c54af2f7f2527e10ac90211974c90c9cc4b127e000ac5b653 SHA512 fe1205728b6dd91dbc158a2112b0b216b3631fae8982b4f51e2905bdcf45cf5ad697201b56cac9413b72c663d61ce55c831a758453a4c0c904a29f5b1d64cfbf -DIST idf-component-manager-1.5.1.gh.tar.gz 318162 BLAKE2B a373ba089216effa9b770d21f567b50283876f81b670e46a5d86b7a11f16e67e23172d3d2a869a07282500c49d33fc67a28251a24e76f6916088310bf870a210 SHA512 9502ed5dfd19ee07ee2f222675cdc8537b72b554402c43a0dee2ae6c71aa69affe89e11c24b77c9374ce1a98e901845d92b5b51be7d6ec781a9798dcbba5ea8d +DIST idf-component-manager-1.5.2.gh.tar.gz 318633 BLAKE2B 13064fdbebf672dee91b764c83ee07bebf64504676ec25ec9c40d181425c177e4080e6da2b3435115afeeff2608bc2a2a5545dc64d0e5d01e1e817c88fcdc0a9 SHA512 113d750956ce5935483f54884ea7290d6ebcc463ffaab5ae602a8ea341326ea1dffde5c929de155514fbd8692964801c787bc962d0c78dc87a27d841e004bd99 diff --git a/dev-embedded/idf-component-manager/idf-component-manager-1.5.1.ebuild b/dev-embedded/idf-component-manager/idf-component-manager-1.5.2.ebuild similarity index 100% rename from dev-embedded/idf-component-manager/idf-component-manager-1.5.1.ebuild rename to dev-embedded/idf-component-manager/idf-component-manager-1.5.2.ebuild diff --git a/dev-games/liblcf/liblcf-0.8.ebuild b/dev-games/liblcf/liblcf-0.8.ebuild index b71de5a296..e61fee2861 100644 --- a/dev-games/liblcf/liblcf-0.8.ebuild +++ b/dev-games/liblcf/liblcf-0.8.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://easyrpg.org/ SRC_URI="https://easyrpg.org/downloads/player/${PV}/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~ppc64" IUSE="doc tools" diff --git a/dev-python/PyWavefront/PyWavefront-1.3.3.ebuild b/dev-python/PyWavefront/PyWavefront-1.3.3-r1.ebuild similarity index 56% rename from dev-python/PyWavefront/PyWavefront-1.3.3.ebuild rename to dev-python/PyWavefront/PyWavefront-1.3.3-r1.ebuild index ccbe0ef687..168632f97c 100644 --- a/dev-python/PyWavefront/PyWavefront-1.3.3.ebuild +++ b/dev-python/PyWavefront/PyWavefront-1.3.3-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 +inherit distutils-r1 virtualx DESCRIPTION="Python library for importing Wavefront .obj files" HOMEPAGE="https://github.com/pywavefront/PyWavefront https://pypi.org/project/PyWavefront" @@ -15,27 +15,15 @@ SRC_URI="https://github.com/pywavefront/PyWavefront/archive/refs/tags/${PV}.tar. LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -RDEPEND="" BDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] test? ( - dev-python/pytest[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] ) " DEPEND="${BDEPEND}" distutils_enable_tests pytest - -# src_test() { -# virtx distutils-r1_src_test -# } -# python_test() { -# rm "${S}/tests/test_local.py" -# cd "${T}" || die -# epytest "${S}"/tests -# } +src_test() { + virtx distutils-r1_src_test +} diff --git a/dev-python/imgui/Manifest b/dev-python/imgui/Manifest deleted file mode 100644 index 76592741d9..0000000000 --- a/dev-python/imgui/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST imgui-1.82.gh.tar.gz 1433525 BLAKE2B 2bdb34b020390ee36a23dc674dabbb946e048099f47492fe9ebc1f142e40ceb58a0b89e49b70d2db4e2929c50f127fd8a70519171cd9007f91db23ccdb24375d SHA512 210076c2b04c09e63a4924e1f874bfe240668f4d2656511c96dd5499efe04d795ad01d5af8e2aa2543849d3ca5ef1a6c6555a9232d4d92f95bf98c41e8505b58 -DIST imgui-2.0.0.gh.tar.gz 230722 BLAKE2B 298b169e0ee8cb3f4eadad151475f13226203c77eea2f517ca1209fd39cac6880c5ba247253b37fd676c14b6706151ee14b3e5d384dcac581a44c4ef537eda4f SHA512 30d81462829daab8d760bdae18e470a0bb781a05086c9e93d3c891e38df1a8451800d3118266f6938ee838c081b192697b8669eac8a404ed9497b923ac52fe34 diff --git a/dev-python/imgui/imgui-2.0.0.ebuild b/dev-python/imgui/imgui-2.0.0.ebuild deleted file mode 100644 index 92b087ab54..0000000000 --- a/dev-python/imgui/imgui-2.0.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 - -IMGUI_VERSION="1.82" # The version of imgui that pyimgui is using - -DESCRIPTION="Cython-based Python bindings for dear imgui" -HOMEPAGE="https://github.com/pyimgui/pyimgui https://pypi.org/project/imgui" -SRC_URI=" - https://github.com/pyimgui/pyimgui/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz - https://github.com/ocornut/imgui/archive/v${IMGUI_VERSION}.tar.gz -> imgui-${IMGUI_VERSION}.gh.tar.gz -" -S="${WORKDIR}/pyimgui-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="allegro glfw glut opengl sdl vulkan doc" - -RDEPEND="media-libs/imgui[bindings,allegro?,glfw?,glut?,opengl?,sdl?,vulkan?]" -BDEPEND=" - - - - - gasc@eurecom.fr - Gasc Henri - - - imgui - pyimgui/pyimgui - https://pyimgui.readthedocs.io - - - Enable allegro backend and renderer - Enable glfw backend - Enable glut backen - Enable opengl renderer - Enable sdl backend - Enable vulkan renderer - - diff --git a/dev-python/moderngl-window/Manifest b/dev-python/moderngl-window/Manifest index ab5201f614..c53988d8e5 100644 --- a/dev-python/moderngl-window/Manifest +++ b/dev-python/moderngl-window/Manifest @@ -1 +1 @@ -DIST moderngl-window-2.4.4.gh.tar.gz 30989161 BLAKE2B 9c4c8bea6a69cf0df4e5967f28be8766c89206a2a9315f86f8b1c4fb2dd30dfddaac82a40cf28bcf6e2337811135daf389367fe8eefbfb7b93c61f1de1db6406 SHA512 8c8f027c2be4d9acfed3ac0f299e0d27bd0a0f2b7ad7f87d5309c276fa3a8ff4afd417e94f808a22a8ff683ae2465aba6a8d09dc07d621dff2b9f8606ceb3ccd +DIST moderngl-window-2.4.5.gh.tar.gz 30982181 BLAKE2B 784cdbd1c5a8cb1bee3387e80c0e3663135997a40498325d5b7f9c58092cc1c4813d26b1aad756e6364f97f7742da39a16e8b7bb4cb368de019aa00ad6c3b438 SHA512 4305951d9753696ad2caa259af52c45eda8e02fee061d45cd364899942d2d00cf9ba23b8193a5a52e249f88da21df260efcd49e5f756f3743fdfbcf70144d405 diff --git a/dev-python/moderngl-window/moderngl-window-2.4.4.ebuild b/dev-python/moderngl-window/moderngl-window-2.4.4.ebuild deleted file mode 100644 index dbac06c132..0000000000 --- a/dev-python/moderngl-window/moderngl-window-2.4.4.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 virtualx - -DESCRIPTION="A cross platform utility library for ModernGL" -HOMEPAGE="https://github.com/moderngl/moderngl-window https://pypi.org/project/moderngl-window" -SRC_URI="https://github.com/moderngl/moderngl-window/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc examples" - -NEEDED_FOR_TESTS_AND_RUN=" - >dev-python/numpy-1.16[${PYTHON_USEDEP}] - >=dev-python/PyWavefront-1.2.0[${PYTHON_USEDEP}] - =dev-python/scipy-1.3.2[${PYTHON_USEDEP}] - >=dev-python/trimesh-3.2.6[${PYTHON_USEDEP}] -" - -RDEPEND=" - dev-python/glfw[${PYTHON_USEDEP}] - dev-python/imgui[glfw,sdl,opengl,${PYTHON_USEDEP}] - =dev-python/pygame-2.0.1[${PYTHON_USEDEP}] - dev-python/pyglet[${PYTHON_USEDEP}] - >=dev-python/pyopengl-3.1.0[${PYTHON_USEDEP},tk] - =dev-python/pyrr-0.10[${PYTHON_USEDEP}] - - - - - gentoo@tastytea.de - tastytea - - - KDAB/KDSingleApplication - - diff --git a/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild b/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild index 8a905a8510..673101364d 100644 --- a/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild +++ b/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/k4zmu2a/${PN}/archive/refs/tags/Release_${PV}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="~amd64 ~arm64 ~ppc64" DEPEND=" media-libs/libsdl2 diff --git a/games-arcade/taisei/Manifest b/games-arcade/taisei/Manifest index ce0718fe91..35fb7293ca 100644 --- a/games-arcade/taisei/Manifest +++ b/games-arcade/taisei/Manifest @@ -1,3 +1,2 @@ DIST taisei-1.4.1.tar.xz 219550456 BLAKE2B 640b4e53b4ee4784173a8ba0ea435a75aa547a788e549f56c3dff99f9a36997a3c7c73d857fc86bf7aa10d6c22f3bf826991d3a61147e2ec24771fb96c987ed6 SHA512 7c11ed1c7a7898ca4f43854224c8e55305fcef8312f0d32b488c85fbf16cceaa84fd52948bb81e311095b93254d95ea7eaa8f85c42bbbe54cf81d2702242cb2b DIST taisei-1.4.tar.xz 219573588 BLAKE2B c5a3300f3274ccc13e1beef9eb673affc223d761dfb632d9b067bc7cf401c3ed0422a78e0dba5334ab003044dae2cb24efb892edc955ee417ebc6c0477617314 SHA512 5715fd7dca868a3987941f24e26fb8ddc507ca5cb4e3c6a2b9c021bc0742d164e6ff2410f7b8de85907baa90f2c4b34925ac1196b163474047bee60141befb86 -DIST taisei-v1.3.2.tar.xz 70481856 BLAKE2B 608b5db6f17e2693539ce0742a1812633e91e901b3935b9e54f91514827642334f6cb6f0217aff713f1ff9dd01d971ae895ac8c98b0360f254b52d3e49bfae61 SHA512 9304c082106dfa1ffcf6c8fb7333e64755b1246ef50b9f49d3e64d167eb15575ac667ca658b1d7e247582e164e703e5817384556dd633f5516670d975817717d diff --git a/games-arcade/taisei/taisei-1.3.2-r2.ebuild b/games-arcade/taisei/taisei-1.3.2-r2.ebuild deleted file mode 100644 index 093a2e66ae..0000000000 --- a/games-arcade/taisei/taisei-1.3.2-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10,11} ) - -inherit meson python-any-r1 xdg - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/taisei-project/taisei.git" -else - SRC_URI="https://github.com/taisei-project/taisei/releases/download/v${PV}/${PN}-v${PV}.tar.xz" - KEYWORDS="~amd64" - S="${WORKDIR}/${PN}-v${PV}" -fi - -DESCRIPTION="Clone of the Touhou series, written in C using SDL/OpenGL/OpenAL." -HOMEPAGE="https://taisei-project.org/" -LICENSE="MIT CC-BY-4.0 CC0-1.0 public-domain" -SLOT="0" - -IUSE="doc lto zip" - -RDEPEND=" - media-libs/freetype:2 - media-libs/opusfile - >=media-libs/libpng-1.5 - media-libs/libsdl2 - media-libs/sdl2-mixer[opus] - media-libs/libwebp - sys-libs/zlib - dev-libs/openssl:= - zip? ( dev-libs/libzip ) -" -DEPEND=" - ${RDEPEND} - >=dev-libs/cglm-0.7.8 -" -BDEPEND=" - >=dev-build/meson-0.53 - ${PYTHON_DEPS} - doc? ( dev-python/docutils )" - -src_prepare() { - if use doc; then - sed -i "s/doc_path = join.*/doc_path = join_paths(datadir, \'doc\', \'${PF}\')/" \ - meson.build || die "Failed changing doc_path" - fi - default -} - -src_configure() { - local emesonargs=( - $(meson_use doc docs) - $(meson_use lto b_lto) - $(meson_use zip enable_zip) - -Dstrip=false - -Duse_libcrypto=true - ) - meson_src_configure -} diff --git a/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild b/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild index cb5955edd6..274907ba47 100644 --- a/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild +++ b/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh. LICENSE="|| ( MIT-0 public-domain )" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~ppc64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/media-video/manimgl/manimgl-9999.ebuild b/media-video/manimgl/manimgl-9999.ebuild index dfc646d1e5..f574a2feeb 100644 --- a/media-video/manimgl/manimgl-9999.ebuild +++ b/media-video/manimgl/manimgl-9999.ebuild @@ -3,10 +3,18 @@ EAPI=8 +DOCS_BUILDER="sphinx" +DOCS_DIR="docs/source" +DOCS_DEPEND=" + dev-python/furo + dev-python/jinja2-cli + dev-python/sphinx-copybutton +" + DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 git-r3 +inherit distutils-r1 git-r3 docs DESCRIPTION="Animation engine for explanatory math videos" HOMEPAGE="https://github.com/3b1b/manim https://pypi.org/project/manimgl/" @@ -21,7 +29,6 @@ fi LICENSE="MIT" SLOT="0" -IUSE="doc" RDEPEND=" dev-python/colour[${PYTHON_USEDEP}] @@ -55,28 +62,14 @@ RDEPEND=" dev-python/typing-extensions[${PYTHON_USEDEP}] ' python3_{7..10}) " -# typing-extensions is needed for python < 3.11 +# typing-extensions is only needed for python < 3.11 # so, only python3.10 should work too (because of PYTHON_COMPAT) -BDEPEND=" - doc? ( - dev-python/furo[${PYTHON_USEDEP}] - dev-python/jinja2-cli[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-copybutton[${PYTHON_USEDEP}] - ) -" - DEPEND="${RDEPEND}" -python_compile_all() { - use doc && emake -C "${S}/docs" man && mv "${S}/docs/build/man/manim.1" "${S}/docs/build/man/${PN}.1" -} - python_install_all() { - distutils-r1_python_install_all + default if use doc; then - doman "${S}/docs/build/man/${PN}.1" docinto examples dodoc example_scenes.py dodoc docs/example.py diff --git a/net-vpn/candy/Manifest b/net-vpn/candy/Manifest index 8691142b70..bb4dcc22a2 100644 --- a/net-vpn/candy/Manifest +++ b/net-vpn/candy/Manifest @@ -1 +1 @@ -DIST candy-4.1.tar.gz 43205 BLAKE2B c999099302690f759bfb877fdd9213e7b4d5a2cce649936913a3c6a40e79a72149a1dc971649ff9773fd0bfc1d56c1a8b97edffeaa724c2656bb846ee26827d9 SHA512 f019de51cec3942b854d7ffd35f9f7a669a26a967e78383bab6c5f2c58fca02f40e8fe9f502bd6e395623f917f2ccc6c8a2f05b96d4f164de4f018f763913cda +DIST candy-5.3.tar.gz 48212 BLAKE2B 599b9ab1629f291b791bff51fc9059ed41228389d4c52d880b5efd40c31849906c5122da555fcfa5be3fb0b7c1ec6f3ce4c0f1a62e050ea00891bd89309873a4 SHA512 943f6ab211ba737dc706b2a7c09c50f1b6a00276d4ac937ed0c04df7d40078d41a0b71f0a132e8a1b532d0ec21e78fffc696d7d75b8398201456f64b920f4c86 diff --git a/net-vpn/candy/candy-4.1.ebuild b/net-vpn/candy/candy-5.3.ebuild similarity index 92% rename from net-vpn/candy/candy-4.1.ebuild rename to net-vpn/candy/candy-5.3.ebuild index 4067f7cd8d..8dc55f6ff3 100644 --- a/net-vpn/candy/candy-4.1.ebuild +++ b/net-vpn/candy/candy-5.3.ebuild @@ -16,10 +16,8 @@ KEYWORDS="~amd64" DEPEND=" dev-libs/uriparser dev-libs/libconfig - net-libs/ixwebsocket[ws] + dev-libs/poco dev-libs/openssl - sys-libs/zlib - dev-libs/libfmt dev-libs/spdlog " RDEPEND="${DEPEND}" diff --git a/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch b/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch deleted file mode 100644 index 445d5ad080..0000000000 --- a/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 317538a145784eb28b530a7969e941dc047cbf06 Mon Sep 17 00:00:00 2001 -From: lanthora -Date: Wed, 21 Feb 2024 06:20:29 +0000 -Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8=E7=B3=BB?= - =?UTF-8?q?=E7=BB=9F=E7=9A=84=20ixwebsocket?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - CMakeLists.txt | 20 +++++++++++++++++--- - 1 file changed, 17 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2da4334..160cfa1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,9 +20,13 @@ pkg_check_modules( - liburiparser - ) - -+pkg_check_modules(IXWEBSOCKET ixwebsocket) -+ - find_library(ARGP_LIB argp) - --include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ixwebsocket.cmake) -+if (NOT IXWEBSOCKET_FOUND) -+ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ixwebsocket.cmake) -+endif() - - if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/wintun.cmake) -@@ -30,7 +34,12 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - endif() - - include_directories(${DEPENDENCIES_INCLUDEDIR}) --include_directories(${ixwebsocket_SOURCE_DIR}) -+ -+if (IXWEBSOCKET_FOUND) -+ include_directories(${IXWEBSOCKET_INCLUDEDIR}) -+else() -+ include_directories(${ixwebsocket_SOURCE_DIR}) -+endif() - - add_subdirectory(${SOURCE}/core) - add_subdirectory(${SOURCE}/websocket) -@@ -43,7 +52,12 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE websocket) - target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE tun) - target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE peer) - target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE utility) --target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ixwebsocket) -+ -+if (IXWEBSOCKET_FOUND) -+ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ${IXWEBSOCKET_LIBRARIES}) -+else() -+ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ixwebsocket) -+endif() - - if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE iphlpapi) diff --git a/net-vpn/candy/files/candy-4.0-show-version-and-use-cflags-env.patch b/net-vpn/candy/files/candy-4.0-show-version-and-use-cflags-env.patch deleted file mode 100644 index c0e0121f14..0000000000 --- a/net-vpn/candy/files/candy-4.0-show-version-and-use-cflags-env.patch +++ /dev/null @@ -1,80 +0,0 @@ -From de8f5a3109ee3bdc472fbc7fcb1572aaad0b8cb9 Mon Sep 17 00:00:00 2001 -From: lanthora -Date: Thu, 29 Feb 2024 05:16:53 +0000 -Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E7=89=88?= - =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - CMakeLists.txt | 10 ++++++---- - src/main/main.cc | 13 +++++++++++++ - 2 files changed, 19 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ebf2c0..dffc31d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,10 +1,12 @@ - cmake_minimum_required(VERSION 3.18.4) - --project(candy CXX) -+project(candy LANGUAGES CXX VERSION 4.0) - --set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++2b -Wall -Werror -Wfatal-errors -Wno-unknown-pragmas") --set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g -fsanitize=address") --set(CMAKE_CXX_FLAGS_RELEASE_INIT "-O2") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++2b -Wall -Werror -Wfatal-errors -Wno-unknown-pragmas") -+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address") -+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2") -+ -+add_compile_definitions(VERSION="${CMAKE_PROJECT_VERSION}") - - include_directories(${CMAKE_SOURCE_DIR}/src) - -diff --git a/src/main/main.cc b/src/main/main.cc -index 286d24d..65cdc4f 100644 ---- a/src/main/main.cc -+++ b/src/main/main.cc -@@ -21,6 +21,10 @@ - - #include - -+#ifndef VERSION -+#define VERSION "unknown" -+#endif -+ - namespace { - - struct arguments { -@@ -54,6 +58,7 @@ struct argp_option options[] = { - {"config", 'c', "PATH", 0, "Configuration file path"}, - {"discovery", OPT_DISCOVERY_INTERVAL, "SECONDS", 0, "Active discovery broadcast interval"}, - {"route", 'r', "COST", 0, "Cost of routing"}, -+ {"version", 'v', 0, 0, "Show version"}, - {"no-timestamp", OPT_NO_TIMESTAMP, 0, 0, "Log does not show time"}, - {"debug", OPT_LOG_LEVEL_DEBUG, 0, 0, "Show debug level logs"}, - {"auto-restart", OPT_AUTO_RESTART, 0, 0, "Automatic restart"}, -@@ -72,6 +77,11 @@ int setLogLevelDebug() { - return 0; - } - -+void showVersion() { -+ std::cout << VERSION << std::endl; -+ exit(0); -+} -+ - bool needShowUsage(struct arguments *arguments, struct argp_state *state) { - if (state->arg_num > 0) - return true; -@@ -141,6 +151,9 @@ int parseOption(int key, char *arg, struct argp_state *state) { - case 'c': - parseConfigFile(arguments, arg); - break; -+ case 'v': -+ showVersion(); -+ break; - case OPT_NO_TIMESTAMP: - disableLogTimestamp(); - break; diff --git a/profiles/package.mask b/profiles/package.mask index 0c9c1d4c01..8e9dce7499 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -14,18 +14,6 @@ # New entries go on top. -# David Roman (2024-03-11) -# Duplicated, we already have media-video/ffmpeg-chromium -www-plugins/yandex-browser-ffmpeg-codecs-bin - -# Julien Roy (2024-03-10) -# (2024-03-09) # Dracut fails to boot with Clevis 20 # https://github.com/latchset/clevis/issues/456 diff --git a/sci-physics/ovito/ovito-3.10.1.ebuild b/sci-physics/ovito/ovito-3.10.1.ebuild index 9449df6239..ed9d83dd60 100644 --- a/sci-physics/ovito/ovito-3.10.1.ebuild +++ b/sci-physics/ovito/ovito-3.10.1.ebuild @@ -19,12 +19,13 @@ S="${WORKDIR}/${PN}-v${PV}" inherit cmake desktop DEPEND=" + dev-libs/boost + dev-libs/c-blosc dev-qt/qtbase:6[gui] dev-qt/qtsvg:6 - sci-libs/hdf5 - dev-libs/boost - sci-libs/netcdf media-video/ffmpeg + sci-libs/hdf5 + sci-libs/netcdf virtual/opengl " diff --git a/sci-physics/ovito/ovito-3.10.3.ebuild b/sci-physics/ovito/ovito-3.10.3.ebuild index 9449df6239..ed9d83dd60 100644 --- a/sci-physics/ovito/ovito-3.10.3.ebuild +++ b/sci-physics/ovito/ovito-3.10.3.ebuild @@ -19,12 +19,13 @@ S="${WORKDIR}/${PN}-v${PV}" inherit cmake desktop DEPEND=" + dev-libs/boost + dev-libs/c-blosc dev-qt/qtbase:6[gui] dev-qt/qtsvg:6 - sci-libs/hdf5 - dev-libs/boost - sci-libs/netcdf media-video/ffmpeg + sci-libs/hdf5 + sci-libs/netcdf virtual/opengl " diff --git a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild index 8507d75b41..a98d9f643f 100644 --- a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild +++ b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild @@ -21,7 +21,8 @@ fi DESCRIPTION="Lenovo Legion Linux kernel module" HOMEPAGE="https://github.com/johnfanv2/LenovoLegionLinux" -BDEPEND="sys-kernel/linux-headers +BDEPEND=" + sys-kernel/linux-headers sys-apps/lm-sensors sys-apps/dmidecode sys-apps/sed @@ -33,9 +34,9 @@ RDEPEND=" dev-python/pyyaml dev-python/argcomplete dev-python/darkdetect + sys-power/acpid ) downgrade-nvidia? ( <=x11-drivers/nvidia-drivers-525 ) - acpi? ( sys-power/acpid ) radeon-dgpu? ( dev-util/rocm-smi ) ryzenadj? ( sys-power/RyzenAdj ) undervolt-intel? ( dev-python/undervolt ) @@ -45,8 +46,8 @@ DEPEND="${RDEPEND}" LICENSE="GPL-2" SLOT="0" -IUSE="gui acpi systemd radeon-dgpu downgrade-nvidia ryzenadj undervolt-intel" -REQUIRED_USE="|| ( systemd acpi radeon-dgpu downgrade-nvidia ryzenadj gui undervolt-intel ) acpi? ( gui ) radeon-dgpu? ( !downgrade-nvidia gui ) downgrade-nvidia? ( !radeon-dgpu gui ) undervolt-intel? ( !ryzenadj gui ) ryzenadj? ( !undervolt-intel gui )" +IUSE="+gui radeon-dgpu downgrade-nvidia ryzenadj undervolt-intel" +REQUIRED_USE="|| ( radeon-dgpu downgrade-nvidia ryzenadj gui undervolt-intel ) radeon-dgpu? ( !downgrade-nvidia gui ) downgrade-nvidia? ( !radeon-dgpu gui ) undervolt-intel? ( !ryzenadj gui ) ryzenadj? ( !undervolt-intel gui )" MODULES_KERNEL_MIN=5.10 @@ -65,51 +66,42 @@ src_compile() { sed -i "s/version = _VERSION/version = ${PV}/g" "${WORKDIR}/${P}/python/legion_linux/setup.cfg" fi #Define build dir (fix sandboxed) - cd "${WORKDIR}/${P}/python/legion_linux" + cd "${WORKDIR}/${P}/python/legion_linux" || die distutils-r1_src_compile --build-dir "${WORKDIR}/${P}/python/legion_linux/build" + cd "legion_linux/extra/service/legiond" || die + emake fi } src_install() { linux-mod-r1_src_install - #Load the module without reboot - pushd python/legion_linux/ || die - make forcereloadmodule - popd || die if use gui; then #Define build dir (fix sandboxed) - cd "${WORKDIR}/${P}/python/legion_linux/" + cd "${WORKDIR}/${P}/python/legion_linux/" || die distutils-r1_src_install --build-dir "${WORKDIR}/${P}/python/legion_linux/build" - cd "${WORKDIR}/${P}/extra" + cd "${WORKDIR}/${P}/extra" || die - if use systemd; then - systemd_dounit service/legion-linux.service service/legion-linux.path service/legion-linux-onresume.service - fi - - if use acpi; then - insinto /usr/share/legion_linux/acpi/events - doins acpi/events/{ac_adapter_legion-fancurve,novo-button,PrtSc-button,fn-r-refrate} - insinto /usr/share/legion_linux/acpi/actions - doins acpi/actions/{battery-legion-quiet.sh,snipping-tool.sh,fn-r-refresh-rate.sh} - fi + systemd_dounit service/legiond.service service/legiond-onresume.service + insinto /etc/acpi/events + doins acpi/events/{legion_ppd,legion_ac} + dobin service/legiond/legiond + dobin service/legiond/legiond-cli fi } pkg_postinst() { - if use systemd; then - ewarn "Default config files are present in /usr/share/legion_linux" - ewarn "Copy folder /usr/share/legion_linux to /etc/legion_linux" - ewarn "Note:Fancurve can edit using the gui app" - ewarn "Dont forget to edit /etc/legion_linux/.env to enable and disable extra features" - ewarn "Note the CPU and APU control command both for undervolt an ryzenadj are edit in /etc/legion_linux/.env command" - if !use downgrade-nvidia; then - ewarn "Note: use flag downgrade-nvidia if you need for nvidia TDP control (requires driver 525 to work)\n" - else - ewarn "Note: Edit /etc/legion_linux/.env to enable nvidia TDP control\n" - fi + ewarn "Default config files are present in /usr/share/legion_linux" + ewarn "Copy folder /usr/share/legion_linux to /etc/legion_linux" + ewarn "Note: Fancurve can be edit using the gui app" + ewarn "Dont forget to edit /etc/legion_linux/.env to enable and disable extra features" + ewarn "Note the CPU and APU control command both for undervolt an ryzenadj are edit in /etc/legion_linux/.env" + if !use downgrade-nvidia; then + ewarn "Note: use flag downgrade-nvidia if you need for nvidia TDP control (requires driver 525 to work)\n" + ewarn "This useflag will be drop soon since 525 is almost 6 months old" + else + ewarn "Note: Edit /etc/legion_linux/.env to enable nvidia TDP control\n" fi - use acpi && ewarn "Acpi exemples are included in /usr/share/legion_linux/acpi\n" ewarn "Note for 2023-2023 Legion user: It need help for testing the features" ewarn "Pls test the feature how is decribe in the README of the project!" ewarn "and also go to this issue in github: https://github.com/johnfanv2/LenovoLegionLinux/issues/46" diff --git a/sys-firmware/lenovolegionlinux/metadata.xml b/sys-firmware/lenovolegionlinux/metadata.xml index 0bf12c93d9..bd4ddf3020 100644 --- a/sys-firmware/lenovolegionlinux/metadata.xml +++ b/sys-firmware/lenovolegionlinux/metadata.xml @@ -3,7 +3,6 @@ Build and install legion_gui and legion_cli - Provide acpi exemple /usr/share/legion_linux/acpi Enable AMD GPU TDP control (systemd-service) Downgrade nvidia for 525 to enable TDP control (systemd-service) [AMD] CPU and APU control using ryzenadj (systemd-service) diff --git a/www-apps/forgejo/Manifest b/www-apps/forgejo/Manifest index 73ae572849..9b0291dd93 100644 --- a/www-apps/forgejo/Manifest +++ b/www-apps/forgejo/Manifest @@ -1,3 +1,3 @@ DIST forgejo-1.20.6.0.tar.gz 55539743 BLAKE2B d44fcaec52b164099a221f2172faab8fe078b5fdaf8c9910042278f6276f4ff557d2a527a5159a0bb157f773ffcc91595d2183e1be53b97187cb35ee684fa7ce SHA512 047b41b3192053df8c0f37675c087bc5fbed9967e8f23cab35bede76071129e6f18ec0561a0415a2eaa2010877dedfd15a231f050a1738fca1a5e437f89e93b5 -DIST forgejo-1.21.5.0.tar.gz 58775082 BLAKE2B 05b5ee8a394ad2968769cda82b0caa368d6a0fa81686c67e3384ad8b69b43acfd53702af3ff383f05c6b2a4a2e191fb77ca7bd4755ce231451c21c97cc79e270 SHA512 947870af1601dcad9ed08157c0dc8971e333646b1ff1312592f408896e6a87804ed4dc1a22af87d1948fd64a34ec5af0209bad23fb742bb585244588b11062cf DIST forgejo-1.21.6.0.tar.gz 58787727 BLAKE2B 7d3b77b05771261986a7623a79f9eee1525c723eb5bb2cdb9c7a66ee12bc5fb352ab5857aece92359d397ded4b57cb5ce31ca98cba0d45871f237a27bb009bb7 SHA512 298544a8301bc2415b0cbad943316ac4b2b17b3ab15927d707a34e48fe04d327756c8febe3a8e942c1fd1edd3c92109ddcaf6a12e31d360d4fc82575e9f18565 +DIST forgejo-1.21.7.0.tar.gz 58802779 BLAKE2B da03bc3fead3b477a6a5492c02223f546275145531843f9301de914e054e35e22cb2a1decf573f874467bd03689abf79a2b898174359ee5e5483463d4857329b SHA512 dbcb43b0e36c19e20e09c594b84656f06ae901cb4d298827c48fccdd0879383a1da8119c7bd3ce4f832a1588673c33e1bd382813bc37d1ffda41f3f7a22ec538 diff --git a/www-apps/forgejo/forgejo-1.21.5.0.ebuild b/www-apps/forgejo/forgejo-1.21.7.0.ebuild similarity index 100% rename from www-apps/forgejo/forgejo-1.21.5.0.ebuild rename to www-apps/forgejo/forgejo-1.21.7.0.ebuild diff --git a/www-plugins/yandex-browser-ffmpeg-codecs-bin/Manifest b/www-plugins/yandex-browser-ffmpeg-codecs-bin/Manifest deleted file mode 100644 index d484e7bd0d..0000000000 --- a/www-plugins/yandex-browser-ffmpeg-codecs-bin/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST chromium-codecs-ffmpeg-extra_112.0.5615.49-0ubuntu0.18.04.1_amd64.deb 1113644 BLAKE2B f189ff98c5720497b7a2cd22f3f234e1f4ea9a14ae619176b68aa6a67ff2b9948e37f3684b5a954c6d3886ca5b921879c7850957580d9946e0786446c38deab3 SHA512 1e1cdceff1d9e1c585b4d33cf8afeb8f35ebbe9bbda2044b4e3538e832bddb170917b32e321bbed7936e14f40721ad4d4d89f4c4371e32e8e69f60ea6cda9c5e -DIST chromium-codecs-ffmpeg-extra_112.0.5615.49-0ubuntu0.18.04.1_i386.deb 1095040 BLAKE2B 9fa82d21d4abfa50eec7453c9e895b71f11ceb5c7761ee94455be1b714d3ce3b5754231cbcac3a5e51a205eab7ee4b9df75c8572c578138affc0be6dc7a3ca63 SHA512 4ba7817102820f17f3b9d4ebf4f6d3f64135798ce7f0cc333712a27e0c1838c88dc314c8e01fd161368d6fadfde3e8c5003242233a1a45c50c5160d72d64578c diff --git a/www-plugins/yandex-browser-ffmpeg-codecs-bin/yandex-browser-ffmpeg-codecs-bin-112.0.5615.49.ebuild b/www-plugins/yandex-browser-ffmpeg-codecs-bin/yandex-browser-ffmpeg-codecs-bin-112.0.5615.49.ebuild deleted file mode 100644 index 9aa81e4871..0000000000 --- a/www-plugins/yandex-browser-ffmpeg-codecs-bin/yandex-browser-ffmpeg-codecs-bin-112.0.5615.49.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2023 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit unpacker - -KEYWORDS="~amd64 ~x86" -DESCRIPTION="Multi-threaded ffmpeg codecs needed for the HTML5