| 1 |
commit: 0828d17d30acd44d5843198fa4b5a935a2c6d897 |
| 2 |
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue May 3 18:33:31 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 3 18:41:17 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0828d17d |
| 7 |
|
| 8 |
app-emulation/xen-tools: replace dev-python/pypam with sys-libs/pam |
| 9 |
|
| 10 |
It was discovered that pypam is no longer needed for xen-tools. Upstream |
| 11 |
is dead anyway. |
| 12 |
|
| 13 |
Qemu-xen checks for pam, so we add a dep on sys-libs/pam for USE=qemu. |
| 14 |
|
| 15 |
Bug: https://bugs.gentoo.org/833297 |
| 16 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/25302 |
| 18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 19 |
|
| 20 |
app-emulation/xen-tools/xen-tools-4.15.2-r1.ebuild | 5 ++--- |
| 21 |
app-emulation/xen-tools/xen-tools-4.16.0-r3.ebuild | 11 ++++++----- |
| 22 |
2 files changed, 8 insertions(+), 8 deletions(-) |
| 23 |
|
| 24 |
diff --git a/app-emulation/xen-tools/xen-tools-4.15.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.15.2-r1.ebuild |
| 25 |
index 2f6e74c4eca4..2314461098b0 100644 |
| 26 |
--- a/app-emulation/xen-tools/xen-tools-4.15.2-r1.ebuild |
| 27 |
+++ b/app-emulation/xen-tools/xen-tools-4.15.2-r1.ebuild |
| 28 |
@@ -69,7 +69,7 @@ SLOT="0/$(ver_cut 1-2)" |
| 29 |
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make |
| 30 |
# >=dev-lang/ocaml-4 stable |
| 31 |
# Masked in profiles/eapi-5-files instead |
| 32 |
-IUSE="api debug doc +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios" |
| 33 |
+IUSE="api debug doc +hvm +ipxe ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios" |
| 34 |
|
| 35 |
REQUIRED_USE=" |
| 36 |
${PYTHON_REQUIRED_USE} |
| 37 |
@@ -82,6 +82,7 @@ REQUIRED_USE=" |
| 38 |
?? ( qemu system-qemu )" |
| 39 |
|
| 40 |
COMMON_DEPEND=" |
| 41 |
+ qemu? ( sys-libs/pam ) |
| 42 |
sys-apps/pciutils |
| 43 |
dev-libs/lzo:2 |
| 44 |
dev-libs/glib:2 |
| 45 |
@@ -107,7 +108,6 @@ DEPEND="${COMMON_DEPEND} |
| 46 |
x11-libs/pixman |
| 47 |
$(python_gen_cond_dep ' |
| 48 |
dev-python/lxml[${PYTHON_USEDEP}] |
| 49 |
- pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) |
| 50 |
') |
| 51 |
x86? ( sys-devel/dev86 |
| 52 |
system-ipxe? ( sys-firmware/ipxe[qemu] ) |
| 53 |
@@ -430,7 +430,6 @@ src_configure() { |
| 54 |
$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \ |
| 55 |
$(use_enable ocaml ocamltools) \ |
| 56 |
$(use_enable ovmf) \ |
| 57 |
- $(use_enable pam) \ |
| 58 |
$(use_enable rombios) \ |
| 59 |
--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ |
| 60 |
" |
| 61 |
|
| 62 |
diff --git a/app-emulation/xen-tools/xen-tools-4.16.0-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.16.0-r3.ebuild |
| 63 |
index 5d286bc55afe..d47a25185322 100644 |
| 64 |
--- a/app-emulation/xen-tools/xen-tools-4.16.0-r3.ebuild |
| 65 |
+++ b/app-emulation/xen-tools/xen-tools-4.16.0-r3.ebuild |
| 66 |
@@ -69,7 +69,7 @@ SLOT="0/$(ver_cut 1-2)" |
| 67 |
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make |
| 68 |
# >=dev-lang/ocaml-4 stable |
| 69 |
# Masked in profiles/eapi-5-files instead |
| 70 |
-IUSE="api debug doc +hvm +ipxe lzma ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd" |
| 71 |
+IUSE="api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd" |
| 72 |
|
| 73 |
REQUIRED_USE=" |
| 74 |
${PYTHON_REQUIRED_USE} |
| 75 |
@@ -83,7 +83,10 @@ REQUIRED_USE=" |
| 76 |
|
| 77 |
COMMON_DEPEND=" |
| 78 |
lzma? ( app-arch/xz-utils ) |
| 79 |
- qemu? ( dev-libs/glib:2 ) |
| 80 |
+ qemu? ( |
| 81 |
+ dev-libs/glib:2 |
| 82 |
+ sys-libs/pam |
| 83 |
+ ) |
| 84 |
zstd? ( app-arch/zstd ) |
| 85 |
app-arch/bzip2 |
| 86 |
app-arch/zstd |
| 87 |
@@ -112,7 +115,6 @@ DEPEND="${COMMON_DEPEND} |
| 88 |
x11-libs/pixman |
| 89 |
$(python_gen_cond_dep ' |
| 90 |
dev-python/lxml[${PYTHON_USEDEP}] |
| 91 |
- pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) |
| 92 |
') |
| 93 |
x86? ( sys-devel/dev86 |
| 94 |
system-ipxe? ( sys-firmware/ipxe[qemu] ) |
| 95 |
@@ -417,7 +419,7 @@ src_prepare() { |
| 96 |
|
| 97 |
# Remove -Werror |
| 98 |
find . -type f \( -name Makefile -o -name "*.mk" \) \ |
| 99 |
- -exec sed -i "s/-Werror //g" {} + || die |
| 100 |
+ -exec sed -i "s/-Werror //g" {} + || die |
| 101 |
|
| 102 |
default |
| 103 |
} |
| 104 |
@@ -437,7 +439,6 @@ src_configure() { |
| 105 |
$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') |
| 106 |
$(use_enable ocaml ocamltools) |
| 107 |
$(use_enable ovmf) |
| 108 |
- $(use_enable pam) |
| 109 |
$(use_enable rombios) |
| 110 |
$(use_enable systemd) |
| 111 |
--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') |
Archives