diff options
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/cups-9999.ebuild | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 4c1949473c4f..45127ab418fe 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -97,7 +97,8 @@ PATCHES=( "${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch" "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch" "${FILESDIR}/${PN}-1.4.4-nostrip.patch" - "${FILESDIR}/${P}-systemd-socket.patch" + "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" + "${FILESDIR}/${PN}-2.1.2-systemd-socket.patch" "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" ) @@ -150,6 +151,8 @@ pkg_setup() { } src_prepare() { + epatch ${PATCHES[@]} + epatch_user # Remove ".SILENT" rule for verbose output (bug 524338). @@ -284,22 +287,6 @@ multilib_src_install_all() { rm -rf "${ED}"/etc/xinetd.d fi - # Rename systemd service files to gentoo's own names: - 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 |