diff --git a/app-misc/catt/Manifest b/app-misc/catt/Manifest index 0971e0d6f5..6eca9422f0 100644 --- a/app-misc/catt/Manifest +++ b/app-misc/catt/Manifest @@ -1,2 +1 @@ -DIST catt-0.12.12.tar.gz 79042 BLAKE2B d0885f6030d4ece8f233c568d626fa4e67cba2f7be499dcc290c4d54cf9c6bde6cebe80b37b0147e463ed90694fc8f58d07f95ecfe9454209d05c1598741394e SHA512 8838f7b2e8700dbe924c53dff7c776fcd31646c061065a297ae2399134af7cd5d4bf359d3b7aed23faa3e8987e0e6db4af1cf54a703ba8ce86e532a56586b228 DIST catt-0.12.13.tar.gz 79044 BLAKE2B 627ca1a83e35e9021972268c2a920c0b8d2d219dfc6eca7d8c175efe3e5ed248ebb417fad7fd4088d2d1f2758d32801c15c928cc14c87a0f5d170900f2ba4f7e SHA512 20b249d522b5f0bc10473185882102a1a114b6b12d6961e2d510337cf80151384d19c7085ca0881321e1cf6fe043a1570a7c554e5eafcd331275d4e2685fb551 diff --git a/app-misc/catt/catt-0.12.12-r1.ebuild b/app-misc/catt/catt-0.12.12-r1.ebuild deleted file mode 100644 index fa2c66c848..0000000000 --- a/app-misc/catt/catt-0.12.12-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=poetry -inherit distutils-r1 - -DESCRIPTION="Send videos from many, many online sources to your Chromecast" -HOMEPAGE="https://github.com/skorokithakis/catt" -SRC_URI="https://github.com/skorokithakis/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64" - -# Seems that all tests makes external connections -RESTRICT="test" - -DEPEND=" - dev-python/click[${PYTHON_USEDEP}] - - kocelfc@tutanota.com + kostadinshishmanov@protonmail.com Kostadin Shishmanov diff --git a/app-misc/kmon/metadata.xml b/app-misc/kmon/metadata.xml index ec14986a5a..264bf12067 100644 --- a/app-misc/kmon/metadata.xml +++ b/app-misc/kmon/metadata.xml @@ -2,7 +2,7 @@ - kocelfc@tutanota.com + kostadinshishmanov@protonmail.com Kostadin Shishmanov diff --git a/app-misc/ollama/metadata.xml b/app-misc/ollama/metadata.xml index 3520432256..4ebf012287 100644 --- a/app-misc/ollama/metadata.xml +++ b/app-misc/ollama/metadata.xml @@ -7,8 +7,7 @@ A copy from https://github.com/MrPenguin07/ebuilds/tree/master/dev-ml/ollama - Add support of nvidia - Add support of amd + Enable NVIDIA CUDA support ollama/ollama diff --git a/app-misc/ollama/ollama-9999.ebuild b/app-misc/ollama/ollama-9999.ebuild index c45ce6165d..f0d2f0be26 100644 --- a/app-misc/ollama/ollama-9999.ebuild +++ b/app-misc/ollama/ollama-9999.ebuild @@ -1,9 +1,10 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit git-r3 go-module +ROCM_VERSION=6.1 +inherit git-r3 go-module rocm DESCRIPTION="Get up and running with Llama 3, Mistral, Gemma, and other language models." HOMEPAGE="https://ollama.com" @@ -11,7 +12,18 @@ EGIT_REPO_URI="https://github.com/ollama/ollama.git" LICENSE="MIT" SLOT="0" -IUSE="nvidia amd" +IUSE="cuda video_cards_amdgpu +cpu_flags_x86_avx cpu_flags_x86_avx2 +cpu_flags_x86_avx512f cpu_flags_x86_avx512vbmi cpu_flags_x86_avx512_vnni cpu_flags_x86_avx512_bf16 +" + +REQUIRED_USE=" + cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) + cpu_flags_x86_avx512f? ( cpu_flags_x86_avx2 ) + cpu_flags_x86_avx512vbmi? ( cpu_flags_x86_avx512f ) + cpu_flags_x86_avx512_vnni? ( cpu_flags_x86_avx512f ) + cpu_flags_x86_avx512_bf16? ( cpu_flags_x86_avx512f ) +" RDEPEND=" acct-group/ollama @@ -22,15 +34,14 @@ BDEPEND=" >=dev-lang/go-1.23.4 >=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 + cuda? ( dev-util/nvidia-cuda-toolkit ) + video_cards_amdgpu? ( + =sci-libs/hipBLAS-${ROCM_VERSION}* ) " pkg_pretend() { - if use amd; then + if use video_cards_amdgpu || use cuda; 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" @@ -44,20 +55,51 @@ src_unpack() { go-module_live_vendor } -src_compile() { - VERSION=$( - git describe --tags --first-parent --abbrev=7 --long --dirty --always \ - | sed -e "s/^v//g" - assert - ) - export GOFLAGS="'-ldflags=-w -s \"-X=github.com/ollama/ollama/version.Version=${VERSION}\"'" +src_prepare() { + default - ego generate ./... - ego build . + if use video_cards_amdgpu; then + # --hip-version gets appended to the compile flags which isn't a known flag. + # This causes rocm builds to fail because -Wunused-command-line-argument is turned on. + # Use nuclear option to fix this. + # Disable -Werror's from go modules. + find "${S}" -name ".go" -exec sed -i "s/ -Werror / /g" {} + || die + fi +} + +src_compile() { + CUSTOM_CPU_FLAGS="" + use cpu_flags_x86_avx && CUSTOM_CPU_FLAGS+="avx" + use cpu_flags_x86_avx2 && CUSTOM_CPU_FLAGS+=",avx2" + use cpu_flags_x86_avx512f && CUSTOM_CPU_FLAGS+=",avx512" + use cpu_flags_x86_avx512vbmi && CUSTOM_CPU_FLAGS+=",avx512vbmi" + use cpu_flags_x86_avx512_vnni && CUSTOM_CPU_FLAGS+=",avx512vnni" + use cpu_flags_x86_avx512_bf16 && CUSTOM_CPU_FLAGS+=",avx512bf16" + + # Build basic ollama executable with cpu features built in + export CUSTOM_CPU_FLAGS + + if use video_cards_amdgpu; then + export HIP_ARCHS=$(get_amdgpu_flags) + export HIP_PATH="/usr" + else + export OLLAMA_SKIP_ROCM_GENERATE=1 + fi + + if ! use cuda; then + export OLLAMA_SKIP_CUDA_GENERATE=1 + fi + emake dist } src_install() { - dobin ollama + dobin dist/linux-${ARCH}/bin/ollama + + if [[ -d "dist/linux-${ARCH}/lib/ollama" ]] ; then + insinto /usr/lib + doins -r dist/linux-${ARCH}/lib/ollama + fi + doinitd "${FILESDIR}"/ollama } diff --git a/dev-cpp/units/metadata.xml b/dev-cpp/units/metadata.xml index 2ce46e4b24..46d087b560 100644 --- a/dev-cpp/units/metadata.xml +++ b/dev-cpp/units/metadata.xml @@ -2,7 +2,7 @@ - kocelfc@tutanota.com + kostadinshishmanov@protonmail.com Kostadin Shishmanov diff --git a/dev-embedded/arduino-cli/Manifest b/dev-embedded/arduino-cli/Manifest index ec5b082aec..79ad274035 100644 --- a/dev-embedded/arduino-cli/Manifest +++ b/dev-embedded/arduino-cli/Manifest @@ -1,4 +1,4 @@ -DIST arduino-cli-1.0.3-vendor.tar.xz 3089868 BLAKE2B acbb9859c38df2ea9860d665af2d0a907b2f4c6d525c5f649f68a8524a23780558885bc0c015f0a4c05b2a50d5d75513f7a616f28f9271773b22e2cfb05209c7 SHA512 5b2efbc0ec5cd70074118a30eeea936f3d47a589f966f2c18e6dace6f55654283291ae26eae80ae8d5b501942608078339a327774409ba52b275c700ffb7e80e -DIST arduino-cli-1.0.3.tar.gz 10047511 BLAKE2B 6555521fc7de557a96287ac3b97df724f9f84924860bcae05a07272e78b55458bc2fdbc0f0686bf6a6a242e8355e55ddc30a9f1158c5d6519ed5f27255db9fcb SHA512 3763bda2a187a8b2f48275c27f1c9e21984744cc8758dcf1b37acc1f2a51dca3f48e5049573e564bb36770bce5e0e7d26e5976e1c89c291ca34caf063e7bfe11 DIST arduino-cli-1.0.4-vendor.tar.xz 3090184 BLAKE2B 31252bdea3ecffb1e7ea82274b93707663e68c72758b4ee6f933ac2f58436cff6957fac67949dd3938d03ccc7437cf455ea7699142755d64fc3f0700d331ae23 SHA512 12aed3b4006ee9f96fa94cd1788aaa49995e4a66ea46814df9e37dfefe1a326233d18bd6ce4da7d564deb742c08db94fb833dc8f4111bdbeed191d7aa32b0491 DIST arduino-cli-1.0.4.tar.gz 10052105 BLAKE2B bbf1a3b8cdee533cd82d5f2019b0200e6c2386e7839abb857f323367d95f993d8d5c11a10e331afa37ee912b615d16de1c48718e3f36368f8ef70e9acd915618 SHA512 a7029ff6a623a60b791943c26ac7bf90bf95a8d4e1ef2b6091339f47fa52683649e852fc206606eb324bf4fd617e5bba3f0cc8901d5cf82ebd907e7e7b9cbcc2 +DIST arduino-cli-1.1.1-vendor.tar.xz 3125648 BLAKE2B 0300db72042a1b699839a3d4ff9824ce460f9063bd7f03518edb0df5129fda549e2c7c385ed1d6438c7473e0473853549876c21c82601ba403a04914eef33cca SHA512 201da343811d6986f71929b8ebfd1a028788466afe99545707da7d7ca234a763e87332ec365a9be74837c6dca333fc747bdd452428abb3bfad4857726e60f16b +DIST arduino-cli-1.1.1.tar.gz 10136198 BLAKE2B 327441d5003aa215491429ac465de274bb20af925a4f080aa1a4cbd1189c3d1c4952196108780dd3981cb6305964b8051fcbbe76c6a1580a8924a30f9254ba42 SHA512 0ecca837e6c9e97e7314f5839a041e073d07e61df630328f6f1e960c7ac089b4850787c6bad910df946be6bd6d18612ac8c6ca0e4b4fcac29d90783cc5cc2b9e diff --git a/dev-embedded/arduino-cli/arduino-cli-1.0.3.ebuild b/dev-embedded/arduino-cli/arduino-cli-1.1.1.ebuild similarity index 100% rename from dev-embedded/arduino-cli/arduino-cli-1.0.3.ebuild rename to dev-embedded/arduino-cli/arduino-cli-1.1.1.ebuild diff --git a/dev-libs/lsbcrypt/files/1.0.0-fix-flags-directry.patch b/dev-libs/lsbcrypt/files/1.0.0-fix-flags-directry.patch deleted file mode 100644 index 75c4a083ef..0000000000 --- a/dev-libs/lsbcrypt/files/1.0.0-fix-flags-directry.patch +++ /dev/null @@ -1,14 +0,0 @@ -I am attempting to fix the following bugs. -https://bugs.gentoo.org/909726 -diff --git a/Makefile b/Makefile -index 03ebfa5..bed7d39 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ --CC = gcc --CFLAGS = $(shell grep '^CFLAGS = ' crypt_blowfish/Makefile | cut -d= -f2-) -+#CC = gcc -+#CFLAGS = $(shell grep '^CFLAGS = ' crypt_blowfish/Makefile | cut -d= -f2-) - .PHONY: crypt_blowfish - - all: bcrypt.a diff --git a/dev-libs/lsbcrypt/lsbcrypt-1.0.0-r2.ebuild b/dev-libs/lsbcrypt/lsbcrypt-1.0.0-r2.ebuild index 605f740e3f..a692e84949 100644 --- a/dev-libs/lsbcrypt/lsbcrypt-1.0.0-r2.ebuild +++ b/dev-libs/lsbcrypt/lsbcrypt-1.0.0-r2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit toolchain-funcs + COMMIT="55ff64349dec3012cfbbb1c4f92d4dbd46920213" DESCRIPTION="libcrypt wrapper for LiteSpeedTech" @@ -17,11 +19,21 @@ KEYWORDS="~amd64" PATCHES=( "${FILESDIR}"/${PV}-fix-tests.patch - "${FILESDIR}"/${PV}-fix-flags-directly.patch ) -src_test() { +src_prepare() { default + + # fix hardcoded ar + sed -i "s/ar/$(tc-getAR)/" Makefile || die +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_test() { + emake test CC="$(tc-getCC)" CFLAGS="${CFLAGS}" ./bcrypt_test || die "Tests failed!" } diff --git a/dev-python/python-lsp-isort/Manifest b/dev-python/python-lsp-isort/Manifest index ae4c07768c..20f11eb722 100644 --- a/dev-python/python-lsp-isort/Manifest +++ b/dev-python/python-lsp-isort/Manifest @@ -1 +1 @@ -DIST python-lsp-isort-0.1.gh.tar.gz 5065 BLAKE2B 385807fde3bbbfd73d7fdefb721375490be592203aac41bcb2e0a56ee5588f66a78c7e2f6b14458c2836987abb1607670935d12127caedb2ddd3b9e67b87b547 SHA512 fd2575e27c5a32c7a8dfabc8777ae9ce82a0c1fe9a46fe64341becbe60e8d37d07736950b986df307e608a777825fd51cbb1345b7163944e19086ab69985a472 +DIST python-lsp-isort-0.2.0.gh.tar.gz 5216 BLAKE2B 32d22c97e3c0add1bf808a27a94fda415c1250669130f86c7aab2d81da6fb9a7efc4ad3b23300d8418e0b60d70bd5831958e3427f4489d8d17405885d3ad1e86 SHA512 26b05e8fed70dca268c9ff6714d2b9ad68fda86ab4d9cb8893df1eaefc517e123945c5fe8928e94f646171ff2d0c2f33e9b058a784d2bf4dd31acf9f2aef1e6a diff --git a/dev-python/python-lsp-isort/python-lsp-isort-0.1.ebuild b/dev-python/python-lsp-isort/python-lsp-isort-0.2.0.ebuild similarity index 94% rename from dev-python/python-lsp-isort/python-lsp-isort-0.1.ebuild rename to dev-python/python-lsp-isort/python-lsp-isort-0.2.0.ebuild index f682d6b92a..f10a506f3f 100644 --- a/dev-python/python-lsp-isort/python-lsp-isort-0.1.ebuild +++ b/dev-python/python-lsp-isort/python-lsp-isort-0.2.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 diff --git a/dev-python/python-lsp-mypy/Manifest b/dev-python/python-lsp-mypy/Manifest index 6410ebfe79..c9da151580 100644 --- a/dev-python/python-lsp-mypy/Manifest +++ b/dev-python/python-lsp-mypy/Manifest @@ -1 +1 @@ -DIST python-lsp-mypy-0.6.9.gh.tar.gz 14650 BLAKE2B ce71c8b87e98a867c18e9e87855beb6edc7bc9816b6855cc52265cd5323cbcd04121792d2fee246c90eb739f7d7b26cfbc2b475b1edecbff32cf89e4054866f6 SHA512 a1451967b73f14d12600bc3a466ac44b3a2d53981420b01655e6af222a2c34ad5f46c95eb6c6cbb8be633d914aefe76a334df558620d59c5d3817cde60fdf94d +DIST python-lsp-mypy-0.7.0.gh.tar.gz 15973 BLAKE2B eb275e334dba2975011893f61a3edf04f988d21577b47c91bb28bd8d307c72be0ec47b6b45c460f4c7a0fd3f879225c861eb6885e5e45175b9565f9b288b6d00 SHA512 fa25bd2d36bb2d4bdbacef01b40f04a7c11f87a476cff0c034215f164735e9f377ba4268a3019002a1610cbe60c22a5b8ce8b54d9cb333d6d3f177476c075c20 diff --git a/dev-python/python-lsp-mypy/python-lsp-mypy-0.6.9.ebuild b/dev-python/python-lsp-mypy/python-lsp-mypy-0.7.0.ebuild similarity index 95% rename from dev-python/python-lsp-mypy/python-lsp-mypy-0.6.9.ebuild rename to dev-python/python-lsp-mypy/python-lsp-mypy-0.7.0.ebuild index a7583adbf6..fb89d4b335 100644 --- a/dev-python/python-lsp-mypy/python-lsp-mypy-0.6.9.ebuild +++ b/dev-python/python-lsp-mypy/python-lsp-mypy-0.7.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12}) +PYTHON_COMPAT=( python3_{10..13}) MY_PN="pylsp-mypy" diff --git a/dev-util/gammaray/Manifest b/dev-util/gammaray/Manifest index 51f6fd33e8..4986f74cef 100644 --- a/dev-util/gammaray/Manifest +++ b/dev-util/gammaray/Manifest @@ -1 +1 @@ -DIST gammaray-2.11.3.tar.gz 10841865 BLAKE2B 07a8c6a1257417d8daed5d7bfdd7e9aaaa353a0edfc0f20a73ac61fcf64e45030346f2268c50ecc220aeaffad38c3ecac788192c491778eca31d07ef9166329e SHA512 1fb16678ae4695567ffe6cca7870b3fcf8b82c2e9f15f005932586696a3e24f64e657ce25b0ebb87ba25646a6bdfe1c9b35a3604f341839e7c5183df859c05a0 +DIST gammaray-3.1.0.tar.gz 62728353 BLAKE2B 2adcb59ac0b9b7ae519a71ba5bcf9ae1c5162dcafcaab11028410070026e824fb0838a0aa408eca105d82ffc157d9ef9c3f334e34512d6b74ebb74bf2b38385b SHA512 efc6b075c99966e0b3f1f058b29ff9b4ad2349818e5ff71cfdccfb889807ac6b6afe95d981d033ac773fdfd965320d7644adf19a229160f545b4468d9ab53202 diff --git a/dev-util/gammaray/files/gammaray-2.11.3-deselect-tests.patch b/dev-util/gammaray/files/gammaray-2.11.3-deselect-tests.patch deleted file mode 100644 index 801629e8ae..0000000000 --- a/dev-util/gammaray/files/gammaray-2.11.3-deselect-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -288,17 +288,6 @@ - gammaray_add_test(earlyexittest earlyexittest.cpp) - target_include_directories(earlyexittest PRIVATE ${CMAKE_BINARY_DIR}/launcher) - target_link_libraries(earlyexittest gammaray_core gammaray_launcher) -- -- if(HAVE_QT_WIDGETS) -- gammaray_add_test(launchertest launchertest.cpp) -- target_include_directories(launchertest PRIVATE ${CMAKE_BINARY_DIR}/launcher) -- target_link_libraries(launchertest gammaray_core gammaray_launcher) -- endif() -- -- if(TARGET gammaray_client) -- gammaray_add_test(clientconnectiontest clientconnectiontest.cpp) -- target_link_libraries(clientconnectiontest gammaray_core gammaray_launcher gammaray_client) -- endif() - endif() - - # -@@ -419,14 +408,6 @@ - endif() - - if(Qt5Quick_FOUND) -- gammaray_add_quick_test(quickinspectortest -- quickinspectortest.cpp -- quickinspectortest.qrc -- $ -- ) -- target_include_directories(quickinspectortest SYSTEM PRIVATE ${Qt5Quick_PRIVATE_INCLUDE_DIRS}) -- target_link_libraries(quickinspectortest gammaray_core gammaray_quickinspector_shared Qt5::Quick) -- - gammaray_add_quick_test(quickinspectortest2 - quickinspectortest2.cpp - quickinspectortest.qrc -@@ -438,9 +419,6 @@ - if(NOT Qt5Quick_VERSION VERSION_LESS 5.9.3) - add_test(NAME quickinspectortest2_softwarecontext COMMAND quickinspectortest2) - set_tests_properties(quickinspectortest2_softwarecontext PROPERTIES ENVIRONMENT "QT_QUICK_BACKEND=softwarecontext") -- -- add_test(NAME quickinspectortest_softwarecontext COMMAND quickinspectortest) -- set_tests_properties(quickinspectortest_softwarecontext PROPERTIES ENVIRONMENT "QT_QUICK_BACKEND=softwarecontext") - endif() - - gammaray_add_quick_test(quickinspectorpickingtest diff --git a/dev-util/gammaray/files/gammaray-3.1.0-deselect-tests.patch b/dev-util/gammaray/files/gammaray-3.1.0-deselect-tests.patch new file mode 100644 index 0000000000..55d8228f77 --- /dev/null +++ b/dev-util/gammaray/files/gammaray-3.1.0-deselect-tests.patch @@ -0,0 +1,21 @@ +https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4930f4d334fbc586c0c968e0e8159e8c28a610f2 +Remove tests that have been failing since the previous version. +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -372,16 +372,6 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD AND NOT GAMMARAY_PROBE_ONLY_BUILD) + target_include_directories(earlyexittest PRIVATE ${CMAKE_BINARY_DIR}/launcher) + target_link_libraries(earlyexittest gammaray_core gammaray_launcher) + +- if(HAVE_QT_WIDGETS) +- gammaray_add_test(launchertest launchertest.cpp) +- target_include_directories(launchertest PRIVATE ${CMAKE_BINARY_DIR}/launcher) +- target_link_libraries(launchertest gammaray_core gammaray_launcher) +- endif() +- +- if(TARGET gammaray_client) +- gammaray_add_test(clientconnectiontest clientconnectiontest.cpp) +- target_link_libraries(clientconnectiontest gammaray_core gammaray_launcher gammaray_client) +- endif() + endif() + + # diff --git a/dev-util/gammaray/gammaray-2.11.3.ebuild b/dev-util/gammaray/gammaray-2.11.3.ebuild deleted file mode 100644 index 7bb932fafa..0000000000 --- a/dev-util/gammaray/gammaray-2.11.3.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_REMOVE_MODULES_LIST=( BackwardConfig ) -inherit cmake optfeature virtualx xdg - -DESCRIPTION="High-level runtime introspection tool for Qt applications" -HOMEPAGE=" - https://www.kdab.com/development-resources/qt-tools/gammaray/ - https://github.com/KDAB/GammaRay -" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/KDAB/GammaRay.git" -else - SRC_URI="https://github.com/KDAB/GammaRay/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="BSD-2 GPL-2+ MIT" -SLOT=0 - -IUSE="3d bluetooth designer doc geolocation printsupport script scxml svg test qml wayland webengine" -RESTRICT="!test? ( test )" - -# TODO: fix automagic sci-libs/vtk (and many other) dependencies -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - kde-frameworks/kitemmodels:5 - 3d? ( dev-qt/qt3d:5 ) - bluetooth? ( dev-qt/qtbluetooth:5 ) - designer? ( dev-qt/designer:5 ) - geolocation? ( dev-qt/qtpositioning:5 ) - printsupport? ( dev-qt/qtprintsupport:5 ) - qml? ( dev-qt/qtdeclarative:5[widgets] ) - script? ( dev-qt/qtscript:5[scripttools] ) - scxml? ( dev-qt/qtscxml:5 ) - svg? ( dev-qt/qtsvg:5 ) - webengine? ( dev-qt/qtwebengine:5[widgets] ) - wayland? ( dev-qt/qtwayland:5 ) -" - -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -DOCS=( CHANGES CONTRIBUTORS.txt README.txt ) - -PATCHES=( "${FILESDIR}"/${P}-deselect-tests.patch ) - -src_prepare(){ - sed -i "/add_backward(gammaray_core)/d" core/CMakeLists.txt || die - sed -i CMakeLists.txt \ - -e "/BackwardConfig.cmake/d" \ - -e "/set(KDE_INSTALL_USE_QT_SYS_PATHS/d" || die - - cmake_src_prepare -} - -src_configure(){ - local mycmakeargs=( - $(cmake_use_find_package 3d Qt53DAnimation) - $(cmake_use_find_package 3d Qt53DExtras) - $(cmake_use_find_package 3d Qt53DInput) - $(cmake_use_find_package 3d Qt53DLogic) - $(cmake_use_find_package 3d Qt53DRender) - $(cmake_use_find_package 3d Qt53DQuick) - $(cmake_use_find_package bluetooth Qt5Bluetooth) - $(cmake_use_find_package designer Qt5Designer) - $(cmake_use_find_package geolocation Qt5Positioning) - $(cmake_use_find_package printsupport Qt5PrintSupport) - $(cmake_use_find_package qml Qt5Qml) - $(cmake_use_find_package qml Qt5Quick) - $(cmake_use_find_package qml Qt5QuickWidgets) - $(cmake_use_find_package script Qt5Script) - $(cmake_use_find_package svg Qt5Svg) - $(cmake_use_find_package scxml Qt5Scxml) - $(cmake_use_find_package test Qt5Test) - $(cmake_use_find_package wayland Qt5WaylandCompositor) - $(cmake_use_find_package webengine Qt5WebEngineWidgets) - -DGAMMARAY_BUILD_DOCS=$(usex doc) - -DGAMMARAY_BUILD_UI=ON - -DGAMMARAY_DISABLE_FEEDBACK=ON - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON - ) - - cmake_src_configure -} - -src_test() { -# export QT_QPA_PLATFORM=offscreen - virtx cmake_src_test -} - -src_install() { - cmake_src_install - rm -r "${ED}"/usr/share/doc/${PN} || die -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "graphical state machine debugging support" dev-util/kdstatemachineeditor -} diff --git a/dev-util/gammaray/gammaray-3.1.0.ebuild b/dev-util/gammaray/gammaray-3.1.0.ebuild new file mode 100644 index 0000000000..b99679d81c --- /dev/null +++ b/dev-util/gammaray/gammaray-3.1.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake qmake-utils virtualx xdg + +DESCRIPTION="High-level runtime introspection tool for Qt applications" +HOMEPAGE=" + https://www.kdab.com/software-technologies/developer-tools/gammaray/ + https://github.com/KDAB/GammaRay +" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/KDAB/GammaRay.git" +else + SRC_URI="https://github.com/KDAB/GammaRay/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="BSD-2 GPL-2+ MIT" +SLOT=0 + +IUSE="3d bluetooth designer doc geolocation scxml svg test qml wayland webengine" +RESTRICT="!test? ( test )" + +# TODO: fix automagic sci-libs/vtk (and many other) dependencies +RDEPEND=" + dev-qt/qtbase:6[concurrent,gui,network,widgets,xml] + kde-frameworks/kitemmodels:6 + 3d? ( dev-qt/qt3d:6 ) + bluetooth? ( dev-qt/qtconnectivity:6[bluetooth] ) + designer? ( dev-qt/qttools:6[designer] ) + geolocation? ( dev-qt/qtpositioning:6 ) + qml? ( dev-qt/qtdeclarative:6[widgets] ) + scxml? ( dev-qt/qtscxml:6 ) + svg? ( dev-qt/qtsvg:6 ) + wayland? ( + dev-libs/wayland + dev-qt/qtwayland:6[compositor] + ) + webengine? ( dev-qt/qtwebengine:6[widgets] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/perl + doc? ( + app-text/doxygen[dot] + dev-qt/qttools:6[assistant,linguist,qdoc] + ) +" + +PATCHES=( "${FILESDIR}"/${P}-deselect-tests.patch ) + +src_prepare() { + sed -i "/add_backward(gammaray_core)/d" core/CMakeLists.txt || die + sed -i "/BackwardConfig.cmake/d" CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package 3d Qt63DAnimation) + $(cmake_use_find_package 3d Qt63DExtras) + $(cmake_use_find_package 3d Qt63DInput) + $(cmake_use_find_package 3d Qt63DLogic) + $(cmake_use_find_package 3d Qt63DRender) + $(cmake_use_find_package 3d Qt63DQuick) + $(cmake_use_find_package bluetooth Qt6Bluetooth) + $(cmake_use_find_package designer Qt6Designer) + $(cmake_use_find_package doc Doxygen) + $(cmake_use_find_package geolocation Qt6Positioning) + $(cmake_use_find_package qml Qt6Qml) + $(cmake_use_find_package qml Qt6Quick) + $(cmake_use_find_package qml Qt6QuickWidgets) + $(cmake_use_find_package svg Qt6Svg) + $(cmake_use_find_package scxml Qt6Scxml) + $(cmake_use_find_package scxml Qt6StateMachine) + $(cmake_use_find_package wayland Qt6WaylandCompositor) + $(cmake_use_find_package webengine Qt6WebEngineWidgets) + -DBUILD_TESTING=$(usex test) + -DECM_MKSPECS_INSTALL_DIR="$(qt6_get_mkspecsdir)" + -DGAMMARAY_BUILD_DOCS=ON + -DGAMMARAY_BUILD_UI=ON + -DGAMMARAY_DISABLE_FEEDBACK=ON + -DQT_VERSION_MAJOR=6 + ) + + cmake_src_configure +} + +src_test() { +# export QT_QPA_PLATFORM=offscreen + virtx cmake_src_test +} + +src_install() { + cmake_src_install + rm -r "${ED}"/usr/share/doc/${PN} || die +} diff --git a/dev-util/gammaray/metadata.xml b/dev-util/gammaray/metadata.xml index bbe46102da..edf7e2abdd 100644 --- a/dev-util/gammaray/metadata.xml +++ b/dev-util/gammaray/metadata.xml @@ -23,8 +23,6 @@ the more complex Qt frameworks such as model/view, state machines or scene graph Build support for Qt5 3D modules Widget .ui file export Physical position determination support from Qt5 framework - Printing support library from the Qt5 framework. Required for widget PDF export - Enable scripting support from the Qt5 framework Build with Qt5 Quick support Build support for Qt5 State Chart XML (SCXML) Enable support for dev-qt/qtwebengine diff --git a/gui-apps/shikane/shikane-1.0.1.ebuild b/gui-apps/shikane/shikane-1.0.1.ebuild index 6c5d4949f4..9966e78ab4 100644 --- a/gui-apps/shikane/shikane-1.0.1.ebuild +++ b/gui-apps/shikane/shikane-1.0.1.ebuild @@ -135,7 +135,7 @@ S="${WORKDIR}/${PN}-v${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" IUSE="+man" BDEPEND=" @@ -146,6 +146,12 @@ BDEPEND=" # final binary only depends on stdlib #DEPEND="dev-libs/wayland-protocols" +# exception for rust binaries trigger "doesn't respect CFLAGS" +QA_FLAGS_IGNORED=( + "/usr/bin/shikane" + "/usr/bin/shikanectl" +) + src_prepare() { default diff --git a/gui-apps/swayr/Manifest b/gui-apps/swayr/Manifest index 57524e01b1..cea21e2ceb 100644 --- a/gui-apps/swayr/Manifest +++ b/gui-apps/swayr/Manifest @@ -1,2 +1,4 @@ DIST swayr-0.27.4.tar.gz 1019633 BLAKE2B b44e6906262b4a9da1c19df052fdf6836626cb975fefd6d431395e0b32f72e4764b22428e0518ddd65241fa62ea7afbb9200e5e0eae534dc63e4afc3f5678a46 SHA512 029e7cec885c375968c343f9395e97bdda60864aea1b6b8b9b08cbad8099c23733e3e97eba4c65fbbd234ba048e92efaa876e8735931d61d6db5bd2f2ce27c89 +DIST swayr-0.28.0.tar.gz 1021140 BLAKE2B 03ec0d5001de97249f58abc7b5198d32e639fced9e48b3169ac892a3391d5a0168cdc5a3f2c296475b82e649b670d58f76b65e442256ddaaf49638cf8a714419 SHA512 cdb4968dd88b8c1ae62a0e7c7534d629e477f82ed059c7e13bdfa59333cbde4d8525b988c9f57f9236613574301b673e9558df7cf4187e626230936a584ff368 +DIST swayr-swayr-0.28.0-crates.tar.xz 16771216 BLAKE2B a3b063a52cad50573f27560d0edcc260a73b10725bc13306f94f6f2c9e3ddadb0951b3239051eca62a039f50148b51f3e7fbdceca910d2df4214f2d9d19319c3 SHA512 476d0d9322372fff094af5189c7a3f12284cb4873f722ba6023ab2092ef950ae0a8333922fdd4a50d1030fa4e9bb6346f55efaea2812f0cf9772840a06b96d8f DIST swayr-swayrbar-0.4.2-crates.tar.xz 19230052 BLAKE2B d3114dc6cd1288294eb42aa7edecbafa4195a19dcf0febaae96051ef85421eb359b4a16f5797e4d47159a294e7648a1d5227f8d43b126cdc84d8b8ed579009b1 SHA512 d2ea34da44713d0abd25bbc49a45cac1f4f4f4545afb765302e45fc7da3231b567a301c46b94439383a29c9a43c3dace5a8f20a62d2d72037c61202893337122 diff --git a/gui-apps/swayr/swayr-0.28.0.ebuild b/gui-apps/swayr/swayr-0.28.0.ebuild new file mode 100644 index 0000000000..7aff4261f7 --- /dev/null +++ b/gui-apps/swayr/swayr-0.28.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" +" + +inherit cargo systemd + +DESCRIPTION="A LRU window-switcher (and more) for the sway window manager" +HOMEPAGE="https://sr.ht/~tsdh/swayr/" +SRC_URI="https://git.sr.ht/~tsdh/swayr/archive/${P}.tar.gz" +SRC_URI+=" https://raw.githubusercontent.com/PPN-SD/vendor/refs/tags/swayr-${P}/swayr-${P}-crates.tar.xz" + +S="${WORKDIR}/swayr-${P}" + +LICENSE="GPL-3+" +# Autogenerated by pycargoebuild +# Dependent crate licenses +LICENSE+=" Apache-2.0 BSD-2 MIT MPL-2.0 Unicode-3.0" +SLOT="0" +KEYWORDS="~amd64" + +QA_FLAGS_IGNORED=" + /usr/bin/swayr + /usr/bin/swayrd +" + +src_prepare() { + default + sed -i -e '/^lto =/d' -e 's/^strip = "symbols"$/strip = false/g' Cargo.toml || die "failed to sed Cargo.toml" +} + +src_install() { + cargo_src_install --path ${PN} + systemd_newunit ${PN}/etc/swayrd.service swayrd.service +} diff --git a/gui-wm/river/Manifest b/gui-wm/river/Manifest index 05556e3e03..e2436386cf 100644 --- a/gui-wm/river/Manifest +++ b/gui-wm/river/Manifest @@ -1,4 +1,5 @@ DIST river-0.3.6.tar.gz 171853 BLAKE2B ffa66b698a250eeaef6034ce7f58175d99ae93b644525b30e192938620410efe494bf8bbf0dc6885d784d1566c26a13e026a490ec21db8e664d42a1ddb5eb222 SHA512 62a7a39a697507813018e02d7d05374dfdab2bbd531623b870b1ea75d34a4bd3dea55146fb6b37620ee4633d5a1fd011461de097bc1fd4db6c6ca95251033f27 +DIST river-0.3.7.tar.gz 172036 BLAKE2B d428ec0abf562c0b0ef153499862e0c0c32b37721c870c7f0d54599634fccd5339595eb51e34d401e877378b10c945ad7e0fbf73a90c27c3a1c9eb0883ca88df SHA512 4297b2bd566a3f87fd0c158affd8573661d722ebb7e795356040b15185f09e67dcfac938fa26757d683a274dc08781559b059584dc4934c1d6f51666bf8cb9ec DIST zig-pixman-12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56.tar.gz 7874 BLAKE2B 25e0e0a65ab45c08e13ed48393e0d009a63e0ec4c2d8452f08ec4b013f9b696adb1d7356a49b1c3b25710982fb34629002df8d433382d433fcdefd1de5fd4358 SHA512 61ce38e9788e9a3701cf32b2d8721424088e1a8bd11841fecc999a31f9b46148e63a35cf770a39edcc7887913019654f7df945b7d7e3b57437d007f7d45609b9 DIST zig-wayland-1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242.tar.gz 56543 BLAKE2B aaf82efe78d25c59a87de050147857fcf9a19764141cb40d92b0dd48b96ea0ec52d00a1ab0df1afe4c45cda6d64dda97f296f0aa29d8b9ea3da49e1d5cd69e50 SHA512 dfb140c06d9e3c566034f9102426e7bd47dcde87a2ae16d43ce3ea72cf44bea872bab1d9a23a24ae9d57d2d4ae6c56060a6b10f869de3990046426b0462db85e DIST zig-wlroots-122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1.tar.gz 56926 BLAKE2B 50a143f816b47516b3fc3b051a7445162efbcbb802a3515fe554e005e2f1191f75eaeea4bab68972ecb5b9f0b72f7cec12838c7ec98a1d05ed54803b3a79ca66 SHA512 523f29b06ece2aefbd90e8f9ce15bfcf59edf47e583fe963a8f58af0209d7e9a8dda857424469a40e3c7defb31d01df9f977f8dc58dc3ba7468e20f7b3a4e417 diff --git a/gui-wm/river/river-0.3.7.ebuild b/gui-wm/river/river-0.3.7.ebuild new file mode 100644 index 0000000000..1c555b20d7 --- /dev/null +++ b/gui-wm/river/river-0.3.7.ebuild @@ -0,0 +1,75 @@ +# Copyright 2024-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +declare -r -A ZBS_DEPENDENCIES=( + [zig-pixman-12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56.tar.gz]='https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz' + [zig-wayland-1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242.tar.gz]='https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz' + [zig-wlroots-122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1.tar.gz]='https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.1.tar.gz' + [zig-xkbcommon-1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f.tar.gz]='https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz' +) + +ZIG_SLOT="0.13" +inherit zig + +DESCRIPTION="A dynamic tiling Wayland compositor" +HOMEPAGE="https://isaacfreund.com/software/river/ https://codeberg.org/river/river" +# TODO verify-sig support +SRC_URI=" + https://codeberg.org/river/river/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${ZBS_DEPENDENCIES_SRC_URI} +" +S="${WORKDIR}/${PN}" + +# river: GPL-3-or-later +# zig-pixman, zig-wayland, zig-wlroots, zig-xkbcommon: MIT +LICENSE="GPL-3+ MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="X +llvm man" + +BDEPEND=" + dev-libs/wayland-protocols + dev-util/wayland-scanner + man? ( app-text/scdoc ) + || ( + dev-lang/zig:${ZIG_SLOT}[llvm(+)?] + dev-lang/zig-bin:${ZIG_SLOT} + ) +" +DEPEND=" + dev-libs/libevdev + dev-libs/libinput:= + dev-libs/wayland + gui-libs/wlroots:0.18[X?] + x11-libs/libxkbcommon[wayland,X?] + x11-libs/pixman +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/river-0.3.6-fix-no-lazypath.patch" ) + +DOCS=( "README.md" ) + +src_configure() { + local my_zbs_args=( + -Dstrip=false # Let Portage control this + -Dpie=true + -Dno-llvm=$(usex llvm false true) + -Dman-pages=$(usex man true false) + -Dxwayland=$(usex X true false) + ) + + zig_src_configure +} + +src_install() { + zig_src_install + + insinto /usr/share/wayland-sessions/ + doins contrib/river.desktop + + insinto /usr/share/river/ + doins -r example/ +} diff --git a/mail-client/betterbird-bin/Manifest b/mail-client/betterbird-bin/Manifest index 27370d7873..52a02d6e2c 100644 --- a/mail-client/betterbird-bin/Manifest +++ b/mail-client/betterbird-bin/Manifest @@ -1 +1 @@ -DIST betterbird-128.6.0esr-bb20.en-US.linux-x86_64.tar.bz2 83931720 BLAKE2B b18539ff3d9c1eca7cdc1fc65edd02d8bb872aee4dddc93aa83aedae60a78b7132c5adadbc636b55e907d9b371b1488a3e38d6ff618fde0a08135ee76afa90c8 SHA512 a9cbaf1a6c93d6149b33d9fc2c64ea1374db0a85949b134f1e3179cf1404737456c32d57b5b96fcae6bcd033fd2f17ea9f974872ed9e6675451479bcdea4f1c4 +DIST betterbird-128.6.1esr-bb21.en-US.linux-x86_64.tar.bz2 83933832 BLAKE2B ea3916a6c32b3eee574089ec2ce59aac15e83c18d6750162535198c64478f7daf9f79a06042a9be5456b7a24c3ceea8cac37f340586ec3d685219548b954fac1 SHA512 9e970cce4a33d3e06cd6c18880150ebe00d1c6d895cf26c866e0fffcc2a58318437d7b8a4cf14ab36e0e8a32a6f19ef143c2c5466036c994303424acbe73ee93 diff --git a/mail-client/betterbird-bin/betterbird-bin-128.6.0.ebuild b/mail-client/betterbird-bin/betterbird-bin-128.6.1.ebuild similarity index 97% rename from mail-client/betterbird-bin/betterbird-bin-128.6.0.ebuild rename to mail-client/betterbird-bin/betterbird-bin-128.6.1.ebuild index d9a33b0e9d..70b4566e90 100644 --- a/mail-client/betterbird-bin/betterbird-bin-128.6.0.ebuild +++ b/mail-client/betterbird-bin/betterbird-bin-128.6.1.ebuild @@ -7,7 +7,7 @@ inherit desktop xdg DESCRIPTION="Betterbird is a fine-tuned version of Mozilla Thunderbird." HOMEPAGE="https://github.com/Betterbird/thunderbird-patches/ https://betterbird.eu/" -SRC_URI="https://www.betterbird.eu/downloads/LinuxArchive/betterbird-${PV}esr-bb20.en-US.linux-x86_64.tar.bz2" +SRC_URI="https://www.betterbird.eu/downloads/LinuxArchive/betterbird-${PV}esr-bb21.en-US.linux-x86_64.tar.bz2" S="${WORKDIR}" LICENSE="MPL-2.0" diff --git a/media-gfx/pdf4qt/files/pdf4qt-1.4.9999-Minimal-cmake-fixes.patch b/media-gfx/pdf4qt/files/pdf4qt-1.4.9999-Minimal-cmake-fixes.patch new file mode 100644 index 0000000000..524d216b48 --- /dev/null +++ b/media-gfx/pdf4qt/files/pdf4qt-1.4.9999-Minimal-cmake-fixes.patch @@ -0,0 +1,47 @@ +From 4cc5cf70d017030c9e016587e1182060f64429f2 Mon Sep 17 00:00:00 2001 +From: Alexander Golubev +Date: Fri, 8 Nov 2024 23:07:36 +0300 +Subject: [PATCH 2/2] Minimal cmake fixes + +--- + CMakeLists.txt | 3 +-- + Pdf4QtLibCore/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea5518d..cb8219c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,7 +55,6 @@ endif() + qt_standard_project_setup() + + find_package(OpenSSL REQUIRED) +-find_package(lcms2 REQUIRED) + find_package(ZLIB REQUIRED) + find_package(Freetype REQUIRED) + find_package(OpenJPEG CONFIG REQUIRED) +@@ -92,7 +91,7 @@ endif() + option(PDF4QT_INSTALL_TO_USR "Install to usr directory" ON) + + if(PDF4QT_LINUX) +- set(PDF4QT_INSTALL_LIB_DIR_IMPL lib) ++ set(PDF4QT_INSTALL_LIB_DIR_IMPL ${CMAKE_INSTALL_LIBDIR}) + set(PDF4QT_INSTALL_BIN_DIR_IMPL bin) + + # Check if VCPKG_OVERLAY_PORTS is set as an environment variable or a CMake argument +diff --git a/Pdf4QtLibCore/CMakeLists.txt b/Pdf4QtLibCore/CMakeLists.txt +index e930b23..2c46c96 100644 +--- a/Pdf4QtLibCore/CMakeLists.txt ++++ b/Pdf4QtLibCore/CMakeLists.txt +@@ -162,7 +162,7 @@ GENERATE_EXPORT_HEADER(Pdf4QtLibCore + EXPORT_FILE_NAME "${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}/pdf4qtlibcore_export.h") + + target_link_libraries(Pdf4QtLibCore PRIVATE Qt6::Core Qt6::Gui Qt6::Xml Qt6::Svg) +-target_link_libraries(Pdf4QtLibCore PRIVATE lcms2::lcms2) ++target_link_libraries(Pdf4QtLibCore PRIVATE lcms2) + target_link_libraries(Pdf4QtLibCore PRIVATE OpenSSL::SSL OpenSSL::Crypto) + target_link_libraries(Pdf4QtLibCore PRIVATE ZLIB::ZLIB) + target_link_libraries(Pdf4QtLibCore PRIVATE Freetype::Freetype) +-- +2.45.2 + diff --git a/media-gfx/pdf4qt/files/pdf4qt-1.4.9999-Support-build-against-Qt-6.7.patch b/media-gfx/pdf4qt/files/pdf4qt-1.4.9999-Support-build-against-Qt-6.7.patch deleted file mode 100644 index e068e386a5..0000000000 --- a/media-gfx/pdf4qt/files/pdf4qt-1.4.9999-Support-build-against-Qt-6.7.patch +++ /dev/null @@ -1,125 +0,0 @@ -From d324d980f9be0f7056286c9b251edcbb4b48b920 Mon Sep 17 00:00:00 2001 -From: Alexander Golubev -Date: Fri, 8 Nov 2024 22:48:12 +0300 -Subject: [PATCH 1/2] Support build against Qt-6.7 - ---- - Pdf4QtEditor/main.cpp | 6 ++++++ - Pdf4QtLibWidgets/sources/pdfwidgetutils.cpp | 2 ++ - Pdf4QtLibWidgets/sources/pdfwidgetutils.h | 2 ++ - Pdf4QtViewer/main.cpp | 6 ++++++ - 4 files changed, 16 insertions(+) - -diff --git a/Pdf4QtEditor/main.cpp b/Pdf4QtEditor/main.cpp -index 9825250..e21c440 100644 ---- a/Pdf4QtEditor/main.cpp -+++ b/Pdf4QtEditor/main.cpp -@@ -40,14 +40,18 @@ int main(int argc, char *argv[]) - QApplication::setApplicationDisplayName(QApplication::translate("Application", "PDF4QT Editor")); - - QCommandLineOption noDrm("no-drm", "Disable DRM settings of documents."); -+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) - QCommandLineOption lightGui("theme-light", "Use a light theme for the GUI."); - QCommandLineOption darkGui("theme-dark", "Use a dark theme for the GUI."); -+#endif - - QCommandLineParser parser; - parser.setApplicationDescription(QCoreApplication::applicationName()); - parser.addOption(noDrm); -+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) - parser.addOption(lightGui); - parser.addOption(darkGui); -+#endif - parser.addHelpOption(); - parser.addVersionOption(); - parser.addPositionalArgument("file", "The PDF file to open."); -@@ -58,6 +62,7 @@ int main(int argc, char *argv[]) - pdf::PDFSecurityHandler::setNoDRMMode(); - } - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) - if (parser.isSet(lightGui)) - { - pdf::PDFWidgetUtils::setDarkTheme(false); -@@ -67,6 +72,7 @@ int main(int argc, char *argv[]) - { - pdf::PDFWidgetUtils::setDarkTheme(true); - } -+#endif - - QIcon appIcon(":/app-icon.svg"); - QApplication::setWindowIcon(appIcon); -diff --git a/Pdf4QtLibWidgets/sources/pdfwidgetutils.cpp b/Pdf4QtLibWidgets/sources/pdfwidgetutils.cpp -index 67f15d7..2a39184 100644 ---- a/Pdf4QtLibWidgets/sources/pdfwidgetutils.cpp -+++ b/Pdf4QtLibWidgets/sources/pdfwidgetutils.cpp -@@ -174,10 +174,12 @@ void PDFWidgetUtils::style(QWidget* widget) - } - } - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) - void PDFWidgetUtils::setDarkTheme(bool isDarkTheme) - { - QApplication::styleHints()->setColorScheme(isDarkTheme ? Qt::ColorScheme::Dark : Qt::ColorScheme::Light); - } -+#endif - - bool PDFWidgetUtils::isDarkTheme() - { -diff --git a/Pdf4QtLibWidgets/sources/pdfwidgetutils.h b/Pdf4QtLibWidgets/sources/pdfwidgetutils.h -index bfa296e..7ac120c 100644 ---- a/Pdf4QtLibWidgets/sources/pdfwidgetutils.h -+++ b/Pdf4QtLibWidgets/sources/pdfwidgetutils.h -@@ -60,8 +60,10 @@ public: - /// Apply style to the widget - static void style(QWidget* widget); - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) - /// Overrides automatically detected dark theme / light theme settings - static void setDarkTheme(bool isDarkTheme); -+#endif - - /// Returns true if the dark theme is currently set for the application. - static bool isDarkTheme(); -diff --git a/Pdf4QtViewer/main.cpp b/Pdf4QtViewer/main.cpp -index a22ef72..1050d8b 100644 ---- a/Pdf4QtViewer/main.cpp -+++ b/Pdf4QtViewer/main.cpp -@@ -34,14 +34,18 @@ int main(int argc, char *argv[]) - QApplication::setApplicationDisplayName(QApplication::translate("Application", "PDF4QT Viewer")); - - QCommandLineOption noDrm("no-drm", "Disable DRM settings of documents."); -+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) - QCommandLineOption lightGui("theme-light", "Use a light theme for the GUI."); - QCommandLineOption darkGui("theme-dark", "Use a dark theme for the GUI."); -+#endif - - QCommandLineParser parser; - parser.setApplicationDescription(QCoreApplication::applicationName()); - parser.addOption(noDrm); -+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) - parser.addOption(lightGui); - parser.addOption(darkGui); -+#endif - parser.addHelpOption(); - parser.addVersionOption(); - parser.addPositionalArgument("file", "The PDF file to open."); -@@ -52,6 +56,7 @@ int main(int argc, char *argv[]) - pdf::PDFSecurityHandler::setNoDRMMode(); - } - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) - if (parser.isSet(lightGui)) - { - pdf::PDFWidgetUtils::setDarkTheme(false); -@@ -61,6 +66,7 @@ int main(int argc, char *argv[]) - { - pdf::PDFWidgetUtils::setDarkTheme(true); - } -+#endif - - QIcon appIcon(":/app-icon.svg"); - QApplication::setWindowIcon(appIcon); --- -2.45.2 - diff --git a/media-gfx/pdf4qt/pdf4qt-9999.ebuild b/media-gfx/pdf4qt/pdf4qt-9999.ebuild index da9e894ccc..e2e01e3fbf 100644 --- a/media-gfx/pdf4qt/pdf4qt-9999.ebuild +++ b/media-gfx/pdf4qt/pdf4qt-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -43,10 +43,8 @@ DEPEND="$RDEPEND DOCS=( NOTES.txt README.md RELEASES.txt ) PATCHES=( "${FILESDIR}/pdf4qt-1.4.0.0-minor-fix-remove-extention-from-Icon-endtry-in-a-des.patch" - "${FILESDIR}/pdf4qt-1.4.0.0-Minimal-cmake-fixes.patch" + "${FILESDIR}/pdf4qt-1.4.9999-Minimal-cmake-fixes.patch" "${FILESDIR}/pdf4qt-1.4.0.0-Make-runtime-respect-cmake-s-plugin-dir-settings.patch" - # remove when Qt6.8 is stable - "${FILESDIR}/pdf4qt-1.4.9999-Support-build-against-Qt-6.7.patch" ) src_prepare() { diff --git a/media-gfx/swayimg/files/swayimg-3.7-fix-build-without-libpng.patch b/media-gfx/swayimg/files/swayimg-3.7-fix-build-without-libpng.patch new file mode 100644 index 0000000000..af3de1be58 --- /dev/null +++ b/media-gfx/swayimg/files/swayimg-3.7-fix-build-without-libpng.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/948480 +https://github.com/artemsen/swayimg/pull/243 +Fix build without libpng. +--- a/src/thumbnail.c ++++ b/src/thumbnail.c +@@ -378,7 +378,9 @@ const struct thumbnail* thumbnail_get(size_t index) + + void thumbnail_remove(size_t index) + { ++#ifdef THUMBNAIL_PSTORE + pstore_reset(false); ++#endif // THUMBNAIL_PSTORE + + list_for_each(ctx.thumbs, struct thumbnail, it) { + if (it->image->index == index) { +@@ -392,7 +394,9 @@ void thumbnail_remove(size_t index) + + void thumbnail_clear(size_t min_id, size_t max_id) + { ++#ifdef THUMBNAIL_PSTORE + pstore_reset(false); ++#endif // THUMBNAIL_PSTORE + + if (min_id == IMGLIST_INVALID && max_id == IMGLIST_INVALID) { + list_for_each(ctx.thumbs, struct thumbnail, it) { diff --git a/media-gfx/swayimg/swayimg-3.7.ebuild b/media-gfx/swayimg/swayimg-3.7.ebuild index a6dd8892e7..7514f43727 100644 --- a/media-gfx/swayimg/swayimg-3.7.ebuild +++ b/media-gfx/swayimg/swayimg-3.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -47,6 +47,11 @@ BDEPEND=" test? ( dev-cpp/gtest ) " +PATCHES=( + # bug #948480 + "${FILESDIR}/${P}-fix-build-without-libpng.patch" +) + src_configure() { local emesonargs=( $(meson_feature avif) diff --git a/media-sound/tidal-hifi-bin/metadata.xml b/media-sound/tidal-hifi-bin/metadata.xml index d4230f49fc..2caffb059b 100644 --- a/media-sound/tidal-hifi-bin/metadata.xml +++ b/media-sound/tidal-hifi-bin/metadata.xml @@ -2,7 +2,7 @@ - kocelfc@tutanota.com + kostadinshishmanov@protonmail.com Kostadin Shishmanov diff --git a/media-video/obs-vaapi/metadata.xml b/media-video/obs-vaapi/metadata.xml index 2f9abce740..cc29945174 100644 --- a/media-video/obs-vaapi/metadata.xml +++ b/media-video/obs-vaapi/metadata.xml @@ -2,7 +2,7 @@ - kocelfc@tutanota.com + kostadinshishmanov@protonmail.com Kostadin Shishmanov diff --git a/media-video/obs-vkcapture/Manifest b/media-video/obs-vkcapture/Manifest deleted file mode 100644 index 84044b065e..0000000000 --- a/media-video/obs-vkcapture/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST obs-vkcapture-1.5.0.tar.gz 60684 BLAKE2B b66bcf23618cda614118f913e3f756246cf1521f7f28ab91e6032671072f2f550c04763865f153d5c36cdeac8565a08b22602ef9680b5d138a91b595064995f1 SHA512 856a735ca3d1ed9f04c91c7e4a006aca2a72389a4ac0dee13d2b1f87da8e622d71dda400bb263499ddd04b1bc4294e7270382fc12e91e82a8ed554de8e3a4c96 -DIST obs-vkcapture-1.5.1.tar.gz 60844 BLAKE2B d1e2951ecd0d375940ce8547619507e07be79033f94342babf4a66e51e620c6b0fcc96dd269a6d6a8556d62eda5721502986769c83bd6e38b150c4b77fe411b1 SHA512 9477fd738cdf80e09aad46e58ee5e325aa4f5ae72fbe1cb22918d4910fd997ba2a012ce7ca3b24b1b3734983b94e9b7df391f3deca569a79c90c5d115a1a5eed diff --git a/media-video/obs-vkcapture/metadata.xml b/media-video/obs-vkcapture/metadata.xml deleted file mode 100644 index 0f9c6a5e4f..0000000000 --- a/media-video/obs-vkcapture/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Adel Kara Slimane - adel.ks@zegrapher.com - - - Kostadin Shishmanov - kocelfc@tutanota.com - - - - David Rosca - nowrep@gmail.com - - nowrep/obs-vkcapture - https://github.com/nowrep/obs-vkcapture/issues - - diff --git a/media-video/obs-vkcapture/obs-vkcapture-1.5.0.ebuild b/media-video/obs-vkcapture/obs-vkcapture-1.5.0.ebuild deleted file mode 100644 index 4de9d2dea5..0000000000 --- a/media-video/obs-vkcapture/obs-vkcapture-1.5.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) - -inherit xdg cmake-multilib - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nowrep/obs-vkcapture" -else - SRC_URI="https://github.com/nowrep/obs-vkcapture/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -DESCRIPTION="OBS Linux Vulkan/OpenGL game capture" -HOMEPAGE="https://github.com/nowrep/obs-vkcapture" - -LICENSE="GPL-2" -SLOT="0" - -COMMON_DEPEND=" - dev-libs/wayland - media-libs/libglvnd[${MULTILIB_USEDEP}] - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - media-video/obs-studio[wayland] - x11-libs/libxcb[${MULTILIB_USEDEP}] -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/vulkan-headers - dev-util/wayland-scanner -" - -RDEPEND="${COMMON_DEPEND}" - -QA_SONAME=" - /usr/lib64/libVkLayer_obs_vkcapture.so - /usr/lib64/libobs_glcapture.so - /usr/lib/libVkLayer_obs_vkcapture.so - /usr/lib/libobs_glcapture.so -" - -src_unpack() { - default - - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi -} - -multilib_src_configure() { -if ! multilib_is_native_abi; then - local mycmakeargs+=( - -DBUILD_PLUGIN=OFF - ) -fi - cmake_src_configure -} diff --git a/media-video/obs-vkcapture/obs-vkcapture-1.5.1.ebuild b/media-video/obs-vkcapture/obs-vkcapture-1.5.1.ebuild deleted file mode 100644 index 4de9d2dea5..0000000000 --- a/media-video/obs-vkcapture/obs-vkcapture-1.5.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) - -inherit xdg cmake-multilib - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nowrep/obs-vkcapture" -else - SRC_URI="https://github.com/nowrep/obs-vkcapture/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -DESCRIPTION="OBS Linux Vulkan/OpenGL game capture" -HOMEPAGE="https://github.com/nowrep/obs-vkcapture" - -LICENSE="GPL-2" -SLOT="0" - -COMMON_DEPEND=" - dev-libs/wayland - media-libs/libglvnd[${MULTILIB_USEDEP}] - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - media-video/obs-studio[wayland] - x11-libs/libxcb[${MULTILIB_USEDEP}] -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/vulkan-headers - dev-util/wayland-scanner -" - -RDEPEND="${COMMON_DEPEND}" - -QA_SONAME=" - /usr/lib64/libVkLayer_obs_vkcapture.so - /usr/lib64/libobs_glcapture.so - /usr/lib/libVkLayer_obs_vkcapture.so - /usr/lib/libobs_glcapture.so -" - -src_unpack() { - default - - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi -} - -multilib_src_configure() { -if ! multilib_is_native_abi; then - local mycmakeargs+=( - -DBUILD_PLUGIN=OFF - ) -fi - cmake_src_configure -} diff --git a/media-video/obs-vkcapture/obs-vkcapture-9999.ebuild b/media-video/obs-vkcapture/obs-vkcapture-9999.ebuild deleted file mode 100644 index 4de9d2dea5..0000000000 --- a/media-video/obs-vkcapture/obs-vkcapture-9999.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) - -inherit xdg cmake-multilib - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nowrep/obs-vkcapture" -else - SRC_URI="https://github.com/nowrep/obs-vkcapture/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -DESCRIPTION="OBS Linux Vulkan/OpenGL game capture" -HOMEPAGE="https://github.com/nowrep/obs-vkcapture" - -LICENSE="GPL-2" -SLOT="0" - -COMMON_DEPEND=" - dev-libs/wayland - media-libs/libglvnd[${MULTILIB_USEDEP}] - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - media-video/obs-studio[wayland] - x11-libs/libxcb[${MULTILIB_USEDEP}] -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/vulkan-headers - dev-util/wayland-scanner -" - -RDEPEND="${COMMON_DEPEND}" - -QA_SONAME=" - /usr/lib64/libVkLayer_obs_vkcapture.so - /usr/lib64/libobs_glcapture.so - /usr/lib/libVkLayer_obs_vkcapture.so - /usr/lib/libobs_glcapture.so -" - -src_unpack() { - default - - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi -} - -multilib_src_configure() { -if ! multilib_is_native_abi; then - local mycmakeargs+=( - -DBUILD_PLUGIN=OFF - ) -fi - cmake_src_configure -} diff --git a/net-im/legcord-bin/Manifest b/net-im/legcord-bin/Manifest index 0e1697d1aa..21dffcbe46 100644 --- a/net-im/legcord-bin/Manifest +++ b/net-im/legcord-bin/Manifest @@ -1 +1 @@ -DIST legcord-bin-1.0.2.deb 76153068 BLAKE2B 9076b9367a350e7d47664312f1420693fb833e4c6ed55a76818861c8de01ef3056866232718449469d1b144b1a8e00135167ae04b9558f15ac5aa7b6567c1de7 SHA512 40f25077010619e2f47ef51d2619d4137e8d9e1ec071a87a6ae25a8aaa22ab6732a19796b55c69a60706db9bb337d716a300aed077817f04e34ba3b2c3b55545 +DIST legcord-bin-1.0.8.deb 75993910 BLAKE2B 607763cc381dff3fd95ce57ee6a35ef6158b9420c6cf6dc52f7e7178f8efd560dcfbc77f8a4635c83ecf90ea5bbd9e395660269ad8960cec7e2887f10873231e SHA512 bb3f81dd553b40b2b6eaeacd24c82af88bfb2a22aeee8ba3d90b55119567617b2473bb6a61a5e2aa45a989fcb0a7c831de34056570ef164f1035365e0bda0d58 diff --git a/net-im/legcord-bin/legcord-bin-1.0.2.ebuild b/net-im/legcord-bin/legcord-bin-1.0.8.ebuild similarity index 100% rename from net-im/legcord-bin/legcord-bin-1.0.2.ebuild rename to net-im/legcord-bin/legcord-bin-1.0.8.ebuild diff --git a/net-proxy/byedpi/Manifest b/net-proxy/byedpi/Manifest index e613277362..d59b5f60ed 100644 --- a/net-proxy/byedpi/Manifest +++ b/net-proxy/byedpi/Manifest @@ -1,3 +1,4 @@ DIST byedpi-0.14.1.tar.gz 37004 BLAKE2B c14af6c2e01bf5d8c1539b5417ca2bf7cdfd501f4f1927dd7d1f643db1b2c7e26cd4bd8e3f66d885903b9349fa10f802e44039f0fc08b28143ec382a64e096b1 SHA512 5ff1d5ce03b0c824a60272130b47ba5d8ded74fdace7000780b1fff014a33cd9e42778f006d903a0dee4ec204561cd025b4788aa9bbd55b39c72d64736d6309e DIST byedpi-0.15.tar.gz 38376 BLAKE2B adceb3106c16d8aefe2040d8f12d9118107b23d2eac57f4a295f7800b655e889e6507f8800d1f0cc46e1365df2c987c764c68f6ab3df9a0dee3a226746e195c7 SHA512 bf6e7e4047263eb0e436b05ca40244439a232cd2b81d45ad7aad12b1f76e5796e4e5c913534599650b23d148bc2f07e98d2a2637db95106de014b303edbd1a38 +DIST byedpi-0.16.1.tar.gz 42085 BLAKE2B f17555f8ca7e6b5d930a7c921eb3b1b4cb350876775cbc28cf8b8e5aa11e67c5e689dbfb6f6d18e41d929de571d0fd615c0b95b4973fcf194f3842be89b37360 SHA512 a0cd6e5cf5681f080afabb0d1541fd04d33100920de932e65975d6214e23268c6edfacc8880f25a79e9d49eb592215c935a05d6e7ca58924861e1c8faf7eca3e DIST byedpi-0.16.tar.gz 41690 BLAKE2B 7a80864864a736d68824596dbe086bb4a6f90661fd02a2231c7c023ab7b098e5b38f73fa8acb8adc5f73de16d328875d42bdd3fd5f4dd34f40d9d51fd8b22e5e SHA512 42652609fe6ea1d57cdf6d8d7df1472887372f4f9621cd5111f292aa3daa45bf952782c90ecf19df2631a88eccc7f30e3b34dcaf1186f8238c5433e453b3aea1 diff --git a/net-proxy/byedpi/byedpi-0.16.1.ebuild b/net-proxy/byedpi/byedpi-0.16.1.ebuild new file mode 100644 index 0000000000..14668c55cd --- /dev/null +++ b/net-proxy/byedpi/byedpi-0.16.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd toolchain-funcs + +DESCRIPTION="Bypass DPI SOCKS proxy" +HOMEPAGE="https://github.com/hufrea/byedpi/" +SRC_URI="https://github.com/hufrea/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +src_prepare() { + default + + # respect optimization level + sed -i 's/ -O.\b/ /' Makefile || die +} + +src_configure() { + tc-export CC +} + +src_install() { + dobin ciadpi + einstalldocs + + newinitd "${FILESDIR}"/byedpi.initd byedpi + newconfd "${FILESDIR}"/byedpi.confd byedpi + systemd_dounit "dist/linux/${PN}.service" + + insinto /etc + newins "dist/linux/${PN}.conf" "${PN}.conf" +} diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3_beta1-r1.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3_beta1-r1.ebuild new file mode 100644 index 0000000000..8d1312be68 --- /dev/null +++ b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.3_beta1-r1.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop rpm systemd shell-completion xdg + +MYPV="${PV/_beta/-beta}" +DESCRIPTION="Tool used to manage daemon setup" +HOMEPAGE="https://github.com/mullvad/mullvadvpn-app https://mullvad.net/" +SRC_URI=" + amd64? ( https://github.com/mullvad/mullvadvpn-app/releases/download/${MYPV}/MullvadVPN-${MYPV}_x86_64.rpm ) + arm64? ( https://github.com/mullvad/mullvadvpn-app/releases/download/${MYPV}/MullvadVPN-${MYPV}_aarch64.rpm ) +" + +S="${WORKDIR}" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm64" + +RESTRICT="bindist mirror strip" + +RDEPEND=" + app-accessibility/at-spi2-core:2 + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/mesa + net-print/cups + sys-apps/dbus + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libxkbcommon + x11-libs/libXrandr + x11-libs/pango +" + +QA_PREBUILT="*" + +src_install() { + sed -i "s|SCRIPT_DIR=.*|SCRIPT_DIR=\"/opt/Mullvad VPN/\"|g" "${S}/opt/Mullvad VPN/mullvad-vpn" || die + + # Using doins -r would strip executable bits from all binaries + cp -pPR opt "${D}"/ || die "Failed to copy files" + fperms +x "/opt/Mullvad VPN/chrome_crashpad_handler" + fperms 4755 "/opt/Mullvad VPN/chrome-sandbox" + + dobin ./usr/bin/mullvad + dobin ./usr/bin/mullvad-daemon + dobin ./usr/bin/mullvad-exclude + dosym -r "/opt/Mullvad VPN/mullvad-vpn" /usr/bin/mullvad-vpn + dosym -r "/opt/Mullvad VPN/resources/mullvad-problem-report" /usr/bin/mullvad-problem-report + + # mullvad-exclude uses cgroups to manage exclusions, which requires root permissions, but is + # also most often used to exclude graphical applications which can't or shouldn't run as root + # (i.e., can't be run under `sudo/doas /usr/bin/mullvad-exclude ...`, because `sudo`/`doas` + # change user). The setuid bit allows any user to exclude executables under their own UID. + fperms 4755 /usr/bin/mullvad-exclude + + newinitd "${FILESDIR}"/mullvad-daemon.initd mullvad-daemon + + systemd_newunit ./usr/lib/systemd/system/mullvad-daemon.service mullvad-daemon.service + systemd_newunit ./usr/lib/systemd/system/mullvad-early-boot-blocking.service mullvad-early-boot-blocking.service + + newbashcomp ./usr/share/bash-completion/completions/mullvad mullvad + newfishcomp ./usr/share/fish/vendor_completions.d/mullvad.fish mullvad + newzshcomp ./usr/share/zsh/site-functions/_mullvad _mullvad + + domenu ./usr/share/applications/mullvad-vpn.desktop + local x + for x in 16 32 48 64 128 256 512 1024; do + doicon -s "${x}" "./usr/share/icons/hicolor/${x}x${x}/apps/mullvad-vpn.png" + done +} + +MULLVAD_IS_BEING_UPDATED=false + +pkg_preinst() { + xdg_pkg_preinst + + [[ -n "$(best_version "${CATEGORY}/${PN}")" ]] && MULLVAD_IS_BEING_UPDATED=true +} + +pkg_postrm() { + xdg_pkg_postrm + + if [[ ${MULLVAD_IS_BEING_UPDATED} = "false" ]]; then + if ! command -v pgrep &>/dev/null || pgrep -f "mullvad-(daemon|gui)"; then + elog "Mullvad has been uninstalled. To stop the service," + elog "1. Quit the Mullvad app" + elog " * Manually: 'Disconnect & quit' from the Mullvad menu" + elog " OR" + elog " * Command line: pkill -f mullvad-gui" + elog "2. Stop the daemon" + elog " * OpenRC: rc-service mullvad-daemon stop" + elog " OR" + elog " * systemd: systemctl stop mullvad-daemon" + elog " OR" + elog " * other: pkill -f mullvad-daemon" + fi + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + if [[ ${MULLVAD_IS_BEING_UPDATED} = "true" ]]; then + if command -v pgrep &>/dev/null && pgrep -f "mullvad-(daemon|gui)" &>/dev/null; then + elog "Mullvad has been updated. To restart the service," + elog "1. Restart the daemon" + elog " * OpenRC: rc-service mullvad-daemon restart" + elog " OR" + elog " * systemd: systemctl restart mullvad-daemon" + elog "2. Restart the app" + elog " * Manually: 'Disconnect & quit' from the Mullvad menu and relaunch using" + elog " your preferred desktop launcher" + elog " OR" + elog " * Command line: pkill -f mullvad-gui && '/opt/Mullvad VPN/mullvad-vpn' & disown" + else + elog "Mullvad has been updated. To start the service," + elog "1. Start the daemon" + elog " * OpenRC: rc-service mullvad-daemon start" + elog " OR" + elog " * systemd: systemctl start mullvad-daemon" + elog "2. Launch the app" + elog " * Manually: use your preferred desktop launcher" + elog " OR" + elog " * Command line: '/opt/Mullvad VPN/mullvad-vpn' & disown" + fi + else + elog "Mullvad has been installed. To start the service," + elog "1. Enable and start the daemon" + elog " * OpenRC: rc-update add mullvad-daemon default" + elog " rc-service mullvad-daemon start" + elog " OR" + elog " * systemd: systemctl enable mullvad-daemon" + elog " systemctl start mullvad-daemon" + elog "2. Launch the app" + elog " * Manually: use your preferred desktop launcher" + elog " OR" + elog " * Command line: '/opt/Mullvad VPN/mullvad-vpn' & disown" + fi +} diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-c23.patch b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-c23.patch new file mode 100644 index 0000000000..19924b4f09 --- /dev/null +++ b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-c23.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/945707 +Fix conflicting types for fabs. +--- a/C/xcBz.c ++++ b/C/xcBz.c +@@ -1397,7 +1397,6 @@ static int + BzGetISS( int typ ) + { + int imen[3 * BZ_MAXPOINTS], imin = 0; +- double fabs(); + register int iss; + register double f, point; + register double tol = (double)(BZ_ISS - 1)/(double)BZ_ISS - (double)(BZ_ISS - 2)/(double)(BZ_ISS - 1); diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild b/sci-chemistry/xcrysden/xcrysden-1.6.2-r2.ebuild similarity index 60% rename from sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild rename to sci-chemistry/xcrysden/xcrysden-1.6.2-r2.ebuild index 8d43bcf437..8b5b27fb89 100644 --- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild +++ b/sci-chemistry/xcrysden/xcrysden-1.6.2-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit desktop flag-o-matic xdg +inherit desktop flag-o-matic toolchain-funcs xdg DESCRIPTION="For the visualisation of molecular and crystal structures." @@ -17,15 +17,17 @@ SLOT="0" KEYWORDS="~amd64" -RDEPEND=">=x11-base/xorg-server-21.1.4 +RDEPEND=" + >=x11-base/xorg-server-21.1.4 >=virtual/glu-9.0-r2 - >=dev-lang/tcl-8.6.12 - >=dev-lang/tk-8.6.12 + >=dev-lang/tcl-8.6.12:= + >=dev-lang/tk-8.6.12:= >=dev-tcltk/togl-2.0-r3 >=dev-tcltk/bwidget-1.9.14 - >=media-libs/mesa-22.1.3 - >=sci-libs/fftw-3.3.10" - + media-libs/libglvnd[X] + sci-libs/fftw:3.0= + x11-libs/libX11 +" DEPEND="${RDEPEND}" PATCHES=( @@ -33,29 +35,33 @@ PATCHES=( "${FILESDIR}/${P}-LDFLAGS.patch" "${FILESDIR}/${P}-Togl-lib.patch" "${FILESDIR}/${P}-wrapper-paths.patch" + "${FILESDIR}/${P}-c23.patch" ) src_prepare() { default cp "${S}/system/Make.sys-shared" "${S}/Make.sys" || die 'Copying Make.sys to build dir failed.' + + # fix doc install path + sed -e "s|share/doc/\$(xcrysden)|share/doc/${PF}|" \ + -e "/ln -sf .*doc/d" \ + -e "/gzip/d" \ + -i Makefile || die } src_compile() { append-cflags "-fcommon" - emake xcrysden + emake xcrysden \ + CC="$(tc-getBUILD_CC)" \ + FC="$(tc-getFC)" } src_install() { emake \ - prefix="${D}"/usr \ + prefix="${ED}"/usr \ install domenu "${FILESDIR}/${PN}.desktop" doicon -s 32x32 "${FILESDIR}/icons/${PN}.png" - docompress -x /usr/share/doc/${P}/examples/GAUSSIAN_files/ \ - /usr/share/doc/${P}/examples/Orca_files/ \ - /usr/share/doc/${P}/examples/XSF_Files/ \ - /usr/share/doc/${P}/examples/Scripting/ \ - /usr/share/doc/${P}/examples/FermiSurface \ - /usr/share/man/ + docompress -x /usr/share/doc/${PF}/examples } diff --git a/sys-apps/ugrep/Manifest b/sys-apps/ugrep/Manifest index be28280c3f..35cbf57c6f 100644 --- a/sys-apps/ugrep/Manifest +++ b/sys-apps/ugrep/Manifest @@ -1 +1,2 @@ DIST ugrep-5.1.4.tar.gz 6280906 BLAKE2B 3f6e1a20ec9a5a012d3152562d1792a6c4c49dd0874976128ea408e39269ac6df60f6879e631b8471594c2ed840c46b68de0ce5b0e6f5197b665783e39bbde39 SHA512 d746c77a22a98c2719cc7b443351a3d27f0f2712a2be483596965cc2b6127f28b9e564ca32db1fea950a6315053c89440912d4b7311073bd97d7702f02521378 +DIST ugrep-7.2.0.tar.gz 7121849 BLAKE2B 99ee0d032cbbfa5c3f534c922681c4119a3aa431b3c3d78a32967bf32a53267b09baf2c630c842bf6f838f1b6d08e1edf82b4f6d4c31253c852f969691fedd43 SHA512 fd877d367602b24f2d2131fdb32b5e1421d704343420252292f7b765a8676c11e2677acc931c417b5135a81c69405fce942cc144ec0670ce7f75687baf4f3767 diff --git a/sys-apps/ugrep/ugrep-7.2.0.ebuild b/sys-apps/ugrep/ugrep-7.2.0.ebuild new file mode 100644 index 0000000000..3118c3c5da --- /dev/null +++ b/sys-apps/ugrep/ugrep-7.2.0.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit shell-completion + +DESCRIPTION="A fast, drop-in replacement for GNU grep" +HOMEPAGE="https://ugrep.com/" +SRC_URI="https://github.com/Genivia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +CPU_USE="cpu_flags_arm_neon cpu_flags_x86_avx2 cpu_flags_x86_sse2" +IUSE="7zip brotli boost bzip2 bzip3 +lzma lz4 +mmap +pcre2 +zlib zstd ${CPU_USE}" + +COMMON_DEPEND=" + brotli? ( app-arch/brotli ) + boost? ( dev-libs/boost ) + bzip3? ( app-arch/bzip3 ) + bzip2? ( app-arch/bzip2 ) + lz4? ( app-arch/lz4 ) + lzma? ( app-arch/xz-utils ) + pcre2? ( dev-libs/libpcre2 ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd ) +" + +RDEPEND="${COMMON_DEPEND}" + +DEPEND=" + ${COMMON_DEPEND} + virtual/pkgconfig +" + +REQUIRED_USE="?? ( boost pcre2 )" + +src_configure() { + local myeconfargs=( + $(usev !cpu_flags_arm_neon '--disable-neon') + $(usev !cpu_flags_x86_avx2 '--disable-avx2') + $(usev !cpu_flags_x86_sse2 '--disable-sse2') + + $(use_enable 7zip) + $(use_enable mmap) + + $(use_with boost "boost-regex") + $(use_with brotli) + $(use_with bzip2 "bzlib") + $(use_with bzip3) + $(use_with pcre2) + $(use_with lzma) + $(use_with lz4) + $(use_with zlib) + $(use_with zstd) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + dobashcomp "${S}"/completions/bash/* + dofishcomp "${S}"/completions/fish/* + dozshcomp "${S}"/completions/zsh/_* +} + +src_test() { + # emake check is run first by default in Portage but + # that doesn't actually run the tests, emake test does + emake test +} diff --git a/sys-block/partclone/Manifest b/sys-block/partclone/Manifest index 6a323ea2b4..a9166daa11 100644 --- a/sys-block/partclone/Manifest +++ b/sys-block/partclone/Manifest @@ -1,2 +1 @@ -DIST partclone-0.3.20.tar.gz 1373652 BLAKE2B 4fd15bde711c3967cc791214592ec97cd8cc0290ae452334dc026dfbfc0d27661460165dacced72767ed5fa9731649d6c250e9576ace861c713d3a1e52630e2f SHA512 32dced369973c39412c562ab8731ff7b490f464b5ed4033456e6b23f3f79c437f43dc9db4c79b4821f35e4997d1444c8d80c53816b2a3bb90836fb5ad33b368e -DIST partclone-0.3.32.tar.gz 1456707 BLAKE2B 14212bd989057eb3212d7297bef9a191c59fbe1df6430212fab757c701b522e6bdeed8c53a0569665ac40334d21b30d7e4e59f961efea51abe7303448c46fa5c SHA512 ff454ab910343606f4691f0de1744507dc8d48e2e431ba1d6b4b1ca8152aafddf230a5c3273c2f853779868365e534b74ecc201bfc7e258037d56d47b2afbf8b +DIST partclone-0.3.33.tar.gz 1613900 BLAKE2B ac72310950b3f9e894470e206e00e1e540b8e800c6ffba94f19f6e8a460630ba1caceab0c6646d0af1409ef64ab60565879d66006cf989b73906b8f9ef8ab888 SHA512 21b783e50dca290acc70a2afb305f886c9032d3cc04636fa0e678efeac787398a5a2f8e260f9969be51500ee14d005fdf2dd33b9198ad96ef55311a8a9954c62 diff --git a/sys-block/partclone/files/partclone-fail-mbr.patch b/sys-block/partclone/files/partclone-fail-mbr.patch deleted file mode 100644 index 50fad90d69..0000000000 --- a/sys-block/partclone/files/partclone-fail-mbr.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur a/fail-mbr/compile-mbr.sh b/fail-mbr/compile-mbr.sh ---- a/fail-mbr/compile-mbr.sh 2018-10-28 13:46:38.000000000 +0000 -+++ b/fail-mbr/compile-mbr.sh 2021-11-08 00:08:29.362877648 +0000 -@@ -28,7 +28,9 @@ - # - a line separator output by diff, "---" - # - the OP code "xor %ax,%ax" which may begin by 0x31 or 0x33 - # - a numerical offset output by diff, ^[a-f0-9]*$ --report=$(diff f1.obj f2.obj | grep -Ev 'fail-mbr|---|xor %ax,%ax|^[a-f0-9]*$') -+#report=$(diff f1.obj f2.obj | grep -Ev 'fail-mbr|---|xor %ax,%ax|^[a-f0-9]*$') -+# set empty report to bypass issue https://bugzilla.redhat.com/show_bug.cgi?id=1943056 -+report="" - if [ -n "$report" ]; then - echo "files fail-mbr.bin and fail-mbr.bin.orig differ significantly:" - diff f1.obj f2.obj diff --git a/sys-block/partclone/files/partclone-fix-ncurses-linking.patch b/sys-block/partclone/files/partclone-fix-ncurses-linking.patch new file mode 100644 index 0000000000..0f751605d8 --- /dev/null +++ b/sys-block/partclone/files/partclone-fix-ncurses-linking.patch @@ -0,0 +1,28 @@ +diff --git a/configure.ac b/configure.ac +index 9ee0a42..4a56e93 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -459,8 +459,8 @@ AC_ARG_ENABLE([static], + ) + AM_CONDITIONAL(ENABLE_STATIC, test "$enable_static" = yes) + +-AC_CHECK_LIB([tinfo], [initscr], tinfo=1, +- AC_MSG_WARN([*** tinfo library (libtinfo) not found])) ++AC_CHECK_LIB([tinfow], [initscr], tinfo=1, ++ AC_MSG_WARN([*** tinfow library (libtinfo) not found])) + AM_CONDITIONAL(ENABLE_TINFO, test "$tinfo" = 1) + + ##memory tracing## +diff --git a/src/Makefile.am b/src/Makefile.am +index c69cd2e..dd27e9f 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -22,7 +22,7 @@ LDADD_static=-lcrypto -ldl + endif + + if ENABLE_TINFO +-LIBS+=-ltinfo ++LIBS+=-ltinfow + endif + + AM_CFLAGS=-D_FILE_OFFSET_BITS=64 diff --git a/sys-block/partclone/files/partclone-ntfs-headers.patch b/sys-block/partclone/files/partclone-ntfs-headers.patch deleted file mode 100644 index d1a8fad155..0000000000 --- a/sys-block/partclone/files/partclone-ntfs-headers.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://github.com/Thomas-Tsai/partclone/pull/254 - -From 1e1b01b67d2a2779f38647fd16bb9b6b5b1d730e Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Sun, 27 Oct 2024 17:07:40 +0000 -Subject: [PATCH] ntfstime.h uses the time.h, sys/stat.h, sys/time.h headers - -Not doing this check can result in an implicit declaration error. ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index bb9ed99..00f4688 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -290,6 +290,7 @@ if test "$enable_ntfs" = "yes"; then - #check library of some filesystems - dnl Check for NTFS-3g - AS_MESSAGE([checking for NTFS-3g Library and Header files ... ...]) -+ AC_CHECK_HEADERS([sys/time.h sys/stat.h time.h]) - AC_CHECK_HEADERS([ntfs-3g/misc.h], ntfs_3g_h=1, - AC_MSG_WARN([*** NTFS(libntfs-3g-dev) header not found])) - AC_CHECK_LIB([ntfs-3g], [ntfs_mount], ntfs_3g_l=1, --- -2.47.0 - diff --git a/sys-block/partclone/files/partclone-reiser4-test.patch b/sys-block/partclone/files/partclone-reiser4-test.patch deleted file mode 100644 index c57bb04d90..0000000000 --- a/sys-block/partclone/files/partclone-reiser4-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/Thomas-Tsai/partclone/pull/253 - -From 94e8111b9a1b001548f8ffb993c9a31d54f7c3ca Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Sun, 27 Oct 2024 16:55:40 +0000 -Subject: [PATCH] Conditionally run the reiser4 test - -The line to add the test was uncommented a while ago, possibly -intentionally, but the surrounding lines to make it conditional were -not. Disclaimer: I have not actually tried to run the test. ---- - tests/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index ee190f1..36d91d2 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -19,9 +19,9 @@ if ENABLE_REISERFS - TESTS += reiserfs.test - endif - --#if ENABLE_REISER4 -+if ENABLE_REISER4 - TESTS += reiser4.test --#endif -+endif - - if ENABLE_HFSP - TESTS += hfsplus.test --- -2.47.0 - diff --git a/sys-block/partclone/partclone-0.3.20.ebuild b/sys-block/partclone/partclone-0.3.20.ebuild deleted file mode 100644 index 4498f0fd61..0000000000 --- a/sys-block/partclone/partclone-0.3.20.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic -if [[ -z ${PV%%*9999} ]]; then - EGIT_REPO_URI="https://github.com/Thomas-Tsai/${PN}.git" - inherit git-r3 -else - [[ -n ${PV%%*_p*} ]] && MY_PV="${PV}" - SRC_URI=" - https://github.com/Thomas-Tsai/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - " - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Partition cloning tool" -HOMEPAGE="https://partclone.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE=" -apfs btrfs +e2fs exfat f2fs fat fuse hfs jfs minix ncurses nilfs2 ntfs -reiserfs static ufs vmfs xfs -" - -RDEPEND=" - dev-libs/openssl:* - e2fs? ( sys-fs/e2fsprogs ) - btrfs? ( sys-apps/util-linux ) - fuse? ( sys-fs/fuse:0 ) - jfs? ( sys-fs/jfsutils ) - ncurses? ( sys-libs/ncurses:0 ) - nilfs2? ( sys-fs/nilfs-utils ) - ntfs? ( sys-fs/ntfs3g ) - reiserfs? ( sys-fs/progsreiserfs ) - xfs? ( sys-apps/util-linux ) - static? ( - dev-libs/openssl:*[static-libs] - e2fs? ( - sys-fs/e2fsprogs[static-libs] - ) - btrfs? ( sys-apps/util-linux[static-libs] ) - fuse? ( sys-fs/fuse:0[static-libs] ) - jfs? ( sys-fs/jfsutils[static] ) - ncurses? ( sys-libs/ncurses:0[static-libs] ) - nilfs2? ( sys-fs/nilfs-utils[static-libs] ) - ntfs? ( sys-fs/ntfs3g[static-libs] ) - reiserfs? ( sys-fs/progsreiserfs[static-libs] ) - ) -" -DEPEND=" - ${RDEPEND} -" -DOCS=( AUTHORS ChangeLog HACKING NEWS README.md TODO ) - -src_prepare() { - for f in "${FILESDIR}/${PN}-"*.patch; do - eapply "$f" - done - default - eautoreconf -} - -src_configure() { - local myconf=( - $(use_enable e2fs extfs) - $(use_enable apfs) - $(use_enable btrfs) - $(use_enable exfat) - $(use_enable f2fs) - $(use_enable fat) - $(use_enable fuse) - $(use_enable hfs hfsp) - $(use_enable jfs) - $(use_enable minix) - $(use_enable ncurses ncursesw) - $(use_enable nilfs2) - $(use_enable ntfs) - $(use_enable reiserfs) - $(use_enable static) - $(use_enable vmfs) - $(use_enable ufs) - $(use_enable xfs) - ) - append-flags -fcommon - econf "${myconf[@]}" -} diff --git a/sys-block/partclone/partclone-0.3.32.ebuild b/sys-block/partclone/partclone-0.3.33.ebuild similarity index 96% rename from sys-block/partclone/partclone-0.3.32.ebuild rename to sys-block/partclone/partclone-0.3.33.ebuild index 4706e92d36..58caf1d128 100644 --- a/sys-block/partclone/partclone-0.3.32.ebuild +++ b/sys-block/partclone/partclone-0.3.33.ebuild @@ -15,7 +15,7 @@ else " KEYWORDS="~amd64 ~x86" fi - +RESTRICT="strip" DESCRIPTION="Partition cloning tool" HOMEPAGE="https://partclone.org" @@ -56,8 +56,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-ntfs-headers.patch - "${FILESDIR}"/${PN}-reiser4-test.patch + "${FILESDIR}"/${PN}-fix-ncurses-linking.patch ) DOCS=( diff --git a/www-apps/forgejo/Manifest b/www-apps/forgejo/Manifest index 84e50ede62..8a5f05e076 100644 --- a/www-apps/forgejo/Manifest +++ b/www-apps/forgejo/Manifest @@ -1,3 +1,3 @@ -DIST forgejo-7.0.9.tar.gz 53600572 BLAKE2B 2ef91a7e488562b6e4110769841f37265f26a277c67db0c154ba2e55a1809501c908cb35807e5514093ce3756441cbe25ad8dce7f74ed2c839e59136b0f9dd05 SHA512 45996bec03934fb26ef6d87fa8efc7c007f4ec683b29eb0a23c07a03ab35ea9c74c22f4d1f985ede71ef87430973c703d8b6efd17d04192fa00ad30366ad7f17 +DIST forgejo-10.0.0.tar.gz 56895191 BLAKE2B d556cff8760863c18e70a04f6ec90dd3ea6ec766b811cd99d5e71628c689e583983286b69ade78c39fa2089ef0397cc46b295725c6ae81ec1169e4cf467e31b2 SHA512 48fb7e23c65b6cbb402173f13ec9ecf7b0eccf998c9755d137a629af8380bff0b63bca1c82edcfbd22be889da0be4ec216ba330a0348cb8a1dfc1f4d953c718c DIST forgejo-8.0.3.tar.gz 53477625 BLAKE2B 378183773d7e81cf4471f592bf0c992aa1ff3bb267a5e53c7ffad8d79b2fd9a91060ce42a0cc33c39ae629fa9e69077715a88a029a59b68c35dd2ada4396b35d SHA512 eb5c90679d073856bac4b67fd49a9d74de6c91d3627461e8426ed0c2de2ca4344d25fb559bd7f6f13e09b7e443c51c3b4d5ead32f23f3fe10c115eb9ee019999 DIST forgejo-9.0.3.tar.gz 54029967 BLAKE2B 19659d94a22a611ba87091c034ebee0bc81072fa857c3e806881ffcbb2211ae521bf60309ad7144811bb5c1a9365953655f7106982be1a5ec49b5bd699dc9dbe SHA512 c7b29920d6e858130e269e113719fff22e8397c3f0931a03dc0fe4479ae15c532bd544ec9131d1e3e4b990f1822ea977d821b97c4d84c72b7abd4c268d534d00 diff --git a/www-apps/forgejo/forgejo-7.0.9.ebuild b/www-apps/forgejo/forgejo-10.0.0.ebuild similarity index 91% rename from www-apps/forgejo/forgejo-7.0.9.ebuild rename to www-apps/forgejo/forgejo-10.0.0.ebuild index 2b2357dce5..c596cf739b 100644 --- a/www-apps/forgejo/forgejo-7.0.9.ebuild +++ b/www-apps/forgejo/forgejo-10.0.0.ebuild @@ -122,13 +122,6 @@ pkg_postinst() { ewarn "as acct-user/git[gitea] depends on it, and acct-user[forgejo] does not" ewarn "exist yet." ewarn "" - ewarn "7.x includes changes that may require manual intervention when" - ewarn "upgrading from 1.21.x, most prominently:" - ewarn "" - ewarn "> MySQL 8.0 or PostgreSQL 12 are the minimum supported versions. The" - ewarn "> database must be migrated before upgrading. The requirements" - ewarn "> regarding SQLite did not change." - ewarn ">" ewarn "> The Gitea themes were renamed and the [ui].THEMES setting must be changed as follows:" ewarn "> - gitea is replaced by gitea-light" ewarn "> - arc-green is replaced by gitea-dark" diff --git a/www-apps/whoogle-search/Manifest b/www-apps/whoogle-search/Manifest index 0642e2ec1c..62c809ab03 100644 --- a/www-apps/whoogle-search/Manifest +++ b/www-apps/whoogle-search/Manifest @@ -1 +1 @@ -DIST whoogle-search-0.9.1.gh.tar.gz 617547 BLAKE2B c5e877fe5190440b9cf2b4a2171d764e1557029cf4cbf00e8a5ae5114025b8fd61f094c125927850081a481be990a96cd3226824c6cbe9623d9ece6fb97c9175 SHA512 db37b5132f663a6654c0ade25b04e6ba45fc4fb44925e1f7ddc8e589986af8e284858a5f46ddbd280d9e74829f2dc18ee88c2b1d5b07bdc34b6e4d1d866861f8 +DIST whoogle-search-0.9.3.gh.tar.gz 619500 BLAKE2B 8a6782c8b4dadf2e46c066b9de9e165454bbffbb4a271d85f746244c38486e2008a5ec3c6b7e4688b4f8570791b528a58a989b16631a613bd2563a976da20520 SHA512 711523ea826ea4b64ea3f845ef4cab07ddb7fdb474c32ac13153fcb2dc753895e0b6b83f0a5646952ef983a762d36e17e2e230ac7b826db29a6431ffea87e23a diff --git a/www-apps/whoogle-search/metadata.xml b/www-apps/whoogle-search/metadata.xml index 479b386626..34324416df 100644 --- a/www-apps/whoogle-search/metadata.xml +++ b/www-apps/whoogle-search/metadata.xml @@ -3,7 +3,7 @@ cat@aulucya.gay - Bailey Kasin + Cat Kasin benbusby/whoogle-search diff --git a/www-apps/whoogle-search/whoogle-search-0.9.1.ebuild b/www-apps/whoogle-search/whoogle-search-0.9.3.ebuild similarity index 100% rename from www-apps/whoogle-search/whoogle-search-0.9.1.ebuild rename to www-apps/whoogle-search/whoogle-search-0.9.3.ebuild