commit:     5a186b6d1089b239eb764c563d93c5d532152a20
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 18 05:25:22 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 05:27:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a186b6d

sys-fs/lvm2: bump, bugfix release from upstream, stable candidate

Package-Manager: Portage-2.3.67, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 sys-fs/lvm2/Manifest                               |   1 +
 sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2     |   2 +-
 sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1        |   2 +-
 sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 |   2 +-
 sys-fs/lvm2/files/lvm.rc-2.02.105-r2               |   2 +-
 sys-fs/lvm2/files/lvm.rc-2.02.116-r6               |   2 +-
 sys-fs/lvm2/files/lvm.rc-2.02.172                  |   2 +-
 sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2        |   2 +-
 sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3        |   2 +-
 sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1       |   2 +-
 sys-fs/lvm2/lvm2-2.02.145-r2.ebuild                |   2 +-
 ...vm2-2.02.145-r2.ebuild => lvm2-2.02.185.ebuild} | 180 +++++++++++----------
 12 files changed, 108 insertions(+), 93 deletions(-)

diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index fa9cdc1b27e..bf3cba8c8b2 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -2,3 +2,4 @@ DIST LVM2.2.02.116.tgz 1538340 BLAKE2B 
718261b60626f2eca5ba13011646bf551523ed8e5
 DIST LVM2.2.02.145.tgz 1986370 BLAKE2B 
0c9e5efae17f26ff86152cecbf0b11a74e85007b2fa9491f44dec03ac8c11375bacf6685213b4be19037c8fbf70e13549516716ecf8fa262919a44625e6aab34
 SHA512 
84e28b3efc940837ea9da70fce620744aea0945ba29383b76ad7bcd4b5259b897c714162a8e8b7cfe26ae736a3ad2eca633a3e0df4d6280a32b28bd4cf472d27
 DIST LVM2.2.02.183.tgz 2380574 BLAKE2B 
b1fe71b6cdb8ee20dd53d0ad3399c553487baafa12657ec81a794c84ad161988afdb8693ac247877a2645d693a0740c74c8b991047ed2ba4adc9ec75f1c261a9
 SHA512 
3947523c6b0862ada40677ed171ed0cf95e070119e377296fc5ccb153e9c4212d34c0b16a887dbd68ccf265525345dabfed2aa59fb3604555429a7e2ecfff4d7
 DIST LVM2.2.02.184.tgz 2383698 BLAKE2B 
b6e308d76d541b9461dfcc6e82db256a175ccdabfae9c9d57d84eabd0d5ea50e3e09954b34741903e027412c2c26f72a5005fe934261576337a810738139deb8
 SHA512 
9db74f675e7c58f663a39afb79b6f33a33ad2cfbda63e9783ef5027f33977b4a1262a2e6754aa67c586eed083ee119a2e837c32a7746dcc53f13877c9d65c390
+DIST LVM2.2.02.185.tgz 2386328 BLAKE2B 
d2e31de3eedd7518ea2d239cb9b36b38e351d7fc070097a1fc4e7934e3636195da3247fba57d684bb0b31b7f3dbdfe29161bd121b2962b2c35c8c9d7914b4506
 SHA512 
f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf

diff --git a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 
b/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2
index 7dbacce0d94..79fdff246fb 100644
--- a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2
+++ b/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {

diff --git a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 
b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
index 930e84baa86..f77996caa57 100644
--- a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
+++ b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PIDFILE=/run/dmeventd.pid

diff --git a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 
b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2
index d603718cc22..914d6637c7a 100644
--- a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2
+++ b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This script is based on upstream file

diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 
b/sys-fs/lvm2/files/lvm.rc-2.02.105-r2
index c59f9c3c878..937db047d19 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.105-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {

diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.116-r6 
b/sys-fs/lvm2/files/lvm.rc-2.02.116-r6
index 1bf075fae3e..cf430c6654d 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.116-r6
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.116-r6
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 _get_lvm_path() {

diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.172 
b/sys-fs/lvm2/files/lvm.rc-2.02.172
index c3f1f08f399..82037b28adf 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.172
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.172
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 _get_lvm_path() {

diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 
b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
index c95a47d5be5..565f49c7c42 100644
--- a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
+++ b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pidfile="/run/lvmetad.pid"

diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3 
b/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3
index 2efce4223e5..55bbf9c4b63 100644
--- a/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3
+++ b/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pidfile="/run/lvmetad.pid"

diff --git a/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1 
b/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1
index 16e2cc3f12b..8b5986fae24 100644
--- a/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1
+++ b/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pidfile="/run/lvmlockd.pid"

diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild 
b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
index 2890ca59239..31435ff9d05 100644
--- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6

diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild 
b/sys-fs/lvm2/lvm2-2.02.185.ebuild
similarity index 53%
copy from sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
copy to sys-fs/lvm2/lvm2-2.02.185.ebuild
index 2890ca59239..f82f1a6846b 100644
--- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.185.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev 
flag-o-matic
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
 HOMEPAGE="https://sourceware.org/lvm2/";
@@ -11,13 +11,17 @@ 
SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev 
+thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin )
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux 
+udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
        systemd? ( udev )"
 
 DEPEND_COMMON="
+       dev-libs/libaio[static-libs?]
+       static? ( dev-libs/libaio[static-libs] )
+       !static? ( dev-libs/libaio[static-libs?] )
        readline? ( sys-libs/readline:0= )
+       sanlock? ( sys-cluster/sanlock )
        systemd? ( >=sys-apps/systemd-205:0= )
        udev? ( >=virtual/libudev-208:=[static-libs?] )"
 # /run is now required for locking during early boot. /var cannot be assumed to
@@ -47,18 +51,22 @@ S=${WORKDIR}/${PN/lvm/LVM}.${PV}
 
 PATCHES=(
        # Gentoo specific modification(s):
-       "${FILESDIR}"/${PN}-2.02.129-example.conf.in.patch
+       "${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
 
        # For upstream -- review and forward:
        "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
        "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
        "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
        "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-       "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-       "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
-       "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, 
#439414 + blkid
-       "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
-       "${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062
+       "${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
+       "${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
+       "${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, 
#439414 + blkid
+       "${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
+       "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
+       "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
+       #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
+       "${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch
+       
#"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch
 #682380 # merged upstream
 )
 
 pkg_setup() {
@@ -93,7 +101,7 @@ src_prepare() {
                -e "s:CC ?= @CC@:CC = $(tc-getCC):" \
                make.tmpl.in || die #444082
 
-       sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
+       sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
 
        if use udev && ! use device-mapper-only; then
                sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die 
#514196
@@ -105,82 +113,79 @@ src_prepare() {
        sed -i -e "s:/usr/bin/true:$(type -P true):" 
scripts/blk_availability_systemd_red_hat.service.in || die #517514
 
        # Without thin-privision-tools, there is nothing to install for target 
install_man7:
-       use thin || { sed -i -e '/^install_lvm2/s:install_man7::' 
man/Makefile.in || die; }
+       if ! use thin ; then
+               sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || 
die
+       fi
 
        eautoreconf
 }
 
 src_configure() {
        filter-flags -flto
-       local myconf=()
-       local buildmode
-
-       myconf+=( $(use_enable !device-mapper-only dmeventd) )
-       myconf+=( $(use_enable !device-mapper-only cmdlib) )
-       myconf+=( $(use_enable !device-mapper-only applib) )
-       myconf+=( $(use_enable !device-mapper-only fsadm) )
-       myconf+=( $(use_enable !device-mapper-only lvmetad) )
-       use device-mapper-only && myconf+=( 
--disable-udev-systemd-background-jobs )
+       local myeconfargs=()
 
        # Most of this package does weird stuff.
        # The build options are tristate, and --without is NOT supported
        # options: 'none', 'internal', 'shared'
-       if use static; then
-               buildmode="internal"
+       myeconfargs+=(
+               $(use_enable !device-mapper-only dmfilemapd)
+               $(use_enable !device-mapper-only dmeventd)
+               $(use_enable !device-mapper-only cmdlib)
+               $(use_enable !device-mapper-only applib)
+               $(use_enable !device-mapper-only fsadm)
+               $(use_enable !device-mapper-only lvmetad)
+               $(use_enable !device-mapper-only lvmpolld)
+               $(usex device-mapper-only 
--disable-udev-systemd-background-jobs '')
+
                # This only causes the .static versions to become available
-               myconf+=( --enable-static_link )
-       else
-               buildmode="shared"
-       fi
-       dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
+               $(usex static --enable-static_link '')
+
+               # dmeventd requires mirrors to be internal, and snapshot 
available
+               # so we cannot disable them
+               --with-mirrors="$(usex device-mapper-only none internal)"
+               --with-snapshots="$(usex device-mapper-only none internal)"
+
+               # disable O_DIRECT support on hppa, breaks pv detection (#99532)
+               $(usex hppa --disable-o_direct '')
+       )
 
-       # dmeventd requires mirrors to be internal, and snapshot available
-       # so we cannot disable them
-       myconf+=( --with-mirrors=${dmbuildmode} )
-       myconf+=( --with-snapshots=${dmbuildmode} )
        if use thin; then
-               myconf+=( --with-thin=internal --with-cache=internal )
+               myeconfargs+=( --with-thin=internal --with-cache=internal )
                local texec
                for texec in check dump repair restore; do
-                       myconf+=( 
--with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
-                       myconf+=( 
--with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
+                       myeconfargs+=( 
--with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
+                       myeconfargs+=( 
--with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
                done
        else
-               myconf+=( --with-thin=none --with-cache=none )
+               myeconfargs+=( --with-thin=none --with-cache=none )
        fi
 
-       if use lvm1; then
-               myconf+=( --with-lvm1=${buildmode} )
-       else
-               myconf+=( --with-lvm1=none )
-       fi
-
-       # disable O_DIRECT support on hppa, breaks pv detection (#99532)
-       use hppa && myconf+=( --disable-o_direct )
-
-       myconf+=( --with-clvmd=none --with-cluster=none )
-
-       econf \
-               $(use_enable readline) \
-               $(use_enable selinux) \
-               --enable-pkgconfig \
-               --with-confdir="${EPREFIX}"/etc \
-               --exec-prefix="${EPREFIX}" \
-               --sbindir="${EPREFIX}/sbin" \
-               --with-staticdir="${EPREFIX}"/sbin \
-               --libdir="${EPREFIX}/$(get_libdir)" \
-               --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
-               --with-default-dm-run-dir=/run \
-               --with-default-run-dir=/run/lvm \
-               --with-default-locking-dir=/run/lock/lvm \
-               --with-default-pid-dir=/run \
-               $(use_enable udev udev_rules) \
-               $(use_enable udev udev_sync) \
-               $(use_with udev udevdir "$(get_udevdir)"/rules.d) \
-               $(use_enable systemd udev-systemd-background-jobs) \
-               --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-               ${myconf[@]} \
+       myeconfargs+=( --with-clvmd=none --with-cluster=none )
+
+       myeconfargs+=(
+               $(use_enable readline)
+               $(use_enable selinux)
+               --enable-pkgconfig
+               --with-confdir="${EPREFIX}"/etc
+               --exec-prefix="${EPREFIX}"
+               --sbindir="${EPREFIX}/sbin"
+               --with-staticdir="${EPREFIX}"/sbin
+               --libdir="${EPREFIX}/$(get_libdir)"
+               --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
+               --with-default-dm-run-dir=/run
+               --with-default-run-dir=/run/lvm
+               --with-default-locking-dir=/run/lock/lvm
+               --with-default-pid-dir=/run
+               $(use_enable udev udev_rules)
+               $(use_enable udev udev_sync)
+               $(use_with udev udevdir "$(get_udevdir)"/rules.d)
+               $(use_enable sanlock lvmlockd-sanlock)
+               $(use_enable systemd udev-systemd-background-jobs)
+               $(use_enable systemd notify-dbus)
+               --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
                CLDFLAGS="${LDFLAGS}"
+       )
+       econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -197,12 +202,12 @@ src_compile() {
 }
 
 src_install() {
-       local inst
-       INSTALL_TARGETS="install install_tmpfiles_configuration"
+       local inst INSTALL_TARGETS
+       INSTALL_TARGETS=( install install_tmpfiles_configuration )
        # install systemd related files only when requested, bug #522430
-       use systemd && INSTALL_TARGETS="${INSTALL_TARGETS} 
install_systemd_units install_systemd_generators"
-       use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
-       for inst in ${INSTALL_TARGETS}; do
+       use systemd && INSTALL_TARGETS+=( install_systemd_units 
install_systemd_generators )
+       use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
+       for inst in ${INSTALL_TARGETS[@]}; do
                emake DESTDIR="${D}" ${inst}
        done
 
@@ -210,24 +215,33 @@ src_install() {
        newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
 
        if use !device-mapper-only ; then
-               newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-               newinitd "${FILESDIR}"/lvm.rc-2.02.116-r6 lvm
-               newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+               newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
+               newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm
+               newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
+               if ! use udev ; then
+                       # We keep the variable but remove udev from it.
+                       sed -r -i \
+                               -e '/^rc_need=/s/\<udev\>//g' \
+                               "${ED}/etc/conf.d/lvm" || die "Could not drop 
udev from rc_need"
+               fi
 
                newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 
lvm-monitoring
                newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
+               newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
+       fi
+
+       if use sanlock; then
+               newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
        fi
 
        if use static-libs; then
                dolib.a libdm/ioctl/libdevmapper.a
-               if use !device-mapper-only ; then
-                       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
-               fi
+               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
        else
-               rm -f 
"${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+               rm -f 
"${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
        fi
 
        if use lvm2create_initrd; then

Reply via email to