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

[Matthias Maier]

commit:     654dbc3ab26f31affcd39d0fb173c79efbdbb761
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 23:30:19 2016 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 23:31:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=654dbc3a

net-print/cups: also fix live-ebuild

Package-Manager: portage-2.2.26

 net-print/cups/cups-9999.ebuild | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

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