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

Collapse All | Expand All

(-)kdelibs-3.5.2-r4.ebuild (-4 / +12 lines)
Lines 12-18 Link Here
12
LICENSE="GPL-2 LGPL-2"
12
LICENSE="GPL-2 LGPL-2"
13
SLOT="3.5"
13
SLOT="3.5"
14
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
14
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
15
IUSE="acl alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf"
15
IUSE="acl alsa arts avahi cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf"
16
16
17
# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
17
# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
18
# so we recreate the entire DEPEND from scratch.
18
# so we recreate the entire DEPEND from scratch.
Lines 37-43 Link Here
37
	openexr? ( >=media-libs/openexr-1.2 )
37
	openexr? ( >=media-libs/openexr-1.2 )
38
	spell? ( || ( app-text/aspell
38
	spell? ( || ( app-text/aspell
39
	              app-text/ispell ) )
39
	              app-text/ispell ) )
40
	zeroconf? ( net-misc/mDNSResponder )
40
	zeroconf? ( !avahi? ( net-misc/mDNSResponder )	)
41
	virtual/fam
41
	virtual/fam
42
	virtual/ghostscript"
42
	virtual/ghostscript"
43
43
Lines 49-54 Link Here
49
RDEPEND="${RDEPEND}
49
RDEPEND="${RDEPEND}
50
	|| ( x11-apps/rgb virtual/x11 )"
50
	|| ( x11-apps/rgb virtual/x11 )"
51
51
52
PDEPEND="avahi? ( kde-base/kdnssd-avahi )"
53
54
52
PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch
55
PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch
53
	${FILESDIR}/${PN}-3.5.0-kicker-crash.patch
56
	${FILESDIR}/${PN}-3.5.0-kicker-crash.patch
54
	${FILESDIR}/${P}-xorg7-rgbtxt.patch
57
	${FILESDIR}/${P}-xorg7-rgbtxt.patch
Lines 70-77 Link Here
70
	        $(use_with alsa) $(use_with arts)
73
	        $(use_with alsa) $(use_with arts)
71
	        $(use_with kerberos gssapi) $(use_with tiff)
74
	        $(use_with kerberos gssapi) $(use_with tiff)
72
	        $(use_with jpeg2k jasper) $(use_with openexr)
75
	        $(use_with jpeg2k jasper) $(use_with openexr)
73
	        $(use_enable cups) $(use_enable zeroconf dnssd)
76
	        $(use_enable cups) --without-hspell"
74
	        --without-hspell"
77
78
	if use zeroconf && ! use avahi; then
79
		myconf="${myconf} --enable-dnssd"
80
	else
81
		myconf="${myconf} --disable-dnssd"
82
	fi
75
83
76
	if use spell && has_version app-text/aspell; then
84
	if use spell && has_version app-text/aspell; then
77
		myconf="${myconf} --with-aspell"
85
		myconf="${myconf} --with-aspell"

Return to bug 118178