[gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/

[Mike Gilbert]

commit:     9b09f0646011091f3a3af4259e12dfdafcfbceed
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 21:35:46 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 21:36:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b09f064

sys-fs/lvm2: skip tmpfiles when USE=device-mapper-only

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-fs/lvm2/lvm2-2.02.188-r2.ebuild | 6 +++++-
 sys-fs/lvm2/lvm2-2.03.13-r2.ebuild  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild 
b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
index a6c786adcc2..2ed5a5019a9 100644
--- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+TMPFILES_OPTIONAL=1
 inherit autotools linux-info multilib systemd toolchain-funcs tmpfiles udev 
flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
@@ -36,6 +37,7 @@ RDEPEND="${DEPEND_COMMON}
        !!sys-fs/lvm-user
        >=sys-apps/util-linux-2.16
        lvm2create_initrd? ( sys-apps/makedev )
+       !device-mapper-only? ( virtual/tmpfiles )
        thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
 # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
 DEPEND="${DEPEND_COMMON}
@@ -265,7 +267,9 @@ src_install() {
 }
 
 pkg_postinst() {
-       tmpfiles_process lvm2.conf
+       if ! use device-mapper-only; then
+               tmpfiles_process lvm2.conf
+       fi
 
        if [[ -z "${REPLACING_VERSIONS}" ]]; then
                # This is a new installation

diff --git a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild 
b/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild
index f6c64e6f5d1..416cccb8fd2 100644
--- a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+TMPFILES_OPTIONAL=1
 inherit autotools linux-info multilib systemd toolchain-funcs tmpfiles udev 
flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
@@ -36,6 +37,7 @@ RDEPEND="${DEPEND_COMMON}
        !!sys-fs/lvm-user
        >=sys-apps/util-linux-2.16
        lvm2create_initrd? ( sys-apps/makedev )
+       !device-mapper-only? ( virtual/tmpfiles )
        thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
 # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
 DEPEND="${DEPEND_COMMON}
@@ -253,7 +255,9 @@ src_install() {
 }
 
 pkg_postinst() {
-       tmpfiles_process lvm2.conf
+       if ! use device-mapper-only; then
+               tmpfiles_process lvm2.conf
+       fi
 
        if [[ -z "${REPLACING_VERSIONS}" ]]; then
                # This is a new installation