From b00b91ddce05636c60b895682cba5ac5be6b7c48 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Tue, 12 Jan 2016 20:39:05 +0000 Subject: net-print/cups: Fix build on non-systemd systems, bug #571680 Signed-off-by: Sven Wegener --- net-print/cups/cups-2.1.2-r1.ebuild | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'net-print') diff --git a/net-print/cups/cups-2.1.2-r1.ebuild b/net-print/cups/cups-2.1.2-r1.ebuild index e9a214abf1b1..4c1949473c4f 100644 --- a/net-print/cups/cups-2.1.2-r1.ebuild +++ b/net-print/cups/cups-2.1.2-r1.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 -- cgit v1.2.3-65-gdbad