[gentoo-commits] repo/proj/guru:master commit in: dev-libs/fastText/files/, dev-libs/fastText/
commit: 1253f6c22e4c3d1fd197f1426e11e3264ba388de Author: Takuya Wakazono gmail com> AuthorDate: Wed Jan 24 14:03:12 2024 + Commit: David Roman gmail com> CommitDate: Wed Jan 24 14:03:12 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1253f6c2 dev-libs/fastText: add patches for gcc13 and pep517 Closes: https://bugs.gentoo.org/905908 Signed-off-by: Takuya Wakazono gmail.com> dev-libs/fastText/fastText-0.9.2.ebuild | 11 --- dev-libs/fastText/files/fastText-0.9.2-gcc13.patch | 13 + dev-libs/fastText/files/fastText-0.9.2-pep517.patch | 9 + 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dev-libs/fastText/fastText-0.9.2.ebuild b/dev-libs/fastText/fastText-0.9.2.ebuild index ffdf9b3ddf..a55761421e 100644 --- a/dev-libs/fastText/fastText-0.9.2.ebuild +++ b/dev-libs/fastText/fastText-0.9.2.ebuild @@ -1,11 +1,12 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools inherit cmake distutils-r1 edo DESCRIPTION="Library for fast text representation and classification" @@ -30,6 +31,10 @@ BDEPEND=" " DOCS=( {CODE_OF_CONDUCT,CONTRIBUTING,README}.md python/{README.rst,doc} docs ) +PATCHES=( + "${FILESDIR}/${P}-gcc13.patch" + "${FILESDIR}/${P}-pep517.patch" +) src_prepare() { cmake_src_prepare diff --git a/dev-libs/fastText/files/fastText-0.9.2-gcc13.patch b/dev-libs/fastText/files/fastText-0.9.2-gcc13.patch new file mode 100644 index 00..ba00466f34 --- /dev/null +++ b/dev-libs/fastText/files/fastText-0.9.2-gcc13.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/905908 +https://github.com/facebookresearch/fastText/commit/6c2204ba66776b700095ff73e3e599a908ffd9c3 + +--- a/src/args.cc b/src/args.cc +@@ -9,6 +9,7 @@ + #include "args.h" + + #include ++#include + + #include + #include diff --git a/dev-libs/fastText/files/fastText-0.9.2-pep517.patch b/dev-libs/fastText/files/fastText-0.9.2-pep517.patch new file mode 100644 index 00..aff5ddbfc7 --- /dev/null +++ b/dev-libs/fastText/files/fastText-0.9.2-pep517.patch @@ -0,0 +1,9 @@ +Fix SetuptoolsDeprecationWarning: Invalid dash-separated options +https://github.com/facebookresearch/fastText/pull/1316 + +--- a/setup.cfg b/setup.cfg +@@ -1,2 +1,2 @@ + [metadata] +-description-file = README.md ++description_file = README.md
[gentoo-commits] repo/proj/guru:master commit in: dev-libs/fastText/
commit: 6f21a78e055689b9df0e0d389ccb04e15fe436e9 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Oct 30 11:11:28 2022 + Commit: Ronny Gutbrod tastytea de> CommitDate: Sun Oct 30 11:35:56 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6f21a78e dev-libs/fastText: enable py3.11 Closes: https://bugs.gentoo.org/859733 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> dev-libs/fastText/Manifest | 2 +- dev-libs/fastText/fastText-0.9.2.ebuild | 16 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dev-libs/fastText/Manifest b/dev-libs/fastText/Manifest index c45a8082f..a6779ea09 100644 --- a/dev-libs/fastText/Manifest +++ b/dev-libs/fastText/Manifest @@ -1 +1 @@ -DIST fastText-0.9.2.tar.gz 4036722 BLAKE2B ea3af92ce18d04241128cfb28773f0785a006e79c861d718c2c6ad788d776ad60b0543a42eb8be5a865cbc12283355521431fe2fba48544399e4a2b1520ff3f1 SHA512 8f0f6e78b3c6b3c7e7d107778952f340cc208b8e0b920dd118a57884cca8ef7007ea88b6f3352cb7e08289a64743f507309e1e1259c785f810af7f5fa09f2656 +DIST fastText-0.9.2.gh.tar.gz 4036722 BLAKE2B ea3af92ce18d04241128cfb28773f0785a006e79c861d718c2c6ad788d776ad60b0543a42eb8be5a865cbc12283355521431fe2fba48544399e4a2b1520ff3f1 SHA512 8f0f6e78b3c6b3c7e7d107778952f340cc208b8e0b920dd118a57884cca8ef7007ea88b6f3352cb7e08289a64743f507309e1e1259c785f810af7f5fa09f2656 diff --git a/dev-libs/fastText/fastText-0.9.2.ebuild b/dev-libs/fastText/fastText-0.9.2.ebuild index 31129522f..27a81602f 100644 --- a/dev-libs/fastText/fastText-0.9.2.ebuild +++ b/dev-libs/fastText/fastText-0.9.2.ebuild @@ -3,13 +3,14 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) +DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -inherit cmake distutils-r1 +inherit cmake distutils-r1 edo DESCRIPTION="Library for fast text representation and classification" HOMEPAGE="https://fasttext.cc https://github.com/facebookresearch/fastText; -SRC_URI="https://github.com/facebookresearch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/facebookresearch/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="MIT" SLOT="0" @@ -24,6 +25,9 @@ RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] ) " +BDEPEND=" + python? ( ${DISTUTILS_DEPS} ) +" DOCS=( {CODE_OF_CONDUCT,CONTRIBUTING,README}.md python/{README.rst,doc} docs ) @@ -39,6 +43,10 @@ src_prepare() { } src_configure() { + local mycmakeargs=( + -DPROJECT_VERSION=${PV} + ) + cmake_src_configure use python && distutils-r1_src_configure } @@ -53,7 +61,7 @@ src_test() { } python_test() { - ${EPYTHON} runtests.py -u || die + edo ${EPYTHON} runtests.py -u } src_install() {