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 5B7BA1388BF for ; Tue, 12 Jan 2016 20:41:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAF4D21C046; Tue, 12 Jan 2016 20:41:00 +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 72F2B21C046 for ; Tue, 12 Jan 2016 20:41:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1458033BE2F for ; Tue, 12 Jan 2016 20:40:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B999A16 for ; Tue, 12 Jan 2016 20:40:55 +0000 (UTC) From: "Sven Wegener" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Wegener" Message-ID: <1452631246.b00b91ddce05636c60b895682cba5ac5be6b7c48.swegener@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 X-VCS-Directories: net-print/cups/ X-VCS-Committer: swegener X-VCS-Committer-Name: Sven Wegener X-VCS-Revision: b00b91ddce05636c60b895682cba5ac5be6b7c48 X-VCS-Branch: master Date: Tue, 12 Jan 2016 20:40:55 +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: 82ff5fcd-22f7-4bd5-a8d5-abd1306ede4c X-Archives-Hash: 8694402acaaf8a3bd866c73ae209fb65 commit: b00b91ddce05636c60b895682cba5ac5be6b7c48 Author: Sven Wegener gentoo org> AuthorDate: Tue Jan 12 20:39:05 2016 +0000 Commit: Sven Wegener gentoo org> CommitDate: Tue Jan 12 20:40:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b00b91dd net-print/cups: Fix build on non-systemd systems, bug #571680 Signed-off-by: Sven Wegener gentoo.org> net-print/cups/cups-2.1.2-r1.ebuild | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/net-print/cups/cups-2.1.2-r1.ebuild b/net-print/cups/cups-2.1.2-r1.ebuild index e9a214a..4c19494 100644 --- a/net-print/cups/cups-2.1.2-r1.ebuild +++ b/net-print/cups/cups-2.1.2-r1.ebuild @@ -285,18 +285,20 @@ multilib_src_install_all() { 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 + 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