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

Collapse All | Expand All

(-)a/cups-1.5.2-r2.ebuild (-2 / +10 lines)
Lines 21-27 SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2 Link Here
21
LICENSE="GPL-2"
21
LICENSE="GPL-2"
22
SLOT="0"
22
SLOT="0"
23
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
23
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
24
IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl +png python slp +ssl static-libs +threads +tiff usb X xinetd"
24
IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl
25
	+png python slp +ssl static-libs systemd +threads +tiff usb X xinetd"
25
26
26
LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
27
LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
27
for X in ${LANGS} ; do
28
for X in ${LANGS} ; do
Lines 52-57 RDEPEND=" Link Here
52
		)
53
		)
53
		!gnutls? ( >=dev-libs/openssl-0.9.8g )
54
		!gnutls? ( >=dev-libs/openssl-0.9.8g )
54
	)
55
	)
56
	systemd? ( sys-apps/systemd )
55
	tiff? ( >=media-libs/tiff-3.5.5:0 )
57
	tiff? ( >=media-libs/tiff-3.5.5:0 )
56
	usb? ( virtual/libusb:0 )
58
	usb? ( virtual/libusb:0 )
57
	X? ( x11-misc/xdg-utils )
59
	X? ( x11-misc/xdg-utils )
Lines 199-205 src_configure() { Link Here
199
		$(use_with xinetd xinetd /etc/xinetd.d) \
201
		$(use_with xinetd xinetd /etc/xinetd.d) \
200
		--enable-libpaper \
202
		--enable-libpaper \
201
		--disable-dnssd \
203
		--disable-dnssd \
202
		$(systemd_with_unitdir) \
204
		$(use_with systemd systemdsystemunitdir "$(systemd_get_unitdir)") \
203
		${myconf}
205
		${myconf}
204
206
205
	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
207
	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
Lines 269-274 src_install() { Link Here
269
271
270
	# create /etc/cups/client.conf, bug #196967 and #266678
272
	# create /etc/cups/client.conf, bug #196967 and #266678
271
	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
273
	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
274
275
	# With USE=systemd, the unit files are installed by autotools.
276
	# Without it, non-socket service files are still useful.
277
	if ! use systemd; then
278
		systemd_dounit data/cups.path data/cups.service
279
	fi
272
}
280
}
273
281
274
pkg_preinst() {
282
pkg_preinst() {
(-)a/metadata.xml (-1 / +3 lines)
Lines 18-22 Link Here
18
    <flag name='java'>
18
    <flag name='java'>
19
      Add support for the Java interpeter in the web server CGIs.
19
      Add support for the Java interpeter in the web server CGIs.
20
    </flag>
20
    </flag>
21
    <flag name='systemd'>
22
      Add support for systemd socket activation.
23
    </flag>
21
  </use>
24
  </use>
22
</pkgmetadata>
25
</pkgmetadata>
23
- 

Return to bug 407975