sys-fs/lvm2: fix USE="static-libs device-mapper-only"

Closes: https://bugs.gentoo.org/686146
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/sys-fs/lvm2/lvm2-2.02.185.ebuild b/sys-fs/lvm2/lvm2-2.02.185.ebuild
index 812f84d2b656dfade3ef8de7a58c397bb0f8a65c..459f918637b90d70767d57ecfeb71da9ed8237b5 100644 (file)
--- a/sys-fs/lvm2/lvm2-2.02.185.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.185.ebuild
@@ -242,10 +242,14 @@ src_install() {
 
        if use static-libs; then
                dolib.a libdm/ioctl/libdevmapper.a
-               dolib.a libdaemon/client/libdaemonclient.a #462908
                #gen_usr_ldscript libdevmapper.so
-               dolib.a daemons/dmeventd/libdevmapper-event.a
-               #gen_usr_ldscript libdevmapper-event.so
+               if use !device-mapper-only; then
+                       # depends on lvmetad
+                       dolib.a libdaemon/client/libdaemonclient.a #462908
+                       # depends on dmeventd
+                       dolib.a daemons/dmeventd/libdevmapper-event.a
+                       #gen_usr_ldscript libdevmapper-event.so
+               fi
        else
                rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
        fi

diff --git a/sys-fs/lvm2/lvm2-2.02.186.ebuild b/sys-fs/lvm2/lvm2-2.02.186.ebuild
index 812f84d2b656dfade3ef8de7a58c397bb0f8a65c..459f918637b90d70767d57ecfeb71da9ed8237b5 100644 (file)
--- a/sys-fs/lvm2/lvm2-2.02.186.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.186.ebuild
@@ -242,10 +242,14 @@ src_install() {
 
        if use static-libs; then
                dolib.a libdm/ioctl/libdevmapper.a
-               dolib.a libdaemon/client/libdaemonclient.a #462908
                #gen_usr_ldscript libdevmapper.so
-               dolib.a daemons/dmeventd/libdevmapper-event.a
-               #gen_usr_ldscript libdevmapper-event.so
+               if use !device-mapper-only; then
+                       # depends on lvmetad
+                       dolib.a libdaemon/client/libdaemonclient.a #462908
+                       # depends on dmeventd
+                       dolib.a daemons/dmeventd/libdevmapper-event.a
+                       #gen_usr_ldscript libdevmapper-event.so
+               fi
        else
                rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
        fi

diff --git a/sys-fs/lvm2/lvm2-2.03.05.ebuild b/sys-fs/lvm2/lvm2-2.03.05.ebuild
index 12b13a5e36e6e784ce0a7e6ba7ae3c0f318286ca..87f738bf20e71f2a68f112d9678a88ccb3133d8c 100644 (file)
--- a/sys-fs/lvm2/lvm2-2.03.05.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.05.ebuild
@@ -230,10 +230,14 @@ src_install() {
 
        if use static-libs; then
                dolib.a libdm/ioctl/libdevmapper.a
-               dolib.a libdaemon/client/libdaemonclient.a #462908
                #gen_usr_ldscript libdevmapper.so
-               dolib.a daemons/dmeventd/libdevmapper-event.a
-               #gen_usr_ldscript libdevmapper-event.so
+               if use !device-mapper-only; then
+                       # depends on lvmetad
+                       dolib.a libdaemon/client/libdaemonclient.a #462908
+                       # depends on dmeventd
+                       dolib.a daemons/dmeventd/libdevmapper-event.a
+                       #gen_usr_ldscript libdevmapper-event.so
+               fi
        else
                rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
        fi