Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-admin/genromfs/Manifest2
-rw-r--r--app-admin/genromfs/genromfs-0.5.2.ebuild3
-rw-r--r--app-misc/i2bits/Manifest2
-rw-r--r--app-misc/i2bits/i2bits-0.1.0-r1.ebuild8
-rw-r--r--app-text/calibre/calibre-7.11.0.ebuild2
-rw-r--r--media-libs/aubio/aubio-0.4.9-r4.ebuild (renamed from media-libs/aubio/aubio-0.4.9-r3.ebuild)32
-rw-r--r--media-libs/aubio/files/aubio-0.4.9-gcc-14.patch37
-rw-r--r--media-libs/aubio/files/aubio-0.4.9-numpy-2.patch13
-rw-r--r--sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1-r1.ebuild (renamed from sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1.ebuild)1
-rw-r--r--sys-fs/btrfsmaintenance/files/btrfsmaintenance-0.5.1-script-fix.patch12
10 files changed, 95 insertions, 17 deletions
diff --git a/app-admin/genromfs/Manifest b/app-admin/genromfs/Manifest
index a3dba07aba4f..238354d2c851 100644
--- a/app-admin/genromfs/Manifest
+++ b/app-admin/genromfs/Manifest
@@ -1,2 +1,2 @@
-DIST genromfs-0.5.2.tar.gz 21069 BLAKE2B 350ebf11b8ef068053217b75ac995af1199e4c4c11823df584e8169c260dbd851d4f44ba6d23ac1f5f4cd9c2ca7ae7fd268d02ba19529da90003a697efc3e06a SHA512 7fa2f362e4a61ab38f5262fc5a716119312d3029f93cf0a514313c5a3c956d687d777a826da2f4ad95edaf5eab014464635b0afbaaa11f9b495efb6f03fbec2f
+DIST genromfs-0.5.2.gh.tar.gz 21122 BLAKE2B 64e1a650ef52b7931036bb6e1585a01ef0cb9c687c91a882c25e20f21a5d4ddb2178319890ee906b25a6c3f6f09174eaec89a73cacda8077f048a957a23d101c SHA512 e0b1313f66088f145ffd894e6fa4def8ca99ef7475931457b3fa1242aed7eff6d001bb15f9ce75a3da8122bd2f99d20859d7f88fbb303764f6c20e24ce5a0e71
DIST genromfs-0.5.7.gh.tar.gz 27929 BLAKE2B df556a3f4247ad12b441b245046177e56aca1460e92614528ced0c8f7b4df45ed3023d325d5140cc5e13a6f3187d4ee9143c33a9d25830c27a8d6c6b98ba741f SHA512 a37bbea5f7952194a417359f0a5d13f86d8ed3f75459281e4bd06a96a05840e5580a6d706342ddbd6e064e885b7991e636c7d638bf95e372a51abfcec7eb3c58
diff --git a/app-admin/genromfs/genromfs-0.5.2.ebuild b/app-admin/genromfs/genromfs-0.5.2.ebuild
index 6023db2f8d43..112795eb371c 100644
--- a/app-admin/genromfs/genromfs-0.5.2.ebuild
+++ b/app-admin/genromfs/genromfs-0.5.2.ebuild
@@ -7,7 +7,8 @@ inherit toolchain-funcs
DESCRIPTION="Create space-efficient, small, read-only romfs filesystems"
HOMEPAGE="https://romfs.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/chexum/${PN}/archive/refs/tags/${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/app-misc/i2bits/Manifest b/app-misc/i2bits/Manifest
index 4dbd61bbd846..f690e95c7e42 100644
--- a/app-misc/i2bits/Manifest
+++ b/app-misc/i2bits/Manifest
@@ -1 +1 @@
-DIST i2bits-0.1.0.tar.gz 2649 BLAKE2B 050e7eddadc4e8b4e1da50128b735adbe6fbace35a06709fd2f31db3e8ffb672b3d51eced0ecb9c87c3566d32c9aac7a431c641e53597ee55ae431328dfbee48 SHA512 9f7b2fe8ca66740cae081c3f74f0c5d67d956c8cd2b5f39cb7306e58a8f75d6d5848dd640e7e514638dda6f3d1efe5f292605dc4fddffe5e530bbd5f173a1db9
+DIST i2bits-0.1.0-bb.tar.gz 3007 BLAKE2B 51f866c7d91a1aedf88f0e30bb4847fe659b6abbaea1972a11d4d91cdb053a2b2add2fbe81a9eb9e1246e2373a332ed012ea80cd247548dc34106075d0a53d25 SHA512 ccd5518e05c13727a1698177d485d26ac2f7adc8e49350a9395df28cb5431b74ddf4603ef242ad5f7703e8184346871b70fc03afc506a8d65df9db010c1cb7b4
diff --git a/app-misc/i2bits/i2bits-0.1.0-r1.ebuild b/app-misc/i2bits/i2bits-0.1.0-r1.ebuild
index 2e699e116f58..174e9897fc84 100644
--- a/app-misc/i2bits/i2bits-0.1.0-r1.ebuild
+++ b/app-misc/i2bits/i2bits-0.1.0-r1.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit cmake toolchain-funcs
+inherit cmake
+COMMIT="4c613505b2cb"
DESCRIPTION="Utility to convert hex or dec to binary format"
HOMEPAGE="https://bitbucket.org/PascalRD/i2bits/"
-SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
+SRC_URI="https://bitbucket.org/PascalRD/i2bits/get/${COMMIT}.tar.gz -> ${P}-bb.tar.gz"
+S="${WORKDIR}/PascalRD-${PN}-${COMMIT}"
LICENSE="WTFPL-2"
SLOT="0"
diff --git a/app-text/calibre/calibre-7.11.0.ebuild b/app-text/calibre/calibre-7.11.0.ebuild
index 8bbc8f3c7a6f..176a40d67c9a 100644
--- a/app-text/calibre/calibre-7.11.0.ebuild
+++ b/app-text/calibre/calibre-7.11.0.ebuild
@@ -35,7 +35,7 @@ LICENSE="
OFL-1.1
PSF-2
"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
SLOT="0"
IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
diff --git a/media-libs/aubio/aubio-0.4.9-r3.ebuild b/media-libs/aubio/aubio-0.4.9-r4.ebuild
index 4a910ed12d2e..0c8533c51c66 100644
--- a/media-libs/aubio/aubio-0.4.9-r3.ebuild
+++ b/media-libs/aubio/aubio-0.4.9-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_EXT=1
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
PYTHON_REQ_USE='threads(+)'
inherit distutils-r1 waf-utils
@@ -22,7 +22,7 @@ SRC_URI="
LICENSE="GPL-3"
SLOT="0/5"
KEYWORDS="~amd64 ~loong ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
+IUSE="blas doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( double-precision libsamplerate )
@@ -32,6 +32,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
RESTRICT="!test? ( test )"
RDEPEND="
+ blas? ( virtual/cblas )
ffmpeg? ( >=media-video/ffmpeg-2.6:0= )
fftw? ( sci-libs/fftw:3.0= )
jack? ( virtual/jack )
@@ -47,10 +48,8 @@ DEPEND="${RDEPEND}
${PYTHON_DEPS}
app-text/txt2man
virtual/pkgconfig
- doc? (
- app-text/doxygen
- dev-python/sphinx[${PYTHON_USEDEP}]
- )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
"
BDEPEND="${DISTUTILS_DEPS}"
@@ -59,13 +58,23 @@ PYTHON_SRC_DIR="${S}"
PATCHES=(
"${FILESDIR}"/${P}-docdir.patch
+ "${FILESDIR}"/${P}-gcc-14.patch
+ "${FILESDIR}"/${P}-numpy-2.patch
"${FILESDIR}"/ffmpeg5.patch
)
src_prepare() {
default
- sed -e "s:doxygen:doxygen_disabled:" -i wscript || die
+ # In case when aubio is already installed, calling of the
+ # `sphinx` function at the wscript causes a python interpreter
+ # crash on `import aubio` if aubio was built with <numpy-2,
+ # but current version of numpy is >=2.
+ # Additionally, it causes duplication of the documentation.
+ sed \
+ -e '/\(doxygen\|sphinx\)(bld)$/d' \
+ -e "s/package = 'blas'/package = 'cblas'/" \
+ -i wscript || die
sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
@@ -77,7 +86,9 @@ src_prepare() {
fi
# update waf to fix Python 3.12 compatibility
+ python_setup
sed -r \
+ -e "s:python:${PYTHON}:" \
-e "s:(WAFVERSION=).*:\1${WAFVERSION}:" \
-e "s:(WAFURL=).*:\1'${DISTDIR}/${WAFTARBALL}':" \
-e 's:^fetchwaf$:cp "${WAFURL}" "${WAFTARBALL}":' \
@@ -91,6 +102,7 @@ src_configure() {
local mywafconfargs=(
--enable-complex
--docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable blas)
$(use_enable doc docs)
$(use_enable double-precision double)
$(use_enable fftw fftw3)
@@ -122,8 +134,8 @@ src_compile() {
pushd "${S}"/doc &>/dev/null || die
python_setup
LD_LIBRARY_PATH="${S}/build/src:${LD_LIBRARY_PATH}" \
- PYTHONPATH="${S%%/}-${EPYTHON/./_}/lib${PYTHONPATH:+:${PYTHONPATH}}" \
- emake dirhtml
+ PYTHONPATH="${S%%/}-${EPYTHON/./_}/install/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}" \
+ emake html
fi
cd "${S}" || die
@@ -160,7 +172,7 @@ src_install() {
if use doc; then
dodoc doc/*.txt
docinto html
- dodoc -r doc/_build/dirhtml/.
+ dodoc -r doc/_build/html/.
fi
find "${ED}" -name "*.a" -delete || die
diff --git a/media-libs/aubio/files/aubio-0.4.9-gcc-14.patch b/media-libs/aubio/files/aubio-0.4.9-gcc-14.patch
new file mode 100644
index 000000000000..658ca9e2ffcf
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.9-gcc-14.patch
@@ -0,0 +1,37 @@
+# https://bugs.gentoo.org/925102
+# https://github.com/aubio/aubio/commit/95ff046c
+
+From: Paul Brossier <piem@piem.org>
+Date: Thu, 2 Jul 2020 11:16:13 +0200
+Subject: [PATCH] [py] add const qualifiers to ufuncs prototypes for latest numpy
+
+---
+ python/ext/ufuncs.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/python/ext/ufuncs.c b/python/ext/ufuncs.c
+index d373d7258..e5641342e 100644
+--- a/python/ext/ufuncs.c
++++ b/python/ext/ufuncs.c
+@@ -3,8 +3,8 @@
+
+ typedef smpl_t (*aubio_unary_func_t)(smpl_t input);
+
+-static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions,
+- npy_intp* steps, void* data)
++static void aubio_PyUFunc_d_d(char **args, const npy_intp *dimensions,
++ const npy_intp* steps, void* data)
+ {
+ npy_intp i;
+ npy_intp n = dimensions[0];
+@@ -22,8 +22,8 @@ static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions,
+ }
+ }
+
+-static void aubio_PyUFunc_f_f_As_d_d(char **args, npy_intp *dimensions,
+- npy_intp* steps, void* data)
++static void aubio_PyUFunc_f_f_As_d_d(char **args, const npy_intp *dimensions,
++ const npy_intp* steps, void* data)
+ {
+ npy_intp i;
+ npy_intp n = dimensions[0];
diff --git a/media-libs/aubio/files/aubio-0.4.9-numpy-2.patch b/media-libs/aubio/files/aubio-0.4.9-numpy-2.patch
new file mode 100644
index 000000000000..be51e88fc6a4
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.9-numpy-2.patch
@@ -0,0 +1,13 @@
+diff --git a/python/tests/test_cvec.py b/python/tests/test_cvec.py
+index 73ee6549..e21418fc 100755
+--- a/python/tests/test_cvec.py
++++ b/python/tests/test_cvec.py
+@@ -43,7 +43,7 @@ class aubio_cvec_test_case(TestCase):
+ spec = cvec(1024)
+ spec.phas[39:-1] = -np.pi
+ assert_equal(spec.phas[0:39], 0)
+- assert_equal(spec.phas[39:-1], -np.pi)
++ assert_equal(spec.phas[39:-1], np.asanyarray(-np.pi, spec.phas.dtype))
+ assert_equal(spec.norm, 0)
+
+ def test_assign_cvec_with_other_cvec(self):
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1-r1.ebuild
index 82b7ba58cf41..e26232645159 100644
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1.ebuild
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.1-r1.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
systemd? ( sys-apps/systemd )
!systemd? ( virtual/cron )
"
+PATCHES=( "${FILESDIR}/${P}-script-fix.patch" )
src_prepare() {
# Fix config path into watching service
diff --git a/sys-fs/btrfsmaintenance/files/btrfsmaintenance-0.5.1-script-fix.patch b/sys-fs/btrfsmaintenance/files/btrfsmaintenance-0.5.1-script-fix.patch
new file mode 100644
index 000000000000..f546a417feb3
--- /dev/null
+++ b/sys-fs/btrfsmaintenance/files/btrfsmaintenance-0.5.1-script-fix.patch
@@ -0,0 +1,12 @@
+https://github.com/kdave/btrfsmaintenance/pull/119
+--- a/btrfsmaintenance-functions
++++ b/btrfsmaintenance-functions
+@@ -101,7 +101,7 @@
+ else
+ # Flock older than 2.27 does not support --verbose option, check
+ # if it's available as we'd like to log the information
+- if /usr/bin/flock --help 2>&1 | grep -q -- --verbose;
++ if /usr/bin/flock --help 2>&1 | grep -q -- --verbose; then
+ verbose="--verbose"
+ fi
+