[gentoo-commits] repo/gentoo:master commit in: net-print/cups/

[Sven Wegener]

commit:     6e4a9c50dc5630e8c3dfadc5f6d34b286c7ad215
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 20:42:32 2016 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 20:42:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4a9c50

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

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

 net-print/cups/cups-9999.ebuild | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index e9a214a..4c19494 100644
--- 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