| 1 |
commit: 29c2681979e6f5b04bbc9be60a3b13e63c728c5c |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 16 18:15:39 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 16 18:27:04 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c26819 |
| 7 |
|
| 8 |
net-print/cups: Synced live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
net-print/cups/cups-9999.ebuild | 18 ++++++++++++------ |
| 14 |
1 file changed, 12 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild |
| 17 |
index 1a22a0b0ae7..b2da32a36b2 100644 |
| 18 |
--- a/net-print/cups/cups-9999.ebuild |
| 19 |
+++ b/net-print/cups/cups-9999.ebuild |
| 20 |
@@ -55,10 +55,12 @@ CDEPEND=" |
| 21 |
|
| 22 |
DEPEND="${CDEPEND}" |
| 23 |
BDEPEND=" |
| 24 |
+ acct-group/lp |
| 25 |
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
| 26 |
" |
| 27 |
|
| 28 |
RDEPEND="${CDEPEND} |
| 29 |
+ acct-group/lp |
| 30 |
selinux? ( sec-policy/selinux-cups ) |
| 31 |
" |
| 32 |
|
| 33 |
@@ -73,7 +75,6 @@ RESTRICT="test" |
| 34 |
|
| 35 |
# systemd-socket.patch from Fedora |
| 36 |
PATCHES=( |
| 37 |
- "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch" |
| 38 |
"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch" |
| 39 |
"${FILESDIR}/${PN}-1.4.4-nostrip.patch" |
| 40 |
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" |
| 41 |
@@ -87,7 +88,7 @@ MULTILIB_CHOST_TOOLS=( |
| 42 |
S="${WORKDIR}/${MY_P}" |
| 43 |
|
| 44 |
pkg_setup() { |
| 45 |
- enewgroup lp |
| 46 |
+ #enewgroup lp -> acct-group/lp |
| 47 |
enewuser lp -1 -1 -1 lp |
| 48 |
enewgroup lpadmin 106 |
| 49 |
|
| 50 |
@@ -132,6 +133,10 @@ src_prepare() { |
| 51 |
# Fix install-sh, posix sh does not have 'function'. |
| 52 |
sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" |
| 53 |
|
| 54 |
+ # Do not add -Werror even for live ebuilds |
| 55 |
+ sed '/WARNING_OPTIONS/s@-Werror@@' \ |
| 56 |
+ -i config-scripts/cups-compiler.m4 || die |
| 57 |
+ |
| 58 |
AT_M4DIR=config-scripts eaclocal |
| 59 |
eautoconf |
| 60 |
|
| 61 |
@@ -234,10 +239,11 @@ multilib_src_install_all() { |
| 62 |
rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} |
| 63 |
|
| 64 |
# install our init script |
| 65 |
- local neededservices |
| 66 |
- use zeroconf && neededservices+=" avahi-daemon" |
| 67 |
- use dbus && neededservices+=" dbus" |
| 68 |
- [[ -n ${neededservices} ]] && neededservices="need${neededservices}" |
| 69 |
+ local neededservices=( |
| 70 |
+ $(usex zeroconf avahi-daemon '') |
| 71 |
+ $(usex dbus dbus '') |
| 72 |
+ ) |
| 73 |
+ [[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}" |
| 74 |
cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die |
| 75 |
sed -i \ |
| 76 |
-e "s/@neededservices@/${neededservices}/" \ |
Archives