diff --git a/app-containers/waydroid-images/waydroid-images-9999.ebuild b/app-containers/waydroid-images/waydroid-images-9999.ebuild index 4f7465146f..d9d0a3edd7 100644 --- a/app-containers/waydroid-images/waydroid-images-9999.ebuild +++ b/app-containers/waydroid-images/waydroid-images-9999.ebuild @@ -232,9 +232,8 @@ src_unpack() { use system-vanilla && waydroid_download_system "${arch}" "${version}" VANILLA use system-gapps && waydroid_download_system "${arch}" "${version}" GAPPS use vendor-mainline && waydroid_download_vendor "${arch}" "${version}" MAINLINE - if use vendor-halium && [[ ! ${halium} ]]; then - die "USE=vendor-halium is unavailable for the selected version" - else + if use vendor-halium; then + [[ ${halium} ]] || die "USE=vendor-halium is unavailable for the selected version" waydroid_download_vendor "${arch}" "${version}" "${halium}" fi unpack "${MY_A[@]}" diff --git a/dev-python/pillow-heif/Manifest b/dev-python/pillow-heif/Manifest index cf1b77dc9f..c049fe5e56 100644 --- a/dev-python/pillow-heif/Manifest +++ b/dev-python/pillow-heif/Manifest @@ -1,2 +1,2 @@ -DIST pillow_heif-1.0.0.tar.gz 18270881 BLAKE2B 7d0e1add32a5e851c8d6eafe2270e505bd1bebcb08336db28f8230c95987c38a5b86e6c83ef6c963ca141b81364db3a21ca17fb9aac05b41db60262cb0bc3f9a SHA512 92f4b629e77501b73acbbd6a810179dd9526f08a44e98a00be4c47401db04b2d654f849142282dcdb91319bb5bc150fa68a83b56e29f8613e1de29215b312819 DIST pillow_heif-1.1.0.tar.gz 18271020 BLAKE2B 15f151625c1f253a44c451bd24da0f643353b6881cebbb3823e8682c5b518abf846c6850bc50462cbfe1e9e5afa1f69e1f5223e0f494cb92644b38cb9c39e7ba SHA512 50c576f52a16c96dd812718a397d75f0c564d009cbaa6abe499b43d3e70834212f1295e411c6e6babbfb526997c5963b1fc022f0829fa2b8298ae3871f130474 +DIST pillow_heif-1.1.1.tar.gz 18271952 BLAKE2B 34655ef5aa85911cdef2b71a06fe0bfb16758c75d706d329aa8deca86a6994025dff8a6ba188bcd7ae5cc40eb4f43459e3b1960f02503943d808aab921e12647 SHA512 39b6c085e0ac64506cefc888a000187b5836ffbc3bbc725883c55abe064bf7759db39b1654f55bffcb7491773490dd457e5ef5c7163e8f21da77726eb99d5ffb diff --git a/dev-python/pillow-heif/pillow-heif-1.0.0.ebuild b/dev-python/pillow-heif/pillow-heif-1.1.1.ebuild similarity index 83% rename from dev-python/pillow-heif/pillow-heif-1.0.0.ebuild rename to dev-python/pillow-heif/pillow-heif-1.1.1.ebuild index 9e3aee1ac1..9cdf6ccea9 100644 --- a/dev-python/pillow-heif/pillow-heif-1.0.0.ebuild +++ b/dev-python/pillow-heif/pillow-heif-1.1.1.ebuild @@ -19,19 +19,15 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=" - !test? ( - dev-python/pillow[${PYTHON_USEDEP}] - >=media-libs/libheif-1.19.5:0/1.19 - ) - test? ( - dev-python/pillow[jpeg,lcms,webp,zlib,${PYTHON_USEDEP}] - >=media-libs/libheif-1.19.5:0/1.19[x265] - ) + dev-python/pillow[${PYTHON_USEDEP}] + >=media-libs/libheif-1.19.5:= " BDEPEND=" test? ( dev-python/defusedxml[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pillow[jpeg,lcms,webp,zlib,${PYTHON_USEDEP}] + >=media-libs/libheif-1.19.5:=[x265] media-libs/opencv[png,python,${PYTHON_USEDEP}] ) " diff --git a/gui-libs/mir/Manifest b/gui-libs/mir/Manifest index 901a056bb4..79fbdb9c0a 100644 --- a/gui-libs/mir/Manifest +++ b/gui-libs/mir/Manifest @@ -1,2 +1,2 @@ DIST mir-2.21.1.tar.gz 6879903 BLAKE2B 644d41be226b7ecf673b26bcc14b52d693b11bc2d63775f591e7332d854b0d3725ca23a0747e7ea53b2928ea5f3221376d74fd6b5aea0997f392e2892028a12e SHA512 36bfef3462e2428d608e5b6e4ba910d4c0c1db6d4614cc46ebb322314230b785e308b120bf5a69e60aad6c6e04c369a48d7323cccc1d4a389dc757c69ffcff40 -DIST mir-2.22.1.tar.gz 6946738 BLAKE2B 81cc7510e1957c9ffd1880ffee04adc6caa28ec9d841ca017e54edcb5720076124008f0905c4bd285905c28edf5bbf3a4cfbe0dd4e60270b99e4779065f80677 SHA512 2a861fd51c32ac7d5c62f020de8e1499c2ddd99f63ac10654ccfffba9b72a2bce382a34fe700418d29fbc29ce7af925b7cad6d5e5a5fe27bb07b3247924a2493 +DIST mir-2.22.2.tar.gz 6943488 BLAKE2B ab8d3fb10c359f7364c5ff19fb9f75e483f251ba3619feda7a58cffff99d5a2c6193dd4612c4d20a2f25c8c582c99506f49b5b378366ec7d3a10b1e15adab154 SHA512 3b2246343557a0c1770173f89371402da4b4694ffd7b1ee53a3b8098ddbd81800cc91773b76d0f12eb22cc6d44eada258e3481817050348e913b1d6c34d1bd54 diff --git a/gui-libs/mir/mir-2.22.1.ebuild b/gui-libs/mir/mir-2.22.2.ebuild similarity index 97% rename from gui-libs/mir/mir-2.22.1.ebuild rename to gui-libs/mir/mir-2.22.2.ebuild index f95d64d76a..76d0418214 100644 --- a/gui-libs/mir/mir-2.22.1.ebuild +++ b/gui-libs/mir/mir-2.22.2.ebuild @@ -84,3 +84,8 @@ src_configure() { ) cmake_src_configure } + +src_test() { + xdg_environment_reset + cmake_src_test +} diff --git a/net-vpn/mullvadvpn-app/Manifest b/net-vpn/mullvadvpn-app/Manifest index ed5c4594ec..b609a124dc 100644 --- a/net-vpn/mullvadvpn-app/Manifest +++ b/net-vpn/mullvadvpn-app/Manifest @@ -1,4 +1,6 @@ DIST MullvadVPN-2025.10-beta1_aarch64.rpm 87219529 BLAKE2B 2a78404a3c612fa82924c64f54dbea27b999a87cdc8c3dec06ecaf9726958a46e6549931aba52023cac08802672fccb88b39cee03dadf63843e9b960c4576253 SHA512 82d604974fb7d37cc05f1243ecefc65a8b88d4ebb56c58b361933b720624138e7386d32ee5cc58d2490378f92f0015f5c32f71077d1a411313a75b11ea48ee05 DIST MullvadVPN-2025.10-beta1_x86_64.rpm 93131069 BLAKE2B 57e8e06a54f0ea368a5104504f25f161b0c69e038647e4cc252d457b2104950f2b0578a36e538fafe52a5ba60a8e6b53bfe5e249896833060457607cb9e6179a SHA512 987880794a68c83312aea890fc82c1cd30b9eb2d790655c17a998329ac0867615dc87ea0897ca86e2ffed888f2b10fdf49e33106097504e5b8036c11be395041 +DIST MullvadVPN-2025.10-beta2_aarch64.rpm 87208889 BLAKE2B 37e92314a64a1382e95273f072a5ff385e44b12a2e395b8259875263eb125065c6897fa845cd22dfaed38d14c446dece00b62773a3f21445a7579e36f6e47bca SHA512 bd6cf3b03ba1fd707397098357e24ed84e9ec4bee06b8d1768f8e9ccc316ca277493c9d67f4f5aa6adafd3464f61e1d6f660a9ca8f3cd1caa33cb28f155eb3c1 +DIST MullvadVPN-2025.10-beta2_x86_64.rpm 93155265 BLAKE2B 5e2aae97843ced7340bed54578182e7b4101186ecb4847385845de5feecf7b35e85d2db6a5c6c49f0ffd7ed01101f01b60d0f5bfc60ba277a00a8e504beb7e82 SHA512 0a0534179c4bbe77c4fabf0fd6a8a4502fbc6b5f7031f0ae526f4d0a3c856b0d01e9d1ab59775c0e5db6ba6172a45e39bb22e0633c377bec17ea1cfbab2aa309 DIST MullvadVPN-2025.9_aarch64.rpm 87243633 BLAKE2B 9a66409af98dd35fb5a5eae6fc863229b4b6deb21b12b045b3ff6689e5693a6a2a4a45917ff190c5d6e2435a63c84899143018c0483d0e3bf8d5dc7ed9480f9b SHA512 0f5b28f2749cbedf6ed70b29c107ed131d10f113ff75afb42cee3daaa1e2218ff1421fd606df2e85940b08ce7acc35b562cb1443097d9f65f70e2c44b1fcdc99 DIST MullvadVPN-2025.9_x86_64.rpm 93122013 BLAKE2B ada9bc4103dd76539630e8a055dfefe745bce48e7446565cfe5389981908e2aacc11f132125f1e4651d029e34b74cfa863463b8902779a11b9baac00d12d79f2 SHA512 71f87267943f6295b932ad281d0ae3ffb0dc9c5af9c636d1df330f37a6199f1903997a4ae3e1702ef9b87cddcf894c9f31654423dc836720f6196379458649aa diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.10_beta2.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.10_beta2.ebuild new file mode 100644 index 0000000000..d02c1a2723 --- /dev/null +++ b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.10_beta2.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2025 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 + || ( + net-firewall/nftables + net-firewall/iptables[nftables] + ) +" + +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 +} + +pkg_postrm() { + xdg_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; 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 [[ -n ${REPLACING_VERSIONS} ]]; 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/x11-themes/qogir-icon-theme/Manifest b/x11-themes/qogir-icon-theme/Manifest index e29313bd94..c42869c26c 100644 --- a/x11-themes/qogir-icon-theme/Manifest +++ b/x11-themes/qogir-icon-theme/Manifest @@ -1 +1,2 @@ DIST 2020-11-22.tar.gz 6242726 BLAKE2B 130f9fcafa8b42f833c6164ea45d8bb1f5de3561245f9815a273ff1bb9a5f2ff375a76a4125c4467ea437a87ac5f516d799b43239527d1b4d09457b7a601a312 SHA512 0d7849fbeff4ea3fb4f279e5f55cf794207407626bee80862d963ec60b08631b12e875ad7ba9b8a38394d5991953e52202fdca536ee5374435001ca05afd1148 +DIST 2025-02-15.tar.gz 9076276 BLAKE2B 960624e3eeee411cca901c57114e309590097a5f14994a965013928f3022882bf46c6d0dd5ad312b82dff955cad71053f9adcb27c34a851cdc32c899a65c3d00 SHA512 a53fb23b2193b8de59625f3f31f9b6b97a18c937f808ce17810799207a806ca059678bb0aa244d06a4ede46cf476faa7d501f476057bd1c9bd283959118beeeb diff --git a/x11-themes/qogir-icon-theme/qogir-icon-theme-2025.02.15.ebuild b/x11-themes/qogir-icon-theme/qogir-icon-theme-2025.02.15.ebuild new file mode 100644 index 0000000000..c6286ce3d9 --- /dev/null +++ b/x11-themes/qogir-icon-theme/qogir-icon-theme-2025.02.15.ebuild @@ -0,0 +1,49 @@ +# Copyright 2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# To update icon cache +inherit xdg + +DESCRIPTION="A flat colorful design icon theme for linux desktops" +HOMEPAGE="https://github.com/vinceliuice/Qogir-icon-theme" +SRC_URI="https://github.com/vinceliuice/${PN}/archive/refs/tags/2025-02-15.tar.gz" + +# Extract to a non-default name +S=${WORKDIR}/Qogir-icon-theme-2025-02-15 + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +# No binaries are installed so we don't need these portage features +RESTRICT="binchecks strip" + +# Unsure about dependencies +DEPEND="${RDEPEND}" + +src_prepare() { + eapply_user + + # Don't install the ubuntu/manjaro variants + sed -i 's:THEME_VARIANTS=.*:THEME_VARIANTS="":' \ + install.sh || die "Sed failed to remove theme variants!" + + # Install cursors to Gentoo's cursor location + sed -i -e "/cp.*cursors/i mkdir -p \${CURSOR_DIR}/Qogir\${color}" \ + -e "s:\(cp.*cursors\"\).*:\1 \${CURSOR_DIR}/Qogir\${color}:" \ + install.sh || die "Sed failed changing cursor location!" + + # Use xdg eclass instead + sed -i -e "/gtk-update-icon-cache/d" \ + install.sh || die "Sed failed removing gtk-update-icon-cache call!" +} + +src_install() { + mkdir -p "${D}/usr/share/icons" || die "failed to create icons dir" + CURSOR_DIR="${D}/usr/share/cursors/xorg-x11" "${S}"/install.sh -d "${D}/usr/share/icons" || die "install.sh failed" + + # Remove broken symlink to avoid QA warning + rm "${D}/usr/share/icons/Qogir/scalable/apps/org.aegisub.Aegisub.svg" || die "failed to remove broken symlink" +}