net-print/cups: Also apply non-systemd bugfix to live ebuild

Signed-off-by: Sven Wegener <swegener@gentoo.org>

diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index e9a214abf1b1763db9f12fd5bebf04b783f0c732..4c1949473c4f4e86db694168c1cabebce9f9a087 100644 (file)
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -285,18 +285,20 @@ multilib_src_install_all() {
        fi
 
        # Rename systemd service files to gentoo's own names:
-       mv "${ED}"/"$(systemd_get_systemunitdir)"/org.cups.cupsd.path \
-               "${ED}"/"$(systemd_get_systemunitdir)"/cups.path || die
-       mv "${ED}"/"$(systemd_get_systemunitdir)"/org.cups.cupsd.service \
-               "${ED}"/"$(systemd_get_systemunitdir)"/cups.service || die
-       mv "${ED}"/"$(systemd_get_systemunitdir)"/org.cups.cupsd.socket \
-               "${ED}"/"$(systemd_get_systemunitdir)"/cups.socket || die
-       mv "${ED}"/"$(systemd_get_systemunitdir)"/org.cups.cups-lpd@.service \
-               "${ED}"/"$(systemd_get_systemunitdir)"/cups.path || die
-       mv "${ED}"/"$(systemd_get_systemunitdir)"/org.cups.cups-lpd.socket \
-               "${ED}"/"$(systemd_get_systemunitdir)"/cups.path || die
-       sed -i -e 's/org\.cups\.cupsd/cups/g' \
-               "${ED}"/"$(systemd_get_systemunitdir)"/cups.service || die
+       if use systemd ; then
+               mv "${ED}"/"$(systemd_get_systemunitdir)"/org.cups.cupsd.path \
+                       "${ED}"/"$(systemd_get_systemunitdir)"/cups.path || die
+               mv "${ED}"/"$(systemd_get_systemunitdir)"/org.cups.cupsd.service \
+                       "${ED}"/"$(systemd_get_systemunitdir)"/cups.service || die
+               mv "${ED}"/"$(systemd_get_systemunitdir)"/org.cups.cupsd.socket \
+                       "${ED}"/"$(systemd_get_systemunitdir)"/cups.socket || die
+               mv "${ED}"/"$(systemd_get_systemunitdir)"/org.cups.cups-lpd@.service \
+                       "${ED}"/"$(systemd_get_systemunitdir)"/cups.path || die
+               mv "${ED}"/"$(systemd_get_systemunitdir)"/org.cups.cups-lpd.socket \
+                       "${ED}"/"$(systemd_get_systemunitdir)"/cups.path || die
+               sed -i -e 's/org\.cups\.cupsd/cups/g' \
+                       "${ED}"/"$(systemd_get_systemunitdir)"/cups.service || die
+       fi
 
        keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
                /var/log/cups /var/spool/cups/tmp