summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2016-01-12 20:42:32 +0000
committerSven Wegener <swegener@gentoo.org>2016-01-12 20:42:51 +0000
commit6e4a9c50dc5630e8c3dfadc5f6d34b286c7ad215 (patch)
treed8c73a139b3755774afe33fe87f4b6c3ccee89c7 /net-print
parentnet-print/cups: Fix build on non-systemd systems, bug #571680 (diff)
downloadgentoo-6e4a9c50dc5630e8c3dfadc5f6d34b286c7ad215.tar.gz
gentoo-6e4a9c50dc5630e8c3dfadc5f6d34b286c7ad215.tar.bz2
gentoo-6e4a9c50dc5630e8c3dfadc5f6d34b286c7ad215.zip
net-print/cups: Also apply non-systemd bugfix to live ebuild
Signed-off-by: Sven Wegener <swegener@gentoo.org>
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/cups-9999.ebuild26
1 files changed, 14 insertions, 12 deletions
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index e9a214abf1b1..4c1949473c4f 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