From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1532743-garchives=archives.gentoo.org@lists.gentoo.org>
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) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 6215D158009
for <garchives@archives.gentoo.org>; Tue, 27 Jun 2023 07:06:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id ABF02E0872;
Tue, 27 Jun 2023 07:06:37 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8C58BE0872
for <gentoo-commits@lists.gentoo.org>; Tue, 27 Jun 2023 07:06:37 +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 BC5B5340FC1
for <gentoo-commits@lists.gentoo.org>; Tue, 27 Jun 2023 07:06:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 54B71A76
for <gentoo-commits@lists.gentoo.org>; Tue, 27 Jun 2023 07:06:35 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1687849583.1f8274eda8c1723e48a5dcad429724ea01ec4862.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/cryfs/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
X-VCS-Directories: sys-fs/cryfs/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 1f8274eda8c1723e48a5dcad429724ea01ec4862
X-VCS-Branch: master
Date: Tue, 27 Jun 2023 07:06:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a20309e6-d9d0-4195-a5c7-46cd0a5db3bf
X-Archives-Hash: e46f60e0578eb7819e8b790a817810e6
commit: 1f8274eda8c1723e48a5dcad429724ea01ec4862
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 07:06:12 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 07:06:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f8274ed
sys-fs/cryfs: fix python-any-r1 usage
Closes: https://bugs.gentoo.org/908997
Closes: https://bugs.gentoo.org/880563
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
index 321634245e9e..6ec74214a5c7 100644
--- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit cmake flag-o-matic linux-info python-any-r1
if [[ ${PV} == 9999 ]] ; then
@@ -28,12 +28,18 @@ RDEPEND="
>=dev-libs/crypto++-8.2.0:=
net-misc/curl:=
>=sys-fs/fuse-2.8.6:0
- dev-libs/openssl:0=
+ dev-libs/openssl:=
"
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
test? ( dev-cpp/gtest )
"
-BDEPEND="${PYTHON_DEPS}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/versioneer[${PYTHON_USEDEP}]
+ ')
+"
PATCHES=(
# TODO upstream:
@@ -45,11 +51,16 @@ PATCHES=(
"${FILESDIR}/${PN}-0.10.3-fix-build-with-boost-1-77.patch"
)
+python_check_deps() {
+ python_has_version "dev-python/versioneer[${PYTHON_USEDEP}]"
+}
+
pkg_setup() {
local CONFIG_CHECK="~FUSE_FS"
local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
check_extra_config
+ python-any-r1_pkg_setup
}
src_prepare() {
@@ -58,6 +69,9 @@ src_prepare() {
# don't install compressed manpage
cmake_comment_add_subdirectory doc
+ # We use the package instead for >=py3.12 compat, bug #908997
+ rm src/gitversion/versioneer.py || die
+
# remove tests that require internet access to comply with Gentoo policy
sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
-i test/cpp-utils/CMakeLists.txt || die