diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2016-01-12 22:25:48 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2016-01-12 22:25:48 +0100 |
| commit | 513834aceb7cd98b66839c3c6b7151881c1e82e4 (patch) | |
| tree | c295f029fb0cdfea6bf79938fb411f8a3b89270a /net-print | |
| parent | games-fps/ut2003-data: EAPI=5 (diff) | |
| download | gentoo-513834aceb7cd98b66839c3c6b7151881c1e82e4.tar.gz gentoo-513834aceb7cd98b66839c3c6b7151881c1e82e4.tar.bz2 gentoo-513834aceb7cd98b66839c3c6b7151881c1e82e4.zip | |
net-print/cups: Added epatch command so patches get applied.
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/cups-2.1.2-r2.ebuild (renamed from net-print/cups/cups-2.1.2-r1.ebuild) | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/net-print/cups/cups-2.1.2-r1.ebuild b/net-print/cups/cups-2.1.2-r2.ebuild index 4c1949473c4f..1a45172f5176 100644 --- a/net-print/cups/cups-2.1.2-r1.ebuild +++ b/net-print/cups/cups-2.1.2-r2.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 @@ -310,7 +297,7 @@ multilib_src_install_all() { # create /etc/cups/client.conf, bug #196967 and #266678 echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf - # the following file iw now provided by cups-filters: + # the following file is now provided by cups-filters: rm -r "${ED}"/usr/share/cups/banners || die # the following are created by the init script |