From 9bd7f6ac1b053cc6c7c9bcd63002a17adec34526 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 24 Feb 2022 16:53:30 +0100 Subject: [PATCH] volume_key: remove -python (Python 2) subpackage --- srcpkgs/removed-packages/template | 1 + srcpkgs/volume_key-python | 1 - srcpkgs/volume_key/template | 19 ++++--------------- 3 files changed, 5 insertions(+), 16 deletions(-) delete mode 120000 srcpkgs/volume_key-python diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index e0d40ede6b58..4e0a6b0df144 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -361,6 +361,7 @@ replaces=" uwsgi-python<=2.0.18_3 v8<=3.24.35.33_4 volnoti<=0.1_1 + volume_key-python<=0.3.12_5 vte-devel<=0.28.2_16 vte-python<=0.28.2_16 vte290-devel<=0.36.5_5 diff --git a/srcpkgs/volume_key-python b/srcpkgs/volume_key-python deleted file mode 120000 index 649832a366f3..000000000000 --- a/srcpkgs/volume_key-python +++ /dev/null @@ -1 +0,0 @@ -volume_key \ No newline at end of file diff --git a/srcpkgs/volume_key/template b/srcpkgs/volume_key/template index 7887040a1cd8..d96b08e1ae96 100644 --- a/srcpkgs/volume_key/template +++ b/srcpkgs/volume_key/template @@ -3,36 +3,25 @@ pkgname=volume_key version=0.3.12 revision=5 build_style=gnu-configure -make_build_args="PYTHON3_CFLAGS=-I${XBPS_CROSS_BASE}/${py3_inc} - PYTHON_CFLAGS=-I${XBPS_CROSS_BASE}/${py2_inc}" -hostmakedepends="pkg-config python3 python" -makedepends="cryptsetup-devel glib-devel gpgme-devel nss-devel python3-devel - python-devel" +configure_args="--without-python" +hostmakedepends="pkg-config python3" +makedepends="cryptsetup-devel glib-devel gpgme-devel nss-devel python3-devel" short_desc="Library for manipulating storage volume encryption keys" maintainer="Andrew Benson " license="GPL-2.0-or-later" homepage="https://pagure.io/volume_key" distfiles="https://releases.pagure.org/volume_key/volume_key-${version}.tar.xz" checksum=6ca3748fc1dad22c450bbf6601d4e706cb11c5e662d11bb4aeb473a9cd77309b +make_check=no # Error initializing NSS: security library: bad database. volume_key-python3_package() { lib32disabled=yes - pycompile_module="volume_key.py" short_desc+=" - Python3 bindings" pkg_install() { vmove "usr/lib/python3*" } } -volume_key-python_package() { - lib32disabled=yes - pycompile_module="volume_key.py" - short_desc+=" - Python bindings" - pkg_install() { - vmove "usr/lib/python2*" - } -} - volume_key-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}"