diff --git a/app-benchmarks/poop/poop-9999.ebuild b/app-benchmarks/poop/poop-9999.ebuild
index e448123998..478081f4b1 100644
--- a/app-benchmarks/poop/poop-9999.ebuild
+++ b/app-benchmarks/poop/poop-9999.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-inherit edo git-r3
-
EGIT_REPO_URI="https://github.com/andrewrk/poop"
+ZIG_SLOT="9999"
+inherit git-r3 zig
DESCRIPTION="Performance Optimizer Observation Platform"
HOMEPAGE="https://github.com/andrewrk/poop"
@@ -13,107 +13,17 @@ HOMEPAGE="https://github.com/andrewrk/poop"
LICENSE="MIT"
SLOT="0"
-EZIG_MIN="9999"
-EZIG_MAX_EXCLUSIVE="99991"
-
-DEPEND="dev-lang/zig:${EZIG_MIN}"
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig Build System doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/poop"
-
-# : copied from sys-fs/ncdu :
-# Many thanks to Florian Schmaus (Flowdalic)!
-# Adapted from https://github.com/gentoo/gentoo/pull/28986
-# Set the EZIG environment variable.
-zig-set_EZIG() {
- [[ -n ${EZIG} ]] && return
-
- if [[ -n ${EZIG_OVERWRITE} ]]; then
- export EZIG="${EZIG_OVERWRITE}"
- return
- fi
-
- local candidates candidate selected selected_ver
-
- candidates=$(compgen -c zig-)
-
- for candidate in ${candidates}; do
- if [[ ! ${candidate} =~ zig(-bin)?-([.0-9]+) ]]; then
- continue
- fi
-
- local ver
- if (( ${#BASH_REMATCH[@]} == 3 )); then
- ver="${BASH_REMATCH[2]}"
- else
- ver="${BASH_REMATCH[1]}"
- fi
-
- if [[ -n ${EZIG_EXACT_VER} ]]; then
- ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
-
- selected="${candidate}"
- selected_ver="${ver}"
- break
- fi
-
- if [[ -n ${EZIG_MIN} ]] \
- && ver_test "${ver}" -lt "${EZIG_MIN}"; then
- # Candidate does not satisfy EZIG_MIN condition.
- continue
- fi
-
- if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
- && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
- # Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
- continue
- fi
-
- if [[ -n ${selected_ver} ]] \
- && ver_test "${selected_ver}" -gt "${ver}"; then
- # Candidate is older than the currently selected candidate.
- continue
- fi
-
- selected="${candidate}"
- selected_ver="${ver}"
- done
-
- if [[ -z ${selected} ]]; then
- die "Could not find (suitable) zig installation in PATH"
- fi
-
- export EZIG="${selected}"
- export EZIG_VER="${ver}"
-}
-
-# Invoke zig with the optionally provided arguments.
-ezig() {
- zig-set_EZIG
-
- # Unfortunately, we cannot add more args here, since syntax is different
- # for every subcommands. Yes, even target/cpu :( f.i. :
- # -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build-
- # -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build
- # (or even none, if hardcoded by upstream so choice is -Drelease=true/false)
- # Ofc we can patch this, but still...
-
- edo "${EZIG}" "${@}"
-}
+DOCS=( "README.md" )
src_unpack() {
git-r3_src_unpack
- cd "${S}" || die
- # "zig build" doesn't have "fetch" subcommand yet
- ezig build --help || die "Fetching Zig modules failed"
+ zig_live_fetch
}
-src_compile() {
- ezig build -Doptimize=ReleaseSafe --verbose || die
-}
+src_configure() {
+ local my_zbs_args=(
+ -Dstrip=false # Let Portage control this
+ )
-src_install() {
- DESTDIR="${ED}" ezig build install --prefix /usr -Doptimize=ReleaseSafe --verbose || die
- dodoc README.md
+ zig_src_configure
}
diff --git a/dev-libs/randomx/randomx-1.2.1.ebuild b/dev-libs/randomx/randomx-1.2.1.ebuild
deleted file mode 100644
index da8c2b40a4..0000000000
--- a/dev-libs/randomx/randomx-1.2.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Proof of work algorithm based on random code execution"
-HOMEPAGE="https://github.com/tevador/RandomX"
-SRC_URI="https://github.com/tevador/RandomX/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}"/RandomX-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-src_configure() {
- append-ldflags -Wl,-z,noexecstack
- cmake_src_configure
-}
diff --git a/dev-python/addict/Manifest b/dev-python/addict/Manifest
new file mode 100644
index 0000000000..9bfa2685e2
--- /dev/null
+++ b/dev-python/addict/Manifest
@@ -0,0 +1 @@
+DIST addict-2.4.0.gh.tar.gz 9418 BLAKE2B b43801dd8d5c82a5effc848077d47a57a2d6a99872f99b290c037757f202f54f196e7a3fbc715e873fbec0f2a3f09e32b1b85d2dac085e715441ea88c651c2a3 SHA512 aa8248b6ba695392d3d87761e2e72675221e22adb99d5d9afccc47ae6763dc840aac610c660201110817704917967f68dc1f65fbebdd52a3b619204d85056a15
diff --git a/dev-python/addict/addict-2.4.0.ebuild b/dev-python/addict/addict-2.4.0.ebuild
new file mode 100644
index 0000000000..1015ccf15f
--- /dev/null
+++ b/dev-python/addict/addict-2.4.0.ebuild
@@ -0,0 +1,17 @@
+# 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..13} python3_13t )
+
+inherit distutils-r1
+
+DESCRIPTION="The Python Dict that's better than heroin"
+HOMEPAGE="https://github.com/mewwts/addict https://pypi.org/project/addict/"
+SRC_URI="https://github.com/mewwts/addict/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-python/addict/metadata.xml b/dev-python/addict/metadata.xml
new file mode 100644
index 0000000000..c3f0ea7b5c
--- /dev/null
+++ b/dev-python/addict/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ gasc@eurecom.fr
+ Gasc Henri
+
+
+ addict
+ mewwts/addict
+
+
diff --git a/dev-python/python-magnumclient/python-magnumclient-4.7.0.ebuild b/dev-python/python-magnumclient/python-magnumclient-4.7.0.ebuild
index 4cd902b02b..56bf38e771 100644
--- a/dev-python/python-magnumclient/python-magnumclient-4.7.0.ebuild
+++ b/dev-python/python-magnumclient/python-magnumclient-4.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..12} )
inherit distutils-r1 pypi
@@ -35,7 +35,12 @@ RDEPEND="
>=dev-python/cryptography-3.0.0[${PYTHON_USEDEP}]
>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
"
+BDEPEND="
+ test? (
+ >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+ >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+ )
+"
-src_prepare() {
- distutils-r1_src_prepare
-}
+distutils_enable_tests pytest
diff --git a/dev-python/python-octaviaclient/python-octaviaclient-3.9.0.ebuild b/dev-python/python-octaviaclient/python-octaviaclient-3.9.0.ebuild
index 2aeda0d13f..c5955a6f8b 100644
--- a/dev-python/python-octaviaclient/python-octaviaclient-3.9.0.ebuild
+++ b/dev-python/python-octaviaclient/python-octaviaclient-3.9.0.ebuild
@@ -31,7 +31,17 @@ RDEPEND="
>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
"
+BDEPEND="
+ test? (
+ >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+ )
+"
-src_prepare() {
- distutils-r1_src_prepare
-}
+EPYTEST_IGNORE=(
+ # not packaged
+ octaviaclient/tests/unit/test_hacking.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-zig/zls/Manifest b/dev-zig/zls/Manifest
index 71ed868ea5..5ab1e76c9e 100644
--- a/dev-zig/zls/Manifest
+++ b/dev-zig/zls/Manifest
@@ -1,4 +1,6 @@
+DIST diffz-1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d.tar.gz 17295 BLAKE2B a45402e3c452ec6b094886ecc7b356c1e8e4a39ebb56147681a9cb795f09c769ba4a4cbed6cdefe76843fc6c6ddbf9a180ab74134743e8e2990a18a0706c6b12 SHA512 add5a10842f1bde009d6e21f9ea21fe0a2440a0dda6acf13cca0b21919b1357c38a017f71994958ec499d7eddf3d4b95ed0321b0d2f9273a436613ffc0b944c0
DIST known-folders-24845b0103e611c108d6bc334231c464e699742c.tar.gz 6618 BLAKE2B cdfe56329edcf50a07eea919b1a753ce965eeaa3c1d9e08289d74704809e489a7a674fb41c0fa16115a406512477cfa99953d434d44c52429c241df7e7bb4f1d SHA512 4ac156ad51793a733d8fd5a24936bd7b0bb8a527b9d19d9cb7d43c9ec7ac983f37dfc00fdfec23147964689201cdbee213e66b4af0917b0bb324b02e8a3a7151
+DIST known_folders-12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147.tar.gz 6761 BLAKE2B c4221a24849c7da004eaea00537c863f159544065efbf941c4123e233db19949f173f5a0074fe434f010556405352e8014286cf25b65f11e1d2ed7d557addb87 SHA512 ddbccef65a51d47365116a8f95d4e258307f6f2fa7b7cd59c5587c31739e440efbfde2c98e8cbae30118e1d13c8005c28ecf4fe243d38cbe7f0ffab05b47e47d
DIST tracy-f493d4aa8ba8141d9680473fad007d8a6348628e.tar.gz 5401470 BLAKE2B 8a027bfe82842d6d3caeddcf03499a3671a99f2210a40b434e9893a60da88775c19738230e8d55cb1de020fe9f0d7d414df76f36f4a55b04a0c41c8c0de8232b SHA512 e8a844ff015b4c7a261e3251be33deced4f4a29a8fc8254244c125b391266e7a38bdf8d988ff4aac10bd0ee5538fca1e274a0d91dcde08d0bd021006cb326e6f
DIST zls-0.10.0-data-for-0.10.1.tar.xz 16668 BLAKE2B 76d6381ad09f050bccb468f2bbe3973d2059a8f09a22b39a76f0d959b46e5b72871e24267e03ae58d149628a5af728ed058e7be15c992dffc1f4072195b4beb4 SHA512 fe2ab662feee8e687a03497f7f383cf9edb2b2de7fce614f5138ead6fc45f337fd85e8cba0e352e6905618df43bae737977d70a783d4a3339e9df1f6bbe714c0
DIST zls-0.10.0.tar.gz 320226 BLAKE2B fc9c7c6e37d9347710520ddf0bc90b704ff6115210e044e68a973a2edefe024d14cf410ed0fe74400c1bed8b57f8316dc4298561f78de3abe112bc38df70404b SHA512 16a55ef0ecfac1bf43c4d917741db8389dc835cfdd9e78e9853180dad7218656c6a09b67b7185e7d87ccb2196a4deb457c3d476300eff01ce8c9bfab597576ad
diff --git a/dev-zig/zls/zls-0.13.0-r1.ebuild b/dev-zig/zls/zls-0.13.0-r1.ebuild
new file mode 100644
index 0000000000..54d28184d1
--- /dev/null
+++ b/dev-zig/zls/zls-0.13.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The officially unofficial Ziglang language server"
+HOMEPAGE="https://zigtools.org/zls/ https://github.com/zigtools/zls"
+
+declare -g -r -A ZBS_DEPENDENCIES=(
+ [diffz-1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d.tar.gz]='https://github.com/ziglibs/diffz/archive/ef45c00d655e5e40faf35afbbde81a1fa5ed7ffb.tar.gz'
+ [known_folders-12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147.tar.gz]='https://github.com/ziglibs/known-folders/archive/0ad514dcfb7525e32ae349b9acc0a53976f3a9fa.tar.gz'
+)
+
+# Sync with "minimum_build_zig_version" from upstream's "build.zig".
+if [[ ${PV} == 9999 ]]; then
+ ZIG_SLOT="9999"
+
+ EGIT_REPO_URI="https://github.com/zigtools/zls"
+ inherit git-r3
+else
+ ZIG_SLOT="0.13"
+
+ SRC_URI="
+ https://github.com/zigtools/zls/archive/refs/tags/${PV}.tar.gz -> zls-${PV}.tar.gz
+ https://codeberg.org/BratishkaErik/distfiles/releases/download/zls-${PV}/zls-${PV}-version_data.tar.xz
+ "
+ KEYWORDS="~amd64"
+fi
+
+inherit zig
+SRC_URI+="${ZBS_DEPENDENCIES_SRC_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+
+# Sync with "minimum_runtime_zig_version" from upstream's "build.zig".
+RDEPEND="
+ || (
+ >=dev-lang/zig-0.12.0
+ >=dev-lang/zig-bin-0.12.0
+ )
+"
+
+DOCS=( "README.md" )
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ zig_live_fetch -Denable_tracy=false
+ else
+ zig_src_unpack
+ fi
+}
+
+src_configure() {
+ local my_zbs_args=(
+ -Dpie=true
+ -Denable_tracy=false
+ -Dversion_data_file_path="${S}/version_data.zig"
+ )
+
+ zig_src_configure
+}
+
+pkg_postinst() {
+ elog "You can find configuration guide here:"
+ elog "https://zigtools.org/zls/"
+}
diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild
index 4966ee4a77..40f7c46cba 100644
--- a/dev-zig/zls/zls-9999.ebuild
+++ b/dev-zig/zls/zls-9999.ebuild
@@ -3,155 +3,64 @@
EAPI=8
-inherit edo
-
DESCRIPTION="The officially unofficial Ziglang language server"
-HOMEPAGE="https://github.com/zigtools/zls"
+HOMEPAGE="https://zigtools.org/zls/ https://github.com/zigtools/zls"
+
+declare -g -r -A ZBS_DEPENDENCIES=(
+ [diffz-1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d.tar.gz]='https://github.com/ziglibs/diffz/archive/ef45c00d655e5e40faf35afbbde81a1fa5ed7ffb.tar.gz'
+ [known_folders-12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147.tar.gz]='https://github.com/ziglibs/known-folders/archive/0ad514dcfb7525e32ae349b9acc0a53976f3a9fa.tar.gz'
+)
if [[ ${PV} == 9999 ]]; then
+ ZIG_SLOT="9999"
+
EGIT_REPO_URI="https://github.com/zigtools/zls"
inherit git-r3
-
- EZIG_MIN="9999"
- EZIG_MAX_EXCLUSIVE="99991"
- BDEPEND="dev-lang/zig:9999"
else
+ ZIG_SLOT="0.13"
+
SRC_URI="
https://github.com/zigtools/zls/archive/refs/tags/${PV}.tar.gz -> zls-${PV}.tar.gz
- https://codeberg.org/BratishkaErik/distfiles/releases/download/zls-${PV}/zls-${PV}-deps.tar.xz
https://codeberg.org/BratishkaErik/distfiles/releases/download/zls-${PV}/zls-${PV}-version_data.tar.xz
"
KEYWORDS="~amd64"
-
- EZIG_MIN="0.13"
- EZIG_MAX_EXCLUSIVE="0.14"
- BDEPEND="|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )"
fi
+inherit zig
+SRC_URI+="${ZBS_DEPENDENCIES_SRC_URI}"
+
LICENSE="MIT"
SLOT="0"
-RDEPEND="${BDEPEND}"
+# Sync with "minimum_runtime_zig_version" from upstream's "build.zig".
+RDEPEND="
+ || (
+ >=dev-lang/zig-0.12.0
+ >=dev-lang/zig-bin-0.12.0
+ )
+"
-DOCS=( README.md )
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig Build System doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/zls"
-
-# : copied from sys-fs/ncdu :
-# Many thanks to Florian Schmaus (Flowdalic)!
-# Adapted from https://github.com/gentoo/gentoo/pull/28986
-# Set the EZIG environment variable.
-zig-set_EZIG() {
- [[ -n ${EZIG} ]] && return
-
- if [[ -n ${EZIG_OVERWRITE} ]]; then
- export EZIG="${EZIG_OVERWRITE}"
- return
- fi
-
- local candidates candidate selected selected_ver
-
- candidates=$(compgen -c zig-)
-
- for candidate in ${candidates}; do
- if [[ ! ${candidate} =~ zig(-bin)?-([.0-9]+) ]]; then
- continue
- fi
-
- local ver
- if (( ${#BASH_REMATCH[@]} == 3 )); then
- ver="${BASH_REMATCH[2]}"
- else
- ver="${BASH_REMATCH[1]}"
- fi
-
- if [[ -n ${EZIG_EXACT_VER} ]]; then
- ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
-
- selected="${candidate}"
- selected_ver="${ver}"
- break
- fi
-
- if [[ -n ${EZIG_MIN} ]] \
- && ver_test "${ver}" -lt "${EZIG_MIN}"; then
- # Candidate does not satisfy EZIG_MIN condition.
- continue
- fi
-
- if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
- && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
- # Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
- continue
- fi
-
- if [[ -n ${selected_ver} ]] \
- && ver_test "${selected_ver}" -gt "${ver}"; then
- # Candidate is older than the currently selected candidate.
- continue
- fi
-
- selected="${candidate}"
- selected_ver="${ver}"
- done
-
- if [[ -z ${selected} ]]; then
- die "Could not find (suitable) zig installation in PATH"
- fi
-
- export EZIG="${selected}"
- export EZIG_VER="${ver}"
-}
-
-# Invoke zig with the optionally provided arguments.
-ezig() {
- zig-set_EZIG
-
- # Unfortunately, we cannot add more args here, since syntax is different
- # for every subcommands. Yes, even target/cpu :( f.i. :
- # -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build-
- # -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build
- # (or even none, if hardcoded by upstream so choice is -Drelease=true/false)
- # Ofc we can patch this, but still...
-
- edo "${EZIG}" "${@}"
-}
+DOCS=( "README.md" )
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
-
- cd "${S}" || die
- ezig build --fetch --global-cache-dir "${WORKDIR}/zig-eclass/" || die "Pre-fetching Zig modules failed"
+ zig_live_fetch -Denable_tracy=false
else
- default_src_unpack
+ zig_src_unpack
fi
}
src_configure() {
- export ZBS_ARGS=(
- --prefix usr/
- -Doptimize=ReleaseSafe
- --system "${WORKDIR}/zig-eclass/p/"
- --verbose
+ local my_zbs_args=(
+ -Dpie=true
+ -Denable_tracy=false
)
-}
-src_compile() {
- ezig build "${ZBS_ARGS[@]}"
-}
-
-src_test() {
- ezig build test "${ZBS_ARGS[@]}"
-}
-
-src_install() {
- DESTDIR="${ED}" ezig build install "${ZBS_ARGS[@]}"
- einstalldocs
+ zig_src_configure
}
pkg_postinst() {
- elog "You can find more information about options here: https://github.com/zigtools/zls/wiki/Configuration"
+ elog "You can find configuration guide here:"
+ elog "https://zigtools.org/zls/"
}
diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index 742ab54154..6b6cd8a96a 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1,2 +1,2 @@
-DIST dosbox-x-v2024.07.01.tar.gz 119702042 BLAKE2B 1c046a54b5a94deef6413592c48be08542c6d9c6d5b437880a354eb9df137fafb5da57d5f99e4bdcd83eea99a7a3550117c8ed66adcbca38aea484b116321068 SHA512 e6a0478be160b115ab09ffe13d7574d604fc7778105171da3591bd4239903cb5766118e0b05d158a89344bbbd1383885aa4fd724dce4601595438634724b2f24
DIST dosbox-x-v2024.10.01.tar.gz 121316697 BLAKE2B 27e653fe341146c71ed4059b8aba6660c06e41f39635c9d3e08a215793b31e3f28b4e7ba923cc8cc644357f92bdcfc20d604e61a15fb0c995b047129d857e437 SHA512 8a0a27476b27197ed942e60915749589324199fd89eabd0377ff7aadf293630db292a9eb6304336da87220092cfee3975259660623ecd0d775aa13938fd43658
+DIST dosbox-x-v2024.12.04.tar.gz 121318659 BLAKE2B 632218c2be7a7cb12d1fc865af59699af463b70ca76d739ea9837eb6ca80c87f4a04436000090c1ff1e98076cdc92f3f27cb2e4d0e47e00b413363bd0a3d9ce5 SHA512 698dc67f43be9f64f3d987b7c4cdc0e1217ce1386e405e6ca70c97346cf02abe65a68a097bb765502f8802930f12e3bcebca00aa1037c97d9c778fc79a3a9bda
diff --git a/games-emulation/dosbox-x/dosbox-x-2024.07.01.ebuild b/games-emulation/dosbox-x/dosbox-x-2024.12.04.ebuild
similarity index 98%
rename from games-emulation/dosbox-x/dosbox-x-2024.07.01.ebuild
rename to games-emulation/dosbox-x/dosbox-x-2024.12.04.ebuild
index 7372dc2d49..d7917dae50 100644
--- a/games-emulation/dosbox-x/dosbox-x-2024.07.01.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2024.12.04.ebuild
@@ -151,6 +151,7 @@ src_compile() {
}
src_test() {
+ xdg_environment_reset # Tests may create config files in XDG_CONFIG_HOME
set -- src/dosbox-x -tests
echo "${@}" >&2
"${@}" || die "Unit tests failed"
diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 7372dc2d49..d7917dae50 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -151,6 +151,7 @@ src_compile() {
}
src_test() {
+ xdg_environment_reset # Tests may create config files in XDG_CONFIG_HOME
set -- src/dosbox-x -tests
echo "${@}" >&2
"${@}" || die "Unit tests failed"
diff --git a/gui-libs/gtk-session-lock/gtk-session-lock-0.2.0-r6.ebuild b/gui-libs/gtk-session-lock/gtk-session-lock-0.2.0-r6.ebuild
index b4fe7401d9..73de946d19 100644
--- a/gui-libs/gtk-session-lock/gtk-session-lock-0.2.0-r6.ebuild
+++ b/gui-libs/gtk-session-lock/gtk-session-lock-0.2.0-r6.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
VALA_USE_DEPEND="vapigen"
-inherit vala meson python-any-r1
+inherit vala meson
if [[ ${PV} == 9999 ]]; then
inherit git-r3
@@ -16,13 +15,14 @@ else
fi
DESCRIPTION="GTK-based lockscreen for Wayland"
-HOMEPAGE="https://github.com/Cu3PO42/${PN}"
+HOMEPAGE="https://github.com/Cu3PO42/gtk-session-lock"
LICENSE="GPL-3"
SLOT="0"
-IUSE="examples gtk-doc introspection test vala"
-RESTRICT="!test? ( test )"
+IUSE="examples gtk-doc introspection vala"
+# https://github.com/Cu3PO42/gtk-session-lock/commit/a92080b164df7553aa250d43f90965535a3050ba
+RESTRICT="test"
REQUIRED_USE="vala? ( introspection )"
DEPEND="
@@ -31,7 +31,6 @@ DEPEND="
>=dev-libs/wayland-1.22.0
>=dev-libs/wayland-protocols-1.34
gui-libs/gtk-layer-shell
- test? ( gui-libs/gtk-layer-shell[introspection?] )
"
RDEPEND="
${DEPEND}
@@ -42,7 +41,6 @@ BDEPEND="
virtual/pkgconfig
dev-build/meson
gtk-doc? ( dev-util/gtk-doc )
- test? ( ${PYTHON_DEPS} )
vala? ( $(vala_depend) )
"
@@ -55,7 +53,7 @@ src_configure() {
local emesonargs=(
$(meson_use examples)
$(meson_use gtk-doc docs)
- $(meson_use test tests)
+ -Dtests=false
$(meson_use introspection)
$(meson_use vala vapi)
)
diff --git a/gui-libs/gtk-session-lock/gtk-session-lock-9999.ebuild b/gui-libs/gtk-session-lock/gtk-session-lock-9999.ebuild
index b4fe7401d9..73de946d19 100644
--- a/gui-libs/gtk-session-lock/gtk-session-lock-9999.ebuild
+++ b/gui-libs/gtk-session-lock/gtk-session-lock-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
VALA_USE_DEPEND="vapigen"
-inherit vala meson python-any-r1
+inherit vala meson
if [[ ${PV} == 9999 ]]; then
inherit git-r3
@@ -16,13 +15,14 @@ else
fi
DESCRIPTION="GTK-based lockscreen for Wayland"
-HOMEPAGE="https://github.com/Cu3PO42/${PN}"
+HOMEPAGE="https://github.com/Cu3PO42/gtk-session-lock"
LICENSE="GPL-3"
SLOT="0"
-IUSE="examples gtk-doc introspection test vala"
-RESTRICT="!test? ( test )"
+IUSE="examples gtk-doc introspection vala"
+# https://github.com/Cu3PO42/gtk-session-lock/commit/a92080b164df7553aa250d43f90965535a3050ba
+RESTRICT="test"
REQUIRED_USE="vala? ( introspection )"
DEPEND="
@@ -31,7 +31,6 @@ DEPEND="
>=dev-libs/wayland-1.22.0
>=dev-libs/wayland-protocols-1.34
gui-libs/gtk-layer-shell
- test? ( gui-libs/gtk-layer-shell[introspection?] )
"
RDEPEND="
${DEPEND}
@@ -42,7 +41,6 @@ BDEPEND="
virtual/pkgconfig
dev-build/meson
gtk-doc? ( dev-util/gtk-doc )
- test? ( ${PYTHON_DEPS} )
vala? ( $(vala_depend) )
"
@@ -55,7 +53,7 @@ src_configure() {
local emesonargs=(
$(meson_use examples)
$(meson_use gtk-doc docs)
- $(meson_use test tests)
+ -Dtests=false
$(meson_use introspection)
$(meson_use vala vapi)
)
diff --git a/gui-wm/river/Manifest b/gui-wm/river/Manifest
index 36e44d7c1d..1236604727 100644
--- a/gui-wm/river/Manifest
+++ b/gui-wm/river/Manifest
@@ -1,5 +1,10 @@
DIST river-0.3.5.tar.gz 170903 BLAKE2B a4bdfc0ddd1dc92d6bed392c8a68a2639ef6ae3ee5d217c93d326edcec52af87286ac1c376a60554f9f65443a3130a1d44ff7841dba903a0d17516c94c95ce27 SHA512 49e3d0488030aee4f69936605fafc0027b2c78a9a399b5153d54a5ba64592c7efdc67bfd7fedcab6ba93c0689bc921f5a978f7b4b1a12e0c5fda0242900d328c
+DIST river-0.3.6.tar.gz 171853 BLAKE2B ffa66b698a250eeaef6034ce7f58175d99ae93b644525b30e192938620410efe494bf8bbf0dc6885d784d1566c26a13e026a490ec21db8e664d42a1ddb5eb222 SHA512 62a7a39a697507813018e02d7d05374dfdab2bbd531623b870b1ea75d34a4bd3dea55146fb6b37620ee4633d5a1fd011461de097bc1fd4db6c6ca95251033f27
DIST zig-pixman-0.2.0.tar.gz 7874 BLAKE2B 25e0e0a65ab45c08e13ed48393e0d009a63e0ec4c2d8452f08ec4b013f9b696adb1d7356a49b1c3b25710982fb34629002df8d433382d433fcdefd1de5fd4358 SHA512 61ce38e9788e9a3701cf32b2d8721424088e1a8bd11841fecc999a31f9b46148e63a35cf770a39edcc7887913019654f7df945b7d7e3b57437d007f7d45609b9
+DIST zig-pixman-12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56.tar.gz 7874 BLAKE2B 25e0e0a65ab45c08e13ed48393e0d009a63e0ec4c2d8452f08ec4b013f9b696adb1d7356a49b1c3b25710982fb34629002df8d433382d433fcdefd1de5fd4358 SHA512 61ce38e9788e9a3701cf32b2d8721424088e1a8bd11841fecc999a31f9b46148e63a35cf770a39edcc7887913019654f7df945b7d7e3b57437d007f7d45609b9
DIST zig-wayland-0.2.0.tar.gz 56543 BLAKE2B aaf82efe78d25c59a87de050147857fcf9a19764141cb40d92b0dd48b96ea0ec52d00a1ab0df1afe4c45cda6d64dda97f296f0aa29d8b9ea3da49e1d5cd69e50 SHA512 dfb140c06d9e3c566034f9102426e7bd47dcde87a2ae16d43ce3ea72cf44bea872bab1d9a23a24ae9d57d2d4ae6c56060a6b10f869de3990046426b0462db85e
+DIST zig-wayland-1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242.tar.gz 56543 BLAKE2B aaf82efe78d25c59a87de050147857fcf9a19764141cb40d92b0dd48b96ea0ec52d00a1ab0df1afe4c45cda6d64dda97f296f0aa29d8b9ea3da49e1d5cd69e50 SHA512 dfb140c06d9e3c566034f9102426e7bd47dcde87a2ae16d43ce3ea72cf44bea872bab1d9a23a24ae9d57d2d4ae6c56060a6b10f869de3990046426b0462db85e
DIST zig-wlroots-0.18.0.tar.gz 56568 BLAKE2B 2ff804f7472d9c48cc29375afcdbdaba996b0c73b4660a89cd982058c79603a0d3f5e7233b0bfe7f2a5af33046ea7dddddad95136a890997020be0f0beb3b050 SHA512 a67b35c0475253b581728a407d46e256ca1f587d7cc105f00f5a7e5eb39808cea46a3d302c965f92e08801e99e67a450c11f085a94b57b1d86c0c3bab83b806d
+DIST zig-wlroots-122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1.tar.gz 56926 BLAKE2B 50a143f816b47516b3fc3b051a7445162efbcbb802a3515fe554e005e2f1191f75eaeea4bab68972ecb5b9f0b72f7cec12838c7ec98a1d05ed54803b3a79ca66 SHA512 523f29b06ece2aefbd90e8f9ce15bfcf59edf47e583fe963a8f58af0209d7e9a8dda857424469a40e3c7defb31d01df9f977f8dc58dc3ba7468e20f7b3a4e417
DIST zig-xkbcommon-0.2.0.tar.gz 22700 BLAKE2B 85045d002b4ec1ac8dadda67d3ce6f588e53938ac0a67c06d6cebc85a944d7a23fd1cc295410ce1a91cce9ffb587834f7eca2400e1468fec0193583ac71d6f86 SHA512 a99b6a2fefe34507fd687b58a9618a27ca617966798b410a72c9e53462c3f9c6dd0476a22bb9686cbf49994ca502743b4d25fdc55125359d4fe2860094bf0e82
+DIST zig-xkbcommon-1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f.tar.gz 22700 BLAKE2B 85045d002b4ec1ac8dadda67d3ce6f588e53938ac0a67c06d6cebc85a944d7a23fd1cc295410ce1a91cce9ffb587834f7eca2400e1468fec0193583ac71d6f86 SHA512 a99b6a2fefe34507fd687b58a9618a27ca617966798b410a72c9e53462c3f9c6dd0476a22bb9686cbf49994ca502743b4d25fdc55125359d4fe2860094bf0e82
diff --git a/gui-wm/river/files/river-0.3.6-fix-no-lazypath.patch b/gui-wm/river/files/river-0.3.6-fix-no-lazypath.patch
new file mode 100644
index 0000000000..fe955884f6
--- /dev/null
+++ b/gui-wm/river/files/river-0.3.6-fix-no-lazypath.patch
@@ -0,0 +1,31 @@
+From: Eric Joldasov
+
+Temporary fix for building river when out-of-source. This is exactly
+things that "separate BUILD_DIR by default" in `zig.eclass` was meant
+to catch.
+
+Proper fix here would be to patch upstream to use `std.Build.LazyPath`
+instead of plain string, like mentioned in TODO here:
+https://codeberg.org/ifreund/zig-wayland/src/tag/v0.2.0/build.zig#L134-L135
+
+diff --git a/build.zig b/build.zig
+index 55f7ced..f49f9b1 100644
+--- a/build.zig
++++ b/build.zig
+@@ -100,11 +100,11 @@ pub fn build(b: *Build) !void {
+ scanner.addSystemProtocol("unstable/pointer-gestures/pointer-gestures-unstable-v1.xml");
+ scanner.addSystemProtocol("unstable/xdg-decoration/xdg-decoration-unstable-v1.xml");
+
+- scanner.addCustomProtocol("protocol/river-control-unstable-v1.xml");
+- scanner.addCustomProtocol("protocol/river-status-unstable-v1.xml");
+- scanner.addCustomProtocol("protocol/river-layout-v3.xml");
+- scanner.addCustomProtocol("protocol/wlr-layer-shell-unstable-v1.xml");
+- scanner.addCustomProtocol("protocol/wlr-output-power-management-unstable-v1.xml");
++ scanner.addCustomProtocol(b.pathFromRoot("protocol/river-control-unstable-v1.xml"));
++ scanner.addCustomProtocol(b.pathFromRoot("protocol/river-status-unstable-v1.xml"));
++ scanner.addCustomProtocol(b.pathFromRoot("protocol/river-layout-v3.xml"));
++ scanner.addCustomProtocol(b.pathFromRoot("protocol/wlr-layer-shell-unstable-v1.xml"));
++ scanner.addCustomProtocol(b.pathFromRoot("protocol/wlr-output-power-management-unstable-v1.xml"));
+
+ // Some of these versions may be out of date with what wlroots implements.
+ // This is not a problem in practice though as long as river successfully compiles.
diff --git a/gui-wm/river/river-0.3.6.ebuild b/gui-wm/river/river-0.3.6.ebuild
new file mode 100644
index 0000000000..1342330cea
--- /dev/null
+++ b/gui-wm/river/river-0.3.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2024 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}/${P}-fix-no-lazypath.patch" )
+
+DOCS=( "README.md" )
+
+src_unpack() {
+ zig_src_unpack
+}
+
+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/media-radio/fllog/Manifest b/media-radio/fllog/Manifest
index e001beb214..9753fa4d92 100644
--- a/media-radio/fllog/Manifest
+++ b/media-radio/fllog/Manifest
@@ -1 +1 @@
-DIST fllog-1.2.7.tar.gz 435412 BLAKE2B 1415b0e56d98eb8caa2767e09fc1a00b899ccd7afe4d1776ecfc794b2700cfc525f038d4a3c0988cb0cbe24370cc776980a49e5f24c89d11101222fb011fbec0 SHA512 a53b6a11a9516c18e3620c5a6ea6403f546496397c325940e86a1e456312473ce6dcd6fed7fd07f133f1240a19d3022675831205770f1972523bb7c587b0a8dc
+DIST fllog-1.2.8.tar.gz 439478 BLAKE2B 02ac697bd8c9f24744124676e06f69cc8b2c1332d9230c230e1865263da936d80517927143a4b0537fa187974f225362cb1cb4939f9d00bb9abb65161d281261 SHA512 b6a6bde5964c3e59fa6c5ad88c9965db76c8e8ef9464de7dc260d483a94467260f244b47ca89e17b3015558a3564662a96530817eafc615a2895d84032d9695a
diff --git a/media-radio/fllog/fllog-1.2.7.ebuild b/media-radio/fllog/fllog-1.2.8.ebuild
similarity index 78%
rename from media-radio/fllog/fllog-1.2.7.ebuild
rename to media-radio/fllog/fllog-1.2.8.ebuild
index 96ed3d8e50..cf3a75bd84 100644
--- a/media-radio/fllog/fllog-1.2.7.ebuild
+++ b/media-radio/fllog/fllog-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,12 +7,14 @@ DESCRIPTION="Logbook application for amateur radio use"
HOMEPAGE="http://w1hkj.com"
SRC_URI="http://www.w1hkj.com/files/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
DEPEND=">=x11-libs/fltk-1.1.7"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ x11-libs/libX11
+"
src_configure() {
local -x CONFIG_SHELL=${BASH}
diff --git a/media-video/manimgl/Manifest b/media-video/manimgl/Manifest
index 8d2a7543d3..9a1b4f9076 100644
--- a/media-video/manimgl/Manifest
+++ b/media-video/manimgl/Manifest
@@ -1 +1 @@
-DIST manimgl-1.7.1.gh.tar.gz 1044396 BLAKE2B 7021b20445ef9fdd2ffc718cd0bcc27cd5f0c9d8be7d03fc4fdbd854ff6a53fe4c6a1bb3e04b14a3eae8f169b2a2f18f3a091c32ff175ffd045b7033c0a96aa6 SHA512 ed55ef466fc92a893948159fc84c0ca50b4f5ec54c2482ba81eda04df2d83660598c4e3b438d58ca9e73842baba5b7ff009811c4f85212b4e56a020e8613adf5
+DIST manimgl-1.7.2.gh.tar.gz 1045244 BLAKE2B 680a4f8d09e1d97519a8c072f201468508a32c7f43a5f80bc33b0659dfd50a19c30984fc6bc781b139930df6673e2719d603af7e87665447efd522464611238c SHA512 f803e12bcb352239d6de51b37c15e9e8ca6e3b401dc7f01b51b6392a519bd4a0682ff1af0cfc527e2568cb197bc27b57c364db248452e867e4179c257ce6f9bd
diff --git a/media-video/manimgl/files/drop-pyrr.patch b/media-video/manimgl/files/drop-pyrr.patch
deleted file mode 100644
index 46a106f8ef..0000000000
--- a/media-video/manimgl/files/drop-pyrr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Remove the dependency on pyrr
-https://github.com/3b1b/manim/pull/2256
-diff --git a/manimlib/camera/camera_frame.py b/manimlib/camera/camera_frame.py
-index 648d55cdba..62ca4935c2 100644
---- a/manimlib/camera/camera_frame.py
-+++ b/manimlib/camera/camera_frame.py
-@@ -5,7 +5,6 @@
-
- import numpy as np
- from scipy.spatial.transform import Rotation
--from pyrr import Matrix44
-
- from manimlib.constants import DEGREES, RADIANS
- from manimlib.constants import FRAME_SHAPE
-diff --git a/requirements.txt b/requirements.txt
-index 0737d3fc5d..161fbd9816 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -13,7 +13,6 @@ pydub
- pygments
- PyOpenGL
- pyperclip
--pyrr
- pyyaml
- rich
- scipy
diff --git a/media-video/manimgl/manimgl-1.7.1.ebuild b/media-video/manimgl/manimgl-1.7.2.ebuild
similarity index 89%
rename from media-video/manimgl/manimgl-1.7.1.ebuild
rename to media-video/manimgl/manimgl-1.7.2.ebuild
index ca97f84208..0d2c9fddfc 100644
--- a/media-video/manimgl/manimgl-1.7.1.ebuild
+++ b/media-video/manimgl/manimgl-1.7.2.ebuild
@@ -30,10 +30,11 @@ fi
LICENSE="MIT"
SLOT="0"
-PATCHES=( "${FILESDIR}/drop-pyrr.patch" )
-
RDEPEND="
+ dev-python/addict[${PYTHON_USEDEP}]
+ dev-python/appdirs[${PYTHON_USEDEP}]
dev-python/colour[${PYTHON_USEDEP}]
+ dev-python/diskcache[${PYTHON_USEDEP}]
>=dev-python/ipython-8.18.0[${PYTHON_USEDEP}]
dev-python/isosurfaces[${PYTHON_USEDEP}]
dev-python/fonttools[${PYTHON_USEDEP}]
@@ -72,8 +73,10 @@ DEPEND="${RDEPEND}"
python_install_all() {
default
- docinto examples
- dodoc example_scenes.py
- dodoc docs/example.py
- docompress -x /usr/share/doc/${PF}/examples
+ if use doc; then
+ docinto examples
+ dodoc example_scenes.py
+ dodoc docs/example.py
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
}
diff --git a/media-video/manimgl/manimgl-9999.ebuild b/media-video/manimgl/manimgl-9999.ebuild
index 28c151e091..96c48228c7 100644
--- a/media-video/manimgl/manimgl-9999.ebuild
+++ b/media-video/manimgl/manimgl-9999.ebuild
@@ -30,10 +30,11 @@ fi
LICENSE="MIT"
SLOT="0"
-PATCHES=( "${FILESDIR}/drop-pyrr.patch" )
-
RDEPEND="
+ dev-python/addict[${PYTHON_USEDEP}]
+ dev-python/appdirs[${PYTHON_USEDEP}]
dev-python/colour[${PYTHON_USEDEP}]
+ dev-python/diskcache[${PYTHON_USEDEP}]
>=dev-python/ipython-8.18.0[${PYTHON_USEDEP}]
dev-python/isosurfaces[${PYTHON_USEDEP}]
dev-python/fonttools[${PYTHON_USEDEP}]
@@ -72,8 +73,10 @@ DEPEND="${RDEPEND}"
python_install_all() {
default
- docinto examples
- dodoc example_scenes.py
- dodoc docs/example.py
- docompress -x /usr/share/doc/${PF}/examples
+ if use doc; then
+ docinto examples
+ dodoc example_scenes.py
+ dodoc docs/example.py
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
}
diff --git a/net-misc/freetube-bin/Manifest b/net-misc/freetube-bin/Manifest
index f61f1376c7..1f680e5600 100644
--- a/net-misc/freetube-bin/Manifest
+++ b/net-misc/freetube-bin/Manifest
@@ -1,2 +1,3 @@
DIST freetube-bin-0.21.3_beta.deb 75556992 BLAKE2B 7f545a0f9b062d6adaa747ed7c6b1e6e103683cb62d8128647e2dffce8567989be8e3a22c982f6b5906d9f0c49562e9707255a892a2a097ad576aa5dd2c0c887 SHA512 25aa0e13db28601047855c04dd59e032ca1569e6cc0dcc40e6da5943ec575308fe99c040756134256774dc39c356ffe450cb6ffbb5b31f2e38e75c6df31592c5
DIST freetube-bin-0.22.0_beta.deb 77144226 BLAKE2B 2aad09f3df5adbde93e83736c9886313b4c86611e5804399a6a2f634633933d129d2ab0450685d28792d992ac362c213182e0f2ac60e52b7a443a143181fdbfc SHA512 f0b964ca326b9ba72627fb654f060058c1bc7863c559e5dbc2309fde5491364aeb7bff66663ef412d30cf9276712cdbadc2bba5743008c5119c99be62c8606e0
+DIST freetube-bin-0.22.1_beta.deb 76861498 BLAKE2B 9f80e6b89708e7116091135f3f305bd2363ebb6fab6e95864b776546279ba73a369d0e706d36e2017a1738cb5982bfe7ccf24898b7856b4b2d99c49b0512b2d0 SHA512 1ba1a74750c185d3fbb825d90d378e427fe32a2e1e61f2299677be457e454248f4df1462f6f46e32122434e7c672776dbff55bdca0e1a6b7d944bec3eb1af0e4
diff --git a/net-misc/freetube-bin/freetube-bin-0.22.1_beta.ebuild b/net-misc/freetube-bin/freetube-bin-0.22.1_beta.ebuild
new file mode 100644
index 0000000000..93224957f3
--- /dev/null
+++ b/net-misc/freetube-bin/freetube-bin-0.22.1_beta.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop unpacker xdg
+
+DESCRIPTION="A private YouTube desktop client"
+HOMEPAGE="https://freetubeapp.io/ https://github.com/FreeTubeApp/FreeTube"
+SRC_URI="https://github.com/FreeTubeApp/FreeTube/releases/download/v${PV/_/-}/freetube_${PV%_*}_amd64.deb
+ -> ${P}.deb
+"
+S="${WORKDIR}"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_PREBUILT="
+ /opt/FreeTube/freetube
+ /opt/FreeTube/libEGL.so
+ /opt/FreeTube/libffmpeg.so
+ /opt/FreeTube/libGLESv2.so
+ /opt/FreeTube/libvulkan.so*
+ /opt/FreeTube/chrome_crashpad_handler
+ /opt/FreeTube/chrome-sandbox
+ /opt/FreeTube/libvk_swiftshader.so
+ /opt/FreeTube/swiftshader/libEGL.so
+ /opt/FreeTube/swiftshader/libGLESv2.so
+"
+
+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/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libdrm
+ x11-libs/libxcb
+ x11-libs/libxkbcommon
+ x11-libs/libxshmfence
+ x11-libs/pango
+"
+
+src_install() {
+ insinto /opt
+ doins -r opt/*
+
+ domenu usr/share/applications/freetube.desktop
+ doicon -s scalable usr/share/icons/hicolor/scalable/apps/freetube.svg
+
+ fperms 4755 /opt/FreeTube/chrome-sandbox
+ fperms +x /opt/FreeTube/freetube
+
+ dosym -r /opt/FreeTube/freetube /usr/bin/freetube-bin
+}
diff --git a/net-p2p/monero/monero-0.18.3.4-r1.ebuild b/net-p2p/monero/monero-0.18.3.4-r1.ebuild
index 70cbb27708..239eec451d 100644
--- a/net-p2p/monero/monero-0.18.3.4-r1.ebuild
+++ b/net-p2p/monero/monero-0.18.3.4-r1.ebuild
@@ -26,7 +26,7 @@ RESTRICT="test"
DEPEND="
acct-group/monero
acct-user/monero
- dev-libs/boost:=[nls]
+ ${P}.tar.gz"
+S="${WORKDIR}/${PN}-src-${PV}"
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+IUSE="+acct pam sqlite pie"
+
+DEPEND="
+ acct? (
+ acct-group/git
+ acct-user/git[gitea] )
+ pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+ dev-vcs/git
+ !www-apps/gitea" # until acct-user/git[forgejo]
+
+DOCS=(
+ custom/conf/app.example.ini CONTRIBUTING.md README.md
+)
+FILECAPS=(
+ -m 711 cap_net_bind_service+ep usr/bin/forgejo
+)
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+
+ local sedcmds=(
+ -e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
+ -e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/forgejo#"
+ -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
+ -e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
+ -e "s#^MODE = console#MODE = file#"
+ -e "s#^LEVEL = Trace#LEVEL = Info#"
+ -e "s#^LOG_SQL = true#LOG_SQL = false#"
+ -e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
+ )
+
+ sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
+ if use sqlite ; then
+ sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
+ fi
+}
+
+src_configure() {
+ # bug 832756 - PIE build issues
+ filter-flags -fPIE
+ filter-ldflags -fPIE -pie
+}
+
+src_compile() {
+ local forgejo_tags=(
+ bindata
+ $(usev pam)
+ $(usex sqlite 'sqlite sqlite_unlock_notify' '')
+ )
+ local forgejo_settings=(
+ "-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/forgejo/app.ini"
+ "-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+ "-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+ )
+ local makeenv=(
+ DRONE_TAG="${PV}"
+ LDFLAGS="-extldflags \"${LDFLAGS}\" ${forgejo_settings[*]}"
+ TAGS="${forgejo_tags[*]}"
+ )
+
+ GOFLAGS=""
+ if use pie ; then
+ GOFLAGS+="-buildmode=pie"
+ fi
+
+ # need to set -j1 or build fails due to a race condition between MAKE jobs.
+ # this does not actually impact build parallelism, because the go compiler
+ # will still build everything in parallel when it's invoked.
+ env "${makeenv[@]}" emake -j1 EXTRA_GOFLAGS="${GOFLAGS}" backend
+}
+
+src_install() {
+ cp gitea forgejo
+ dobin forgejo
+
+ einstalldocs
+
+ newconfd "${FILESDIR}/forgejo.confd-r1" forgejo
+ newinitd "${FILESDIR}/forgejo.initd-r3" forgejo
+ newtmpfiles - forgejo.conf <<-EOF
+ d /run/forgejo 0755 git git
+ EOF
+ systemd_newunit "${FILESDIR}"/forgejo.service-r3 forgejo.service
+
+ insinto /etc/forgejo
+ newins custom/conf/app.example.ini app.ini
+ if use acct; then
+ fowners root:git /etc/forgejo/{,app.ini}
+ fperms g+w,o-rwx /etc/forgejo/{,app.ini}
+
+ diropts -m0750 -o git -g git
+ keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+ keepdir /var/log/forgejo
+ fi
+}
+
+pkg_postinst() {
+ fcaps_pkg_postinst
+ tmpfiles_process forgejo.conf
+
+ ewarn "${PN} ${PV} will continue to use /var/lib/gitea as the default home,"
+ ewarn "as acct-user/git[gitea] depends on it, and acct-user[forgejo] does not"
+ ewarn "exist yet."
+ 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"
+ ewarn "> - auto is replaced by gitea-auto"
+ ewarn ""
+ ewarn "See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-0"
+ ewarn "for more information"
+}
diff --git a/www-client/zen-bin/Manifest b/www-client/zen-bin/Manifest
index 698980f153..1a4825b906 100644
--- a/www-client/zen-bin/Manifest
+++ b/www-client/zen-bin/Manifest
@@ -1,4 +1,2 @@
-DIST zen-bin-1.0.1_alpha19.tar.bz2 89522253 BLAKE2B 333168463767dbf85be2c918c81892a4bafb47a5a9cb5b7301869aa44aeb762bdb3a16d06a3e411ff2cbb028297ada1a497513a74f643edd64324a25910923c9 SHA512 087b36c1d32656820e92a4c860fdc682a1b227f94ead7dc58ebbf8670b8345a9d383fcfbaacfb3c567d9685825f5f3af9381345b0e6753cdbedfafbd43f3dccc
-DIST zen-bin-1.0.1_alpha22.tar.bz2 89579148 BLAKE2B 23b8e88682b806f8937e9ffef082a3b5d90e285d0fa1ed60821fddfa22e464f65a24a43f4cb2edd96b8612e4e2fcf2104dabed194ee1a3d5f998feb35b9f365b SHA512 1e257cfbb1231c42b3e9f4b2867a54aafbbd5552b7316c1044ac452990d0d3bf36858d9cf684b5296b2b03ac4a9003931e8a716c026dadf614ff36027c41f353
-DIST zen-bin-1.0.2_beta0.tar.bz2 94265180 BLAKE2B 3f52584c7eaf8b9653ea734a9d9b75aa82dd44b36b9c443ab0c3e4ee9b43f36102d8248962c02b424730196b8804f06c6c49c8b5672b5ee215a7419d0525e089 SHA512 5f2829a3fcf548d469d7bd6404232911a0520bb01e8b9a592a930c0fabad269c7cde297718e5f245a2b51268e0bcd443731498ae791600736868203530c7182d
DIST zen-bin-1.0.2_beta1.tar.bz2 94269909 BLAKE2B 84174e4ef564bc7ca4877764998534fd00a457b21f9c5d94838b7aa6908fe666b4b02e4c85f6547dd4b0608997e995af3f611407bc0fd258d67f019ab59978c4 SHA512 74539f859d0ce5f84799695dfb472423c446a1f1a3d3185e29545b6121a0a50b783e26143628574abb845ce7d67e90abd51f5a1066b6131c5222b0fe6c3ddf1f
+DIST zen-bin-1.0.2_beta2.tar.bz2 94354940 BLAKE2B 88ce300b580775a3995eddab158d2411ac85d081c0c60e5e43a0d93be0c263f61018bd584803cd7c6a962f80314f4c49d469e593f8fee3e3c2fe98df3b351543 SHA512 e05445799b758ae4a97257bf283edb5f499077897e70f9df12a49b36ab982a68f8678d3484e54fb2713d7dcdded0c15458f7b9e55d478f90b70c88bd9825fd6b
diff --git a/www-client/zen-bin/zen-bin-1.0.1_alpha22.ebuild b/www-client/zen-bin/zen-bin-1.0.1_alpha22.ebuild
deleted file mode 100644
index 189160a80e..0000000000
--- a/www-client/zen-bin/zen-bin-1.0.1_alpha22.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils desktop
-
-MY_PV="1.0.1-a.22"
-MY_P="zen"
-
-DESCRIPTION="Zen Browser - A Firefox-based browser focused on privacy"
-HOMEPAGE="https://github.com/zen-browser/desktop"
-SRC_URI="https://github.com/zen-browser/desktop/releases/download/${MY_PV}/${MY_P}.linux-specific.tar.bz2 -> ${P}.tar.bz2"
-
-S="${WORKDIR}"
-LICENSE="MPL-2.0"
-SLOT="0"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/freetype
- media-libs/mesa
- net-print/cups
- sys-apps/dbus
- sys-libs/glibc
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango
-"
-
-DEPEND="${RDEPEND}"
-
-QA_PREBUILT="opt/zen/*"
-
-src_install() {
- #create dest dir
- local destdir="/opt/zen"
- dodir "${destdir}"
- #copy files into dest dir
- cp -a "${S}/zen"/* "${ED}${destdir}" || die
- #create a symlink to the binary
- dosym "${destdir}/zen-bin" "/usr/bin/zen-bin" || die
- #add icons
- local icon_dir="${ED}${destdir}/browser/chrome/icons/default"
- if [[ -d "${icon_dir}" ]]; then
- for size in 16 32 48 64 128; do
- if [[ -f "${icon_dir}/default${size}.png" ]]; then
- newicon -s ${size} "${icon_dir}/default${size}.png" zen.png
- fi
- done
- else
- ewarn "Icon directory not found, skipping icon installation"
- fi
- #create desktop file
- make_desktop_entry zen-bin "Zen" zen "Network;WebBrowser"
- #handle permissions of destdir files
- fperms 0755 "${destdir}"/{zen-bin,updater,glxtest,vaapitest}
- fperms 0750 "${destdir}"/pingsender
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- elog "For optimal performance and compatibility, please ensure"
- elog "that you have the latest graphics drivers installed."
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/www-client/zen-bin/zen-bin-1.0.2_beta0.ebuild b/www-client/zen-bin/zen-bin-1.0.2_beta0.ebuild
deleted file mode 100644
index f5cc0ecdca..0000000000
--- a/www-client/zen-bin/zen-bin-1.0.2_beta0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils desktop
-
-MY_PV="1.0.2-b.0"
-MY_P="zen"
-
-DESCRIPTION="Zen Browser - A Firefox-based browser focused on privacy"
-HOMEPAGE="https://github.com/zen-browser/desktop"
-SRC_URI="https://github.com/zen-browser/desktop/releases/download/${MY_PV}/${MY_P}.linux-specific.tar.bz2 -> ${P}.tar.bz2"
-
-S="${WORKDIR}"
-LICENSE="MPL-2.0"
-SLOT="0"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/freetype
- media-libs/mesa
- net-print/cups
- sys-apps/dbus
- sys-libs/glibc
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango
-"
-
-DEPEND="${RDEPEND}"
-
-QA_PREBUILT="opt/zen/*"
-
-src_install() {
- #create dest dir
- local destdir="/opt/zen"
- dodir "${destdir}"
- #copy files into dest dir
- cp -a "${S}/zen"/* "${ED}${destdir}" || die
- #create a symlink to the binary
- dosym "${destdir}/zen-bin" "/usr/bin/zen-bin" || die
- #add icons
- local icon_dir="${ED}${destdir}/browser/chrome/icons/default"
- if [[ -d "${icon_dir}" ]]; then
- for size in 16 32 48 64 128; do
- if [[ -f "${icon_dir}/default${size}.png" ]]; then
- newicon -s ${size} "${icon_dir}/default${size}.png" zen.png
- fi
- done
- else
- ewarn "Icon directory not found, skipping icon installation"
- fi
- #create desktop file
- make_desktop_entry zen-bin "Zen" zen "Network;WebBrowser"
- #handle permissions of destdir files
- fperms 0755 "${destdir}"/{zen-bin,updater,glxtest,vaapitest}
- fperms 0750 "${destdir}"/pingsender
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- elog "For optimal performance and compatibility, please ensure"
- elog "that you have the latest graphics drivers installed."
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/www-client/zen-bin/zen-bin-1.0.1_alpha19.ebuild b/www-client/zen-bin/zen-bin-1.0.2_beta2.ebuild
similarity index 97%
rename from www-client/zen-bin/zen-bin-1.0.1_alpha19.ebuild
rename to www-client/zen-bin/zen-bin-1.0.2_beta2.ebuild
index 64d22d5b9d..7b5ba3846d 100644
--- a/www-client/zen-bin/zen-bin-1.0.1_alpha19.ebuild
+++ b/www-client/zen-bin/zen-bin-1.0.2_beta2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
inherit xdg-utils desktop
-MY_PV="1.0.1-a.19"
+MY_PV="${PV/_beta/-b.}"
MY_P="zen"
DESCRIPTION="Zen Browser - A Firefox-based browser focused on privacy"
@@ -15,6 +15,7 @@ SRC_URI="https://github.com/zen-browser/desktop/releases/download/${MY_PV}/${MY_
S="${WORKDIR}"
LICENSE="MPL-2.0"
SLOT="0"
+KEYWORDS="~amd64"
RDEPEND="
dev-libs/expat