Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 829920 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-16 / +11 lines)
Line  Link Here
0
-- cups-2.3.3_p2-r3.ebuild
0
++ cups-2.4.0.ebuild
Lines 28-36 Link Here
28
28
29
LICENSE="Apache-2.0"
29
LICENSE="Apache-2.0"
30
SLOT="0"
30
SLOT="0"
31
IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
31
IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd usb X xinetd zeroconf"
32
32
33
REQUIRED_USE="usb? ( threads )"
34
# upstream includes an interactive test which is a nono for gentoo
33
# upstream includes an interactive test which is a nono for gentoo
35
RESTRICT="test"
34
RESTRICT="test"
36
35
Lines 67-80 Link Here
67
PDEPEND=">=net-print/cups-filters-1.0.43"
66
PDEPEND=">=net-print/cups-filters-1.0.43"
68
67
69
PATCHES=(
68
PATCHES=(
70
	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
69
	"${FILESDIR}/${PN}-2.4_rc1-nostrip.patch"
71
	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
70
	"${FILESDIR}/${PN}-2.4_rc1-user-AR.patch"
72
	"${FILESDIR}/${PN}-2.3.3-user-AR.patch"
71
73
	# Upstream patches (from Debian and Fedora)
72
	# https://github.com/OpenPrinting/cups/issues/299
74
	"${FILESDIR}/${PN}-2.3.3-timeout.patch"
73
	"${FILESDIR}/${P}-empty_webUI_de.patch"
75
	"${FILESDIR}/${PN}-2.3.3-enforcing-read-limits.patch"
76
	"${FILESDIR}/${PN}-2.3.3-manpage.patch"
77
	"${FILESDIR}/${PN}-2.3.3-ipp-retry-validate.patch"
78
)
74
)
79
75
80
MULTILIB_CHOST_TOOLS=(
76
MULTILIB_CHOST_TOOLS=(
Lines 169-180 Link Here
169
		$(use_enable kerberos gssapi)
165
		$(use_enable kerberos gssapi)
170
		$(multilib_native_use_enable pam)
166
		$(multilib_native_use_enable pam)
171
		$(use_enable static-libs static)
167
		$(use_enable static-libs static)
172
		$(use_enable threads)
168
		$(use_with ssl tls gnutls)
173
		$(use_enable ssl gnutls)
169
		$(use_with systemd)
174
		$(use_enable systemd)
170
		$(use_with systemd ondemand systemd)
175
		$(multilib_native_use_enable usb libusb)
171
		$(multilib_native_use_enable usb libusb)
176
		$(use_enable zeroconf avahi)
172
		$(use_enable zeroconf dnssd avahi)
177
		--disable-dnssd
178
		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
173
		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
179
	)
174
	)
180
175

Return to bug 829920