* [PR PATCH] volume_key: remove -python (Python 2) subpackage
@ 2022-02-28 19:11 paper42
2022-03-03 19:21 ` [PR PATCH] [Merged]: " paper42
0 siblings, 1 reply; 2+ messages in thread
From: paper42 @ 2022-02-28 19:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages volume_key-py3
https://github.com/void-linux/void-packages/pull/35894
volume_key: remove -python (Python 2) subpackage
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@abenson
A patch file from https://github.com/void-linux/void-packages/pull/35894.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-volume_key-py3-35894.patch --]
[-- Type: text/x-diff, Size: 2649 bytes --]
From 9bd7f6ac1b053cc6c7c9bcd63002a17adec34526 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <abenson@gmail.com>"
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}"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-03 19:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-28 19:11 [PR PATCH] volume_key: remove -python (Python 2) subpackage paper42
2022-03-03 19:21 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).