Lines 13-19
Link Here
|
13 |
LICENSE="GPL-2 LGPL-2" |
13 |
LICENSE="GPL-2 LGPL-2" |
14 |
SLOT="3.5" |
14 |
SLOT="3.5" |
15 |
KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd" |
15 |
KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd" |
16 |
IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl openexr spell ssl tiff zeroconf" |
16 |
IUSE="acl alsa arts avahi cups doc jpeg2k kerberos legacyssl openexr spell ssl tiff zeroconf" |
17 |
|
17 |
|
18 |
# kde.eclass has kdelibs in DEPEND, and we can't have that in here. |
18 |
# kde.eclass has kdelibs in DEPEND, and we can't have that in here. |
19 |
# so we recreate the entire DEPEND from scratch. |
19 |
# so we recreate the entire DEPEND from scratch. |
Lines 40-46
Link Here
|
40 |
openexr? ( >=media-libs/openexr-1.2 ) |
40 |
openexr? ( >=media-libs/openexr-1.2 ) |
41 |
spell? ( || ( ( app-text/aspell app-dicts/aspell-en ) |
41 |
spell? ( || ( ( app-text/aspell app-dicts/aspell-en ) |
42 |
app-text/ispell ) ) |
42 |
app-text/ispell ) ) |
43 |
zeroconf? ( net-misc/mDNSResponder ) |
43 |
zeroconf? ( !avahi? ( net-misc/mDNSResponder ) ) |
44 |
virtual/fam |
44 |
virtual/fam |
45 |
virtual/ghostscript" |
45 |
virtual/ghostscript" |
46 |
|
46 |
|
Lines 52-57
Link Here
|
52 |
RDEPEND="${RDEPEND} |
52 |
RDEPEND="${RDEPEND} |
53 |
|| ( x11-apps/rgb virtual/x11 )" |
53 |
|| ( x11-apps/rgb virtual/x11 )" |
54 |
|
54 |
|
|
|
55 |
PDEPEND="avahi? ( kde-base/kdnssd-avahi )" |
56 |
|
55 |
PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch |
57 |
PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch |
56 |
${FILESDIR}/${PN}-3.5.0-kicker-crash.patch |
58 |
${FILESDIR}/${PN}-3.5.0-kicker-crash.patch |
57 |
${FILESDIR}/${P}-xorg7-rgbtxt.patch |
59 |
${FILESDIR}/${P}-xorg7-rgbtxt.patch |
Lines 99-106
Link Here
|
99 |
$(use_with alsa) $(use_with arts) |
101 |
$(use_with alsa) $(use_with arts) |
100 |
$(use_with kerberos gssapi) $(use_with tiff) |
102 |
$(use_with kerberos gssapi) $(use_with tiff) |
101 |
$(use_with jpeg2k jasper) $(use_with openexr) |
103 |
$(use_with jpeg2k jasper) $(use_with openexr) |
102 |
$(use_enable cups) $(use_enable zeroconf dnssd) |
104 |
$(use_enable cups) --without-hspell" |
103 |
--without-hspell" |
105 |
|
|
|
106 |
if use zeroconf && ! use avahi; then |
107 |
myconf="${myconf} --enable-dnssd" |
108 |
else |
109 |
myconf="${myconf} --disable-dnssd" |
110 |
fi |
104 |
|
111 |
|
105 |
if use spell && has_version app-text/aspell; then |
112 |
if use spell && has_version app-text/aspell; then |
106 |
myconf="${myconf} --with-aspell" |
113 |
myconf="${myconf} --with-aspell" |