diff options
| author |   Sam James <sam@gentoo.org> | 2023-06-27 08:06:12 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-06-27 08:06:23 +0100 |
| commit | 1f8274eda8c1723e48a5dcad429724ea01ec4862 (patch) | |
| tree | 6e1b7230e275ef2fd23b7cc3fccaae3f6d1504d1 /sys-fs/cryfs | |
| parent | sys-fs/fuse: drop 3.12.0, 3.13.1-r1, 3.14.0, 3.14.1 (diff) | |
| download | gentoo-1f8274eda8c1723e48a5dcad429724ea01ec4862.tar.gz gentoo-1f8274eda8c1723e48a5dcad429724ea01ec4862.tar.bz2 gentoo-1f8274eda8c1723e48a5dcad429724ea01ec4862.zip | |
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@gentoo.org>
Diffstat (limited to 'sys-fs/cryfs')
| -rw-r--r-- | sys-fs/cryfs/cryfs-0.10.3-r1.ebuild | 22 |
1 files 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 |