diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2019-08-23 23:20:37 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2019-08-23 23:21:04 +0200 |
| commit | 77f0f3548548aaf42508f4cdcdf03404fe6f02b6 (patch) | |
| tree | 446f4cb7d176dd78bcde0111b125be91179e5ebc /net-print | |
| parent | net-dns/nsd: Removed old (diff) | |
| download | gentoo-77f0f3548548aaf42508f4cdcdf03404fe6f02b6.tar.gz gentoo-77f0f3548548aaf42508f4cdcdf03404fe6f02b6.tar.bz2 gentoo-77f0f3548548aaf42508f4cdcdf03404fe6f02b6.zip | |
net-print/cups: Bump to version 2.3.0. Removed old.
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/Manifest | 2 | ||||
| -rw-r--r-- | net-print/cups/cups-2.3.0.ebuild (renamed from net-print/cups/cups-2.3_rc1.ebuild) | 18 |
2 files changed, 13 insertions, 7 deletions
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 9b4b65639147..b9b923a3fe7a 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -1,3 +1,3 @@ DIST cups-2.2.11-source.tar.gz 10405908 BLAKE2B 9b7ee4da9502e42fd1b4a2c57ab709b3127ee8aeb8481a52f37da19fe5578f406260f1551e3fcedcd3a828fbed69267e68fcfd7bfabadf65afce4c3af19b4a1f SHA512 21a6916041b50044d336871f10d1192635458a3d318f19a18ad21d27027dd3839400601019e758424c218225a34aba148ba3a57f0ce3fe14c4df03bd1fde3403 DIST cups-2.2.12-source.tar.gz 10409313 BLAKE2B 126ea81f7108b3b62f5e062ed522898dd48d4e5b4077c834e8fe89012445dd0a903bafa62f593551ed5f1c92cce4fbd22f56834e0615ed65ca4a6ae84dc2ca1c SHA512 b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6 -DIST cups-2.3rc1-source.tar.gz 7926640 BLAKE2B c39bee2c4697eb540cfa02ee2ce0fa8a79d7efd0a7e65db19fada8473997841e5c341c209eba8eb242e57bb21b0dbded1ca340654874b9400318ed2d9332b890 SHA512 d2411c1da576bd7d561c5465fba0824af86d7b52792482d90876847d0869a5a092de12efc761fd403c74be072c6d6eb5bf407525f187051683dba694e5f7febd +DIST cups-2.3.0-source.tar.gz 8129049 BLAKE2B 738dbc7ee5ddcc9ffee44083cd93d8a0e75f4d3bf0b704dd643dc59db2cc2381dd65f676c0979bc65fee03438d160d9d650ceb93f8c702102eb1449d306a81a3 SHA512 c51f173b5fbae1554a3f4a3786fb3b5566e50d9f775473788ee3553922ac7e02e4785492c87c93fd46f159f50d97cc10ff6feafb3397cd9c1840840f3a9cdfae diff --git a/net-print/cups/cups-2.3_rc1.ebuild b/net-print/cups/cups-2.3.0.ebuild index 2252272dc810..b2da32a36b26 100644 --- a/net-print/cups/cups-2.3_rc1.ebuild +++ b/net-print/cups/cups-2.3.0.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}/" \ |