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 C2E2115808B for ; Mon, 28 Mar 2022 08:55:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDEA2E092B; Mon, 28 Mar 2022 08:55:05 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CD030E092B for ; Mon, 28 Mar 2022 08:55:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 71EF533BEE9 for ; Mon, 28 Mar 2022 08:55:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADA2A287 for ; Mon, 28 Mar 2022 08:55:01 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1648457697.73d7896e2f6ce064b2d20f603484d2b06eab51a1.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-python/reportlab/files/, dev-python/reportlab/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/reportlab/files/reportlab-3.6.9-paths.patch dev-python/reportlab/reportlab-3.6.9.ebuild profiles/package.mask X-VCS-Directories: dev-python/reportlab/files/ dev-python/reportlab/ profiles/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 73d7896e2f6ce064b2d20f603484d2b06eab51a1 X-VCS-Branch: master Date: Mon, 28 Mar 2022 08:55:01 +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: c203bbe3-de42-4d4f-8e96-a61b812b152f X-Archives-Hash: 5a752a3679ae1fa80b4478685d3a5c08 commit: 73d7896e2f6ce064b2d20f603484d2b06eab51a1 Author: Michał Górny gentoo org> AuthorDate: Mon Mar 28 08:53:58 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Mar 28 08:54:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d7896e dev-python/reportlab: Disable broken freetype2 finding logic Closes: https://bugs.gentoo.org/836301 Signed-off-by: Michał Górny gentoo.org> .../reportlab/files/reportlab-3.6.9-paths.patch | 21 +++++++++++++++++++++ dev-python/reportlab/reportlab-3.6.9.ebuild | 4 ++++ profiles/package.mask | 7 ------- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dev-python/reportlab/files/reportlab-3.6.9-paths.patch b/dev-python/reportlab/files/reportlab-3.6.9-paths.patch new file mode 100644 index 000000000000..e5ed7c43478d --- /dev/null +++ b/dev-python/reportlab/files/reportlab-3.6.9-paths.patch @@ -0,0 +1,21 @@ +Disable broken logic for finding freetype2 that hits symlink loops. + +diff -dupr reportlab-3.6.9.orig/setup.py reportlab-3.6.9/setup.py +--- reportlab-3.6.9.orig/setup.py 2022-03-28 10:13:33.892516135 +0200 ++++ reportlab-3.6.9/setup.py 2022-03-28 10:49:11.048573739 +0200 +@@ -737,13 +737,10 @@ def main(): + else: + FT_LIB=FT_LIB_DIR=FT_INC_DIR=FT_MACROS=[] + else: +- ftv, I, L = inc_lib_dirs('freetype') + FT_LIB=['freetype'] +- FT_LIB_DIR=L +- FT_INC_DIR=I ++ FT_LIB_DIR=[] ++ FT_INC_DIR=['/usr/include/freetype2'] + FT_MACROS = [('RENDERPM_FT',None)] +- infoline('installing with freetype version %s' % ftv) +- infoline('FT_LIB_DIR=%r FT_INC_DIR=%r' % (FT_LIB_DIR,FT_INC_DIR)) + if not FT_LIB: + infoline('# installing without freetype no ttf, sorry!') + infoline('# You need to install a static library version of the freetype2 software') diff --git a/dev-python/reportlab/reportlab-3.6.9.ebuild b/dev-python/reportlab/reportlab-3.6.9.ebuild index 8381872bec16..a78215c6e3bf 100644 --- a/dev-python/reportlab/reportlab-3.6.9.ebuild +++ b/dev-python/reportlab/reportlab-3.6.9.ebuild @@ -33,6 +33,10 @@ BDEPEND=" app-arch/unzip " +PATCHES=( + "${FILESDIR}"/reportlab-3.6.9-paths.patch +) + distutils_enable_sphinx docs/source src_unpack() { diff --git a/profiles/package.mask b/profiles/package.mask index c8c8023fb8e8..ca933b566b3f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,13 +33,6 @@ #--- END OF EXAMPLES --- -# Sam James (2022-03-28) -# Hangs in src_compile when net-libs/nodejs is installed -# Masked pending either a workaround in reportlab or -# adaptations to nodejs. -# bug #836301 -=dev-python/reportlab-3.6.9 - # Matt Turner (2022-03-27) # Dead package. No reverse dependencies. # Removal on 2022-04-27