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

Collapse All | Expand All

(-)/usr/portage/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild (-7 / +8 lines)
Lines 14-20 Link Here
14
LICENSE="GPL-2 LGPL-2"
14
LICENSE="GPL-2 LGPL-2"
15
SLOT="3.5"
15
SLOT="3.5"
16
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
16
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
17
IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
17
IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
18
avahi kernel_linux fam lua kdehiddenvisibility"
18
avahi kernel_linux fam lua kdehiddenvisibility"
19
19
20
# Added aspell-en as dependency to work around bug 131512.
20
# Added aspell-en as dependency to work around bug 131512.
Lines 37-43 Link Here
37
	kerberos? ( virtual/krb5 )
37
	kerberos? ( virtual/krb5 )
38
	jpeg2k? ( media-libs/jasper )
38
	jpeg2k? ( media-libs/jasper )
39
	openexr? ( >=media-libs/openexr-1.2.2-r2 )
39
	openexr? ( >=media-libs/openexr-1.2.2-r2 )
40
	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
40
	!avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
41
	fam? ( virtual/fam )
41
	fam? ( virtual/fam )
42
	virtual/ghostscript
42
	virtual/ghostscript
43
	utempter? ( sys-libs/libutempter )
43
	utempter? ( sys-libs/libutempter )
Lines 55-61 Link Here
55
	x11-apps/rgb
55
	x11-apps/rgb
56
	x11-apps/iceauth"
56
	x11-apps/iceauth"
57
57
58
PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
58
PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
59
	    bindist? ( kde-misc/kdnssd-avahi )"
59
60
60
# Testing code is rather broken and merely for developer purposes, so disable it.
61
# Testing code is rather broken and merely for developer purposes, so disable it.
61
RESTRICT="test"
62
RESTRICT="test"
Lines 125-134 Link Here
125
			$(use_enable kernel_linux sendfile) --enable-mitshm
126
			$(use_enable kernel_linux sendfile) --enable-mitshm
126
			$(use_with spell aspell)"
127
			$(use_with spell aspell)"
127
128
128
	if ! use avahi; then
129
	if use avahi || use bindist ; then
129
		myconf="${myconf} --enable-dnssd"
130
	else
131
		myconf="${myconf} --disable-dnssd"
130
		myconf="${myconf} --disable-dnssd"
131
	else
132
		myconf="${myconf} --enable-dnssd"
132
	fi
133
	fi
133
134
134
	if has_version x11-apps/rgb; then
135
	if has_version x11-apps/rgb; then
Lines 167-173 Link Here
167
	fi
168
	fi
168
169
169
	# Get rid of the disabled version of the kdnsd libraries
170
	# Get rid of the disabled version of the kdnsd libraries
170
	if use avahi; then
171
	if use avahi || use bindist ; then
171
		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
172
		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
172
	fi
173
	fi
173
174

Return to bug 198762