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 E923B158043 for ; Tue, 12 Mar 2024 00:52:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2D7C2BC013; Tue, 12 Mar 2024 00:52:41 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1FDE2BC013 for ; Tue, 12 Mar 2024 00:52:41 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3329341214 for ; Tue, 12 Mar 2024 00:52:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B283FCB for ; Tue, 12 Mar 2024 00:52:38 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1710204742.8f3867c8f2e4b1f7dcaa0c2e19812b3133bed141.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/inkscape/inkscape-1.3.2-r1.ebuild media-gfx/inkscape/inkscape-9999.ebuild X-VCS-Directories: media-gfx/inkscape/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8f3867c8f2e4b1f7dcaa0c2e19812b3133bed141 X-VCS-Branch: master Date: Tue, 12 Mar 2024 00:52:38 +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: cb0ad4da-31fc-4886-b8b8-e4713315a157 X-Archives-Hash: 5db7cb79dfc03d6fcb77d5b8698147b1 commit: 8f3867c8f2e4b1f7dcaa0c2e19812b3133bed141 Author: Sam James gentoo org> AuthorDate: Tue Mar 12 00:49:40 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 12 00:52:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f3867c8 media-gfx/inkscape: fix Python dependencies & shebangs * Fix Python dependency (needs pillow for jpeg/tiff/webp at least) * Fix shebangs on Python extensions so we respect PYTHON_SINGLE_TARGET Closes: https://bugs.gentoo.org/924747 Closes: https://bugs.gentoo.org/922320 Signed-off-by: Sam James gentoo.org> .../{inkscape-9999.ebuild => inkscape-1.3.2-r1.ebuild} | 11 ++++++++--- media-gfx/inkscape/inkscape-9999.ebuild | 5 ++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild similarity index 95% copy from media-gfx/inkscape/inkscape-9999.ebuild copy to media-gfx/inkscape/inkscape-1.3.2-r1.ebuild index e15278a2cad5..28800fc56156 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-1.3.2-r1.ebuild @@ -65,6 +65,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-python/cssselect[${PYTHON_USEDEP}] dev-python/lockfile[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pillow[jpeg,tiff,webp,${PYTHON_USEDEP}] media-gfx/scour[${PYTHON_USEDEP}] ') cdr? ( @@ -106,6 +107,11 @@ DEPEND="${COMMON_DEPEND} test? ( dev-cpp/gtest ) " +PATCHES=( + "${FILESDIR}"/${P}-libxml2-2.12.patch + "${FILESDIR}"/${P}-poppler-24.03.patch +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -141,6 +147,7 @@ src_configure() { -DENABLE_POPPLER=ON -DENABLE_POPPLER_CAIRO=ON -DWITH_PROFILING=OFF + -DWITH_INTERNAL_CAIRO=OFF -DWITH_INTERNAL_2GEOM=ON -DBUILD_TESTING=$(usex test) -DWITH_LIBCDR=$(usex cdr) @@ -187,14 +194,12 @@ src_install() { cmake_src_install find "${ED}" -type f -name "*.la" -delete || die - find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die - find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die local extdir="${ED}"/usr/share/${PN}/extensions - if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then + python_fix_shebang "${ED}"/usr/share/${PN}/extensions python_optimize "${ED}"/usr/share/${PN}/extensions fi diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index e15278a2cad5..ae2fa0eac0ff 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -65,6 +65,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-python/cssselect[${PYTHON_USEDEP}] dev-python/lockfile[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pillow[jpeg,tiff,webp,${PYTHON_USEDEP}] media-gfx/scour[${PYTHON_USEDEP}] ') cdr? ( @@ -187,14 +188,12 @@ src_install() { cmake_src_install find "${ED}" -type f -name "*.la" -delete || die - find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die - find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die local extdir="${ED}"/usr/share/${PN}/extensions - if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then + python_fix_shebang "${ED}"/usr/share/${PN}/extensions python_optimize "${ED}"/usr/share/${PN}/extensions fi