From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 48F6B1388BF for ; Tue, 12 Jan 2016 21:26:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C0DBE0893; Tue, 12 Jan 2016 21:26:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A752AE0893 for ; Tue, 12 Jan 2016 21:26:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B0F5340AA9 for ; Tue, 12 Jan 2016 21:26:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F34EC11 for ; Tue, 12 Jan 2016 21:26:10 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1452633948.513834aceb7cd98b66839c3c6b7151881c1e82e4.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups/cups-2.1.2-r1.ebuild net-print/cups/cups-2.1.2-r2.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 513834aceb7cd98b66839c3c6b7151881c1e82e4 X-VCS-Branch: master Date: Tue, 12 Jan 2016 21:26:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5785fe83-6662-4787-ae49-8f3f70bfeaf5 X-Archives-Hash: 531bbbcd100b3b94a5cd3f1d6df1f79b commit: 513834aceb7cd98b66839c3c6b7151881c1e82e4 Author: Lars Wendler gentoo org> AuthorDate: Tue Jan 12 21:25:48 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Jan 12 21:25:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513834ac net-print/cups: Added epatch command so patches get applied. Package-Manager: portage-2.2.26 Signed-off-by: Lars Wendler gentoo.org> .../{cups-2.1.2-r1.ebuild => cups-2.1.2-r2.ebuild} | 23 +++++----------------- 1 file 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 similarity index 91% rename from net-print/cups/cups-2.1.2-r1.ebuild rename to net-print/cups/cups-2.1.2-r2.ebuild index 4c19494..1a45172 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