From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8AECC158030 for ; Mon, 27 Feb 2023 00:32:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4019BE0827; Mon, 27 Feb 2023 00:32:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F3C4E0843 for ; Mon, 27 Feb 2023 00:32:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8A20A340E73 for ; Mon, 27 Feb 2023 00:31:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C20778CD for ; Mon, 27 Feb 2023 00:31:56 +0000 (UTC) From: "Anna Vyalkova" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anna Vyalkova" Message-ID: <1677457746.7261cceb706a70adc39dddc65cb218035d0f8e71.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-python/uharfbuzz/, dev-python/uharfbuzz/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-python/uharfbuzz/Manifest dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch dev-python/uharfbuzz/uharfbuzz-0.33.0-r1.ebuild dev-python/uharfbuzz/uharfbuzz-0.33.0.ebuild X-VCS-Directories: dev-python/uharfbuzz/files/ dev-python/uharfbuzz/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: 7261cceb706a70adc39dddc65cb218035d0f8e71 X-VCS-Branch: dev Date: Mon, 27 Feb 2023 00:31:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 369c06c4-49eb-4028-986d-0761998b4523 X-Archives-Hash: e06a1fdaf39bcfeebb69f6c5e11aab15 commit: 7261cceb706a70adc39dddc65cb218035d0f8e71 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Mon Feb 27 00:29:06 2023 +0000 Commit: Anna Vyalkova sysrq in> CommitDate: Mon Feb 27 00:29:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7261cceb dev-python/uharfbuzz: cleanups Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> dev-python/uharfbuzz/Manifest | 2 +- .../files/uharfbuzz-0.23.0-system-harfbuzz.patch | 34 ---------------------- ...zz-0.33.0.ebuild => uharfbuzz-0.33.0-r1.ebuild} | 24 +++++++-------- 3 files changed, 13 insertions(+), 47 deletions(-) diff --git a/dev-python/uharfbuzz/Manifest b/dev-python/uharfbuzz/Manifest index cec68ddd5..b68ec9b56 100644 --- a/dev-python/uharfbuzz/Manifest +++ b/dev-python/uharfbuzz/Manifest @@ -1 +1 @@ -DIST uharfbuzz-0.33.0.gh.tar.gz 38023 BLAKE2B 5cf2d8afc8174d5fb679a38fb4147ea15d753a4b2f745c194d6f75868f878a6ae22a0a3bb77b823eeafcdcda325f89ac69539767e2bc1217b88d594c561ea385 SHA512 dc1afdfd39750284544aa8bc244c36a4b60a99423d11d568759ac908fcc34eeb39e97089eba00524bc9dbe1604aab8c35bd40b98f7913016ad022832266e7145 +DIST uharfbuzz-0.33.0.zip 1364513 BLAKE2B 668a9b7083d1a75c6845b2177b876447a25e28b15bc14e52518f1bf158ca4e23f01a0d42eb1aea02dce65c64496101ea00c8fd4d68e5ba7c1d149d920ba6624a SHA512 923ade6a4cefca9d1cfdee19fbf7b769480072695da67a1b6b75738172dad1c3236ff7d2263eeaeb6f08c235ff6efd952f095c63957549c589fafde31ca604eb diff --git a/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch b/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch deleted file mode 100644 index 8ff591bb1..000000000 --- a/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -13,7 +13,7 @@ - with open(os.path.join(here, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - --define_macros = [('HB_NO_MT', '1'), ('HB_EXPERIMENTAL_API', '1')] -+define_macros = [('HB_EXPERIMENTAL_API', '1')] - linetrace = False - if int(os.environ.get('CYTHON_LINETRACE', '0')): - linetrace = True -@@ -21,7 +21,7 @@ - - extra_compile_args = [] - extra_link_args = [] --libraries = [] -+libraries = ['harfbuzz', 'harfbuzz-subset'] - if platform.system() != 'Windows': - extra_compile_args.append('-std=c++11') - define_macros.append(('HAVE_MMAP', '1')) -@@ -39,11 +39,9 @@ - extension = Extension( - 'uharfbuzz._harfbuzz', - define_macros=define_macros, -- include_dirs=['harfbuzz/src'], -+ include_dirs=['/usr/include/harfbuzz'], - sources=[ -- 'src/uharfbuzz/_harfbuzz.pyx', -- 'harfbuzz/src/harfbuzz.cc', -- 'harfbuzz/src/hb-subset-repacker.cc', -+ 'src/uharfbuzz/_harfbuzz.pyx' - ], - language='c++', - libraries=libraries, diff --git a/dev-python/uharfbuzz/uharfbuzz-0.33.0.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.33.0-r1.ebuild similarity index 53% rename from dev-python/uharfbuzz/uharfbuzz-0.33.0.ebuild rename to dev-python/uharfbuzz/uharfbuzz-0.33.0-r1.ebuild index 2ea5af628..391950497 100644 --- a/dev-python/uharfbuzz/uharfbuzz-0.33.0.ebuild +++ b/dev-python/uharfbuzz/uharfbuzz-0.33.0-r1.ebuild @@ -3,33 +3,33 @@ EAPI=8 +PYTHON_COMPAT=( python3_{9..11} pypy3 ) DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} pypy3 ) - -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Streamlined Cython bindings for the HarfBuzz shaping engine" -HOMEPAGE="https://github.com/harfbuzz/uharfbuzz" -SRC_URI="https://github.com/harfbuzz/uharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" +HOMEPAGE=" + https://pypi.org/project/uharfbuzz/ + https://github.com/harfbuzz/uharfbuzz +" +SRC_URI="$(pypi_sdist_url ${PN} ${PV} .zip)" KEYWORDS="~amd64" LICENSE="Apache-2.0" SLOT="0" -RDEPEND=">=media-libs/harfbuzz-4.3.0[experimental(-)]" -DEPEND=" - ${RDEPEND} +RDEPEND=">=media-libs/harfbuzz-4.3.0:=[experimental(-)]" +BDEPEND=" + app-arch/unzip >=dev-python/cython-0.28.1[${PYTHON_USEDEP}] >=dev-python/setuptools_scm-2.1[${PYTHON_USEDEP}] - >=dev-python/wheel-0.31[${PYTHON_USEDEP}] " PATCHES=( "${FILESDIR}/${PN}-0.33.0-system-harfbuzz.patch" ) distutils_enable_tests pytest -python_prepare_all() { - distutils-r1_python_prepare_all - export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}" +src_configure() { + export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} export USE_SYSTEM_HARFBUZZ=1 }