app-emulation/libvirt: minimize sed usage

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko@gentoo.org>

diff --git a/app-emulation/libvirt/files/libvirtd.init-r18 b/app-emulation/libvirt/files/libvirtd.init-r18
index 23988dd1b178ab6be53c7dfca0d38dd6c82656fb..5e9efc83e2f9cad1df5ea354e643995fb21cc768 100644 (file)
--- a/app-emulation/libvirt/files/libvirtd.init-r18
+++ b/app-emulation/libvirt/files/libvirtd.init-r18
@@ -15,11 +15,9 @@ retry="${LIBVIRTD_TERMTIMEOUT}"
 
 depend() {
        need virtlogd
-       use dbus virtlockd
-       after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled
+       use ceph dbus iscsid virtlockd
+       after cgconfig corosync ebtables iptables ip6tables nfs nfsmount ntp-client ntpdportmap rpc.statd sanlock xenconsoled
        USE_FLAG_FIREWALLD
-       USE_FLAG_ISCSI
-       USE_FLAG_RBD
 }
 
 start_pre() {

diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
index b5f8f50ca09b591ab68237dd6ae21a6d1ebb2624..5cb42f7609c99e19034cd408886b491b0ce5d9de 100644 (file)
--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
@@ -237,8 +237,6 @@ src_prepare() {
        # Tweak the init script:
        cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
        sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-               -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
                -i "${S}/libvirtd.init" || die "sed failed"
 
        eautoreconf