From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 90FFB1580EB for ; Fri, 30 May 2025 10:00:36 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 7BCB63430DD for ; Fri, 30 May 2025 10:00:36 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 033C6110497; Fri, 30 May 2025 10:00:32 +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 bobolink.gentoo.org (Postfix) with ESMTPS id ECDBA110480 for ; Fri, 30 May 2025 10:00:31 +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 9D0683430CA for ; Fri, 30 May 2025 10:00:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 14BC628E3 for ; Fri, 30 May 2025 10:00:30 +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: <1748599175.44e526b911f1eec081c5f80e5848929d87485132.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/conan/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/conan/conan-2.14.0-r1.ebuild dev-util/conan/conan-2.17.0.ebuild X-VCS-Directories: dev-util/conan/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 44e526b911f1eec081c5f80e5848929d87485132 X-VCS-Branch: master Date: Fri, 30 May 2025 10:00:30 +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: df9c5726-3d55-4e0c-bff0-ce902a145c5e X-Archives-Hash: 0b15080a4c2778f737d2cb9d9f4a1632 commit: 44e526b911f1eec081c5f80e5848929d87485132 Author: Azamat H. Hackimov gmail com> AuthorDate: Fri May 30 08:39:56 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 30 09:59:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e526b9 dev-util/conan: fix broken METADATA Rewrite sed restriction commands to exclude non-digit qualifiers. Closes: https://bugs.gentoo.org/956751 Signed-off-by: Azamat H. Hackimov gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42343 Signed-off-by: Sam James gentoo.org> dev-util/conan/{conan-2.17.0.ebuild => conan-2.14.0-r1.ebuild} | 4 ++-- dev-util/conan/conan-2.17.0.ebuild | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-util/conan/conan-2.17.0.ebuild b/dev-util/conan/conan-2.14.0-r1.ebuild similarity index 93% copy from dev-util/conan/conan-2.17.0.ebuild copy to dev-util/conan/conan-2.14.0-r1.ebuild index 0fab5783be09..47ae53d5c316 100644 --- a/dev-util/conan/conan-2.17.0.ebuild +++ b/dev-util/conan/conan-2.14.0-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.g LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" RDEPEND=" >=dev-python/bottle-0.12.8[${PYTHON_USEDEP}] @@ -42,6 +42,6 @@ src_prepare() { # Fix strict dependencies sed -i \ -e 's:,[[:space:]]\?<=\?[[:space:]]\?[[:digit:]|.]*::g' \ - -e 's:==:>=:g' \ + -e 's:==\([[:space:]]\?[[:digit:]]\):>=\1:g' \ conans/requirements{,_server}.txt || die } diff --git a/dev-util/conan/conan-2.17.0.ebuild b/dev-util/conan/conan-2.17.0.ebuild index 0fab5783be09..42bc1eb38789 100644 --- a/dev-util/conan/conan-2.17.0.ebuild +++ b/dev-util/conan/conan-2.17.0.ebuild @@ -42,6 +42,6 @@ src_prepare() { # Fix strict dependencies sed -i \ -e 's:,[[:space:]]\?<=\?[[:space:]]\?[[:digit:]|.]*::g' \ - -e 's:==:>=:g' \ + -e 's:==\([[:space:]]\?[[:digit:]]\):>=\1:g' \ conans/requirements{,_server}.txt || die }