net-print/cups: Properly rename systemd unit files to Gentoo naming

It turns out that the old patch for 2.0* is not enough any more. Now, the
renaming is directly done in the ebuild - patching the build system again
for every version bump is just too much maintenance work.

Package-Manager: portage-2.2.26

diff --git a/net-print/cups/cups-2.1.2.ebuild b/net-print/cups/cups-2.1.2-r1.ebuild
similarity index 92%
rename from net-print/cups/cups-2.1.2.ebuild
rename to net-print/cups/cups-2.1.2-r1.ebuild
index 9406e6f83b3044f06a3f6a30ad58ccd1b2c826ee..e9a214abf1b1763db9f12fd5bebf04b783f0c732 100644 (file)
--- a/net-print/cups/cups-2.1.2.ebuild
+++ b/net-print/cups/cups-2.1.2-r1.ebuild
@@ -97,7 +97,6 @@ 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}/${PN}-2.0.2-rename-systemd-service-files.patch"
        "${FILESDIR}/${P}-systemd-socket.patch"
        "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
 )
@@ -151,7 +150,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       base_src_prepare
        epatch_user
 
        # Remove ".SILENT" rule for verbose output (bug 524338).
@@ -286,6 +284,20 @@ multilib_src_install_all() {
                rm -rf "${ED}"/etc/xinetd.d
        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
+
        keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
                /var/log/cups /var/spool/cups/tmp
 

diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index e3c89fd794b3a4a90f96bdda503853288d9017a4..e9a214abf1b1763db9f12fd5bebf04b783f0c732 100644 (file)
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -92,11 +92,11 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+# systemd-socket.patch from Fedora
 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}/${PN}-2.0.2-rename-systemd-service-files.patch"
        "${FILESDIR}/${P}-systemd-socket.patch"
        "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
 )
@@ -150,7 +150,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       base_src_prepare
+       epatch_user
 
        # Remove ".SILENT" rule for verbose output (bug 524338).
        sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
@@ -284,6 +284,20 @@ multilib_src_install_all() {
                rm -rf "${ED}"/etc/xinetd.d
        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
+
        keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
                /var/log/cups /var/spool/cups/tmp