diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2019-08-16 20:15:39 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2019-08-16 20:27:04 +0200 |
| commit | 29c2681979e6f5b04bbc9be60a3b13e63c728c5c (patch) | |
| tree | 3ac63314c1b6e3675860b557d9f9eee2327ff7e3 /net-print/cups | |
| parent | app-misc/rtlamr: adding ~x86 after testing (diff) | |
| download | gentoo-29c2681979e6f5b04bbc9be60a3b13e63c728c5c.tar.gz gentoo-29c2681979e6f5b04bbc9be60a3b13e63c728c5c.tar.bz2 gentoo-29c2681979e6f5b04bbc9be60a3b13e63c728c5c.zip | |
net-print/cups: Synced live ebuild
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-print/cups')
| -rw-r--r-- | net-print/cups/cups-9999.ebuild | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 1a22a0b0ae79..b2da32a36b26 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -55,10 +55,12 @@ CDEPEND=" DEPEND="${CDEPEND}" BDEPEND=" + acct-group/lp >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " RDEPEND="${CDEPEND} + acct-group/lp selinux? ( sec-policy/selinux-cups ) " @@ -73,7 +75,6 @@ RESTRICT="test" # systemd-socket.patch from Fedora PATCHES=( - "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch" "${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch" "${FILESDIR}/${PN}-1.4.4-nostrip.patch" "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" @@ -87,7 +88,7 @@ MULTILIB_CHOST_TOOLS=( S="${WORKDIR}/${MY_P}" pkg_setup() { - enewgroup lp + #enewgroup lp -> acct-group/lp enewuser lp -1 -1 -1 lp enewgroup lpadmin 106 @@ -132,6 +133,10 @@ src_prepare() { # Fix install-sh, posix sh does not have 'function'. sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" + # Do not add -Werror even for live ebuilds + sed '/WARNING_OPTIONS/s@-Werror@@' \ + -i config-scripts/cups-compiler.m4 || die + AT_M4DIR=config-scripts eaclocal eautoconf @@ -234,10 +239,11 @@ multilib_src_install_all() { rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} # install our init script - local neededservices - use zeroconf && neededservices+=" avahi-daemon" - use dbus && neededservices+=" dbus" - [[ -n ${neededservices} ]] && neededservices="need${neededservices}" + local neededservices=( + $(usex zeroconf avahi-daemon '') + $(usex dbus dbus '') + ) + [[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}" cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die sed -i \ -e "s/@neededservices@/${neededservices}/" \ |