From: "Sven Wegener" <swegener@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/
Date: Tue, 12 Jan 2016 20:40:55 +0000 (UTC) [thread overview]
Message-ID: <1452631246.b00b91ddce05636c60b895682cba5ac5be6b7c48.swegener@gentoo> (raw)
commit: b00b91ddce05636c60b895682cba5ac5be6b7c48
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 20:39:05 2016 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> 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 <swegener <AT> 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
next reply other threads:[~2016-01-12 20:41 UTC|newest]
Thread overview: 235+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-12 20:40 Sven Wegener [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-06-23 0:29 [gentoo-commits] repo/gentoo:master commit in: net-print/cups/ Sam James
2024-06-23 0:27 Sam James
2024-06-23 0:27 Sam James
2024-02-22 4:45 Ionen Wolkens
2024-02-05 16:46 Sam James
2024-02-05 16:46 Sam James
2024-02-05 15:12 Sam James
2024-02-05 15:12 Sam James
2024-02-05 15:12 Sam James
2024-02-05 15:12 Sam James
2024-01-25 1:05 Ionen Wolkens
2024-01-03 8:41 Jakov Smolić
2023-12-30 1:26 Ionen Wolkens
2023-12-30 1:26 Ionen Wolkens
2023-12-29 14:55 Arthur Zamarin
2023-12-29 14:55 Arthur Zamarin
2023-12-29 14:54 Arthur Zamarin
2023-12-29 14:36 Arthur Zamarin
2023-12-22 13:24 Mart Raudsepp
2023-12-18 3:54 Sam James
2023-12-18 3:54 Sam James
2023-12-18 3:54 Sam James
2023-12-05 19:41 Arthur Zamarin
2023-10-04 15:33 Sam James
2023-10-03 14:15 Sam James
2023-09-28 1:40 Sam James
2023-09-28 0:21 Sam James
2023-09-27 5:32 Sam James
2023-09-27 5:32 Sam James
2023-09-27 4:20 Sam James
2023-08-29 13:46 Matt Turner
2023-07-15 11:44 Arthur Zamarin
2023-07-09 9:01 Sam James
2023-07-09 9:01 Sam James
2023-07-09 8:29 Sam James
2023-07-09 8:29 Sam James
2023-07-09 8:29 Sam James
2023-07-09 8:29 Sam James
2023-06-23 2:14 Sam James
2023-06-21 21:46 Sam James
2023-06-17 16:52 Sam James
2023-06-14 23:13 Sam James
2023-06-14 23:13 Sam James
2023-06-14 19:42 Sam James
2023-06-14 19:25 Sam James
2023-06-14 18:23 Arthur Zamarin
2023-06-14 18:23 Arthur Zamarin
2023-06-14 16:53 Sam James
2023-06-10 5:19 Jakov Smolić
2023-06-09 15:27 Arthur Zamarin
2023-06-09 14:17 Sam James
2023-06-09 14:00 Arthur Zamarin
2023-06-09 14:00 Arthur Zamarin
2023-06-09 13:51 Arthur Zamarin
2023-06-09 13:48 Sam James
2023-06-07 8:14 Sam James
2023-06-07 8:14 Sam James
2023-06-02 5:16 Sam James
2023-05-24 8:05 Matthias Maier
2023-04-02 19:40 Arthur Zamarin
2023-03-16 14:04 Arthur Zamarin
2023-03-04 9:58 Arthur Zamarin
2023-03-04 9:58 Arthur Zamarin
2023-03-04 8:18 Arthur Zamarin
2023-03-04 8:17 Arthur Zamarin
2023-03-04 6:05 Arthur Zamarin
2023-03-04 5:48 Arthur Zamarin
2022-12-03 18:12 Arthur Zamarin
2022-12-03 18:12 Arthur Zamarin
2022-12-03 17:37 Arthur Zamarin
2022-12-03 17:34 Arthur Zamarin
2022-12-03 12:29 Arthur Zamarin
2022-12-03 12:24 Sam James
2022-12-03 12:14 Sam James
2022-12-03 12:11 Arthur Zamarin
2022-09-15 13:20 Sam James
2022-08-31 6:32 Jakov Smolić
2022-08-31 6:22 Jakov Smolić
2022-08-31 5:16 Agostino Sarubbo
2022-08-30 16:43 Arthur Zamarin
2022-08-30 16:19 Arthur Zamarin
2022-08-30 16:18 Arthur Zamarin
2022-08-30 16:17 Jakov Smolić
2022-08-30 16:17 Jakov Smolić
2022-08-27 7:46 Sam James
2022-08-17 16:21 Matt Turner
2022-07-30 15:54 Arthur Zamarin
2022-07-27 20:09 Sam James
2022-07-18 23:42 Sam James
2022-07-16 8:59 Agostino Sarubbo
2022-07-16 8:56 Agostino Sarubbo
2022-07-15 11:33 Arthur Zamarin
2022-07-15 10:59 Arthur Zamarin
2022-07-15 10:13 Arthur Zamarin
2022-07-15 10:13 Arthur Zamarin
2022-05-28 4:57 Sam James
2022-05-28 4:57 Sam James
2022-05-22 12:36 Pacho Ramos
2022-05-22 12:34 Pacho Ramos
2022-05-18 8:00 WANG Xuerui
2022-03-15 15:44 Conrad Kostecki
2021-12-04 17:49 Sam James
2021-11-30 7:54 Arthur Zamarin
2021-11-30 7:54 Arthur Zamarin
2021-11-30 7:54 Arthur Zamarin
2021-11-30 7:54 Arthur Zamarin
2021-11-30 7:54 Arthur Zamarin
2021-11-30 7:54 Arthur Zamarin
2021-11-30 7:54 Arthur Zamarin
2021-07-19 14:24 Yixun Lan
2021-06-27 2:08 Sam James
2021-06-24 23:27 Sam James
2021-06-14 18:05 Sergei Trofimovich
2021-06-14 13:11 Sam James
2021-06-13 6:32 Agostino Sarubbo
2021-06-13 6:30 Agostino Sarubbo
2021-06-13 6:28 Agostino Sarubbo
2021-06-13 6:04 Sam James
2021-06-13 3:45 Sam James
2021-06-13 3:45 Sam James
2021-04-21 9:49 Lars Wendler
2021-04-20 12:59 Andreas Sturmlechner
2021-04-20 12:59 Andreas Sturmlechner
2021-04-20 12:59 Andreas Sturmlechner
2021-01-22 14:54 Mikle Kolyada
2020-12-27 17:58 Fabian Groffen
2020-08-16 16:49 Michał Górny
2020-06-26 19:10 Matt Turner
2020-06-20 1:39 Aaron Bauman
2020-05-13 10:06 Agostino Sarubbo
2020-05-11 11:38 Agostino Sarubbo
2020-05-07 15:58 Agostino Sarubbo
2020-05-06 7:18 Sergei Trofimovich
2020-05-06 7:01 Sergei Trofimovich
2020-05-02 9:01 Sergei Trofimovich
2020-05-01 19:30 Sergei Trofimovich
2020-04-29 8:54 Mart Raudsepp
2020-04-28 14:50 Lars Wendler
2020-04-28 14:50 Lars Wendler
2020-04-28 9:59 Lars Wendler
2020-03-15 10:07 Lars Wendler
2020-01-03 13:26 Agostino Sarubbo
2019-12-31 14:21 Agostino Sarubbo
2019-12-31 14:16 Agostino Sarubbo
2019-12-26 9:49 Sergei Trofimovich
2019-12-25 20:24 Sergei Trofimovich
2019-12-24 19:25 Aaron Bauman
2019-12-24 14:00 Mikle Kolyada
2019-12-24 11:09 Agostino Sarubbo
2019-12-24 10:56 Agostino Sarubbo
2019-12-14 11:26 Lars Wendler
2019-10-12 19:32 Mikle Kolyada
2019-09-01 18:25 Mikle Kolyada
2019-09-01 18:25 Mikle Kolyada
2019-08-28 12:54 Agostino Sarubbo
2019-08-27 22:56 Sergei Trofimovich
2019-08-26 18:45 Sergei Trofimovich
2019-08-26 15:00 Agostino Sarubbo
2019-08-26 14:58 Agostino Sarubbo
2019-08-26 14:57 Agostino Sarubbo
2019-08-26 12:56 Agostino Sarubbo
2019-08-24 23:08 Aaron Bauman
2019-08-24 21:24 Sergei Trofimovich
2019-08-23 21:21 Lars Wendler
2019-08-16 18:27 Lars Wendler
2019-08-16 18:06 Lars Wendler
2019-07-31 11:54 Lars Wendler
2019-06-17 9:52 Mikle Kolyada
2019-06-13 4:28 Markus Meier
2019-06-09 19:19 Sergei Trofimovich
2019-06-09 11:33 Aaron Bauman
2019-06-05 7:28 Agostino Sarubbo
2019-06-04 20:57 Agostino Sarubbo
2019-06-04 20:54 Agostino Sarubbo
2019-06-04 11:01 Lars Wendler
2019-06-04 10:59 Agostino Sarubbo
2019-06-04 7:53 Tobias Klausmann
2019-06-02 20:22 Sergei Trofimovich
2019-05-03 12:12 Lars Wendler
2018-12-12 13:01 Mikle Kolyada
2018-11-09 11:43 Lars Wendler
2018-06-06 9:09 Lars Wendler
2018-06-06 9:09 Lars Wendler
2018-06-06 9:09 Lars Wendler
2018-05-29 9:08 Mikle Kolyada
2018-05-14 11:49 Tobias Klausmann
2018-05-13 22:06 Thomas Deutschmann
2018-05-13 11:29 Markus Meier
2018-05-13 10:08 Sergei Trofimovich
2018-05-13 9:53 Sergei Trofimovich
2018-05-11 7:10 Sergei Trofimovich
2018-05-10 16:49 Mikle Kolyada
2018-03-29 20:11 Lars Wendler
2018-03-29 8:31 Lars Wendler
2018-03-29 8:31 Lars Wendler
2018-03-28 7:42 Lars Wendler
2018-03-28 7:42 Lars Wendler
2018-01-05 22:02 Ulrich Müller
2017-11-28 18:30 Lars Wendler
2017-11-10 9:07 Lars Wendler
2017-11-10 9:07 Lars Wendler
2017-11-10 9:07 Lars Wendler
2017-09-22 14:09 Patrice Clement
2017-05-24 8:38 Pacho Ramos
2017-03-28 22:26 Lars Wendler
2017-02-18 12:52 Andreas Hüttel
2017-02-16 0:13 Andreas Hüttel
2017-02-13 21:28 Andreas Hüttel
2017-02-13 21:28 Andreas Hüttel
2017-02-11 23:04 Andreas Hüttel
2017-01-18 1:39 Lars Wendler
2017-01-15 10:02 Jeroen Roovers
2016-12-29 18:52 Lars Wendler
2016-11-15 15:34 Tobias Klausmann
2016-11-11 11:52 Agostino Sarubbo
2016-11-11 11:51 Agostino Sarubbo
2016-10-26 16:43 Markus Meier
2016-10-01 14:06 Jeroen Roovers
2016-06-15 7:37 Lars Wendler
2016-06-11 13:24 Markus Meier
2016-06-06 16:15 Agostino Sarubbo
2016-05-25 9:43 Tobias Klausmann
2016-05-16 9:03 Patrice Clement
2016-03-25 3:31 Mike Frysinger
2016-03-15 6:32 Mike Frysinger
2016-02-06 1:50 Mike Frysinger
2016-01-12 23:31 Matthias Maier
2016-01-12 21:26 Lars Wendler
2016-01-12 20:43 Sven Wegener
2016-01-12 16:35 Matthias Maier
2016-01-12 15:50 Matthias Maier
2015-08-27 18:14 Manuel Rüger
2015-08-27 18:04 Manuel Rüger
2015-08-09 18:11 Mikle Kolyada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452631246.b00b91ddce05636c60b895682cba5ac5be6b7c48.swegener@gentoo \
--to=swegener@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox