diff options
| author |   Mounir Lamouri <volkmar@gentoo.org> | 2009-09-22 21:59:22 +0000 |
|---|---|---|
| committer | Mounir Lamouri <volkmar@gentoo.org> | 2009-09-22 21:59:22 +0000 |
| commit | 2f7cea61cdfc8416bff307caee444038cc21f3a9 (patch) | |
| tree | c377c335e5bf9277f5caa7a4b86dd1d4dcd3dc4c /net-voip | |
| parent | Add patch from Bob Johnson to enable build with x11-libs/wxGTK[odbc] (bug #28... (diff) | |
| download | gentoo-2-2f7cea61cdfc8416bff307caee444038cc21f3a9.tar.gz gentoo-2-2f7cea61cdfc8416bff307caee444038cc21f3a9.tar.bz2 gentoo-2-2f7cea61cdfc8416bff307caee444038cc21f3a9.zip | |
Warn instead of dying when USE="kontact -kde".
Fix bug 282862.
(Portage version: 14103-svn/cvs/Linux ppc)
Diffstat (limited to 'net-voip')
| -rw-r--r-- | net-voip/ekiga/ChangeLog | 5 | ||||
| -rw-r--r-- | net-voip/ekiga/ekiga-3.2.5-r2.ebuild | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/net-voip/ekiga/ChangeLog b/net-voip/ekiga/ChangeLog index aebcf7221db4..c096a6c0593f 100644 --- a/net-voip/ekiga/ChangeLog +++ b/net-voip/ekiga/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-voip/ekiga # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.11 2009/09/10 17:00:34 volkmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.12 2009/09/22 21:59:22 volkmar Exp $ + + 22 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> ekiga-3.2.5-r2.ebuild: + Warn instead of dying when USE="kontact -kde". Fix bug 282862 10 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> ekiga-3.2.5-r2.ebuild: Compatibility with kdeprefix. Fix bug 283033 diff --git a/net-voip/ekiga/ekiga-3.2.5-r2.ebuild b/net-voip/ekiga/ekiga-3.2.5-r2.ebuild index 7975f138882f..ff72d4a1c29a 100644 --- a/net-voip/ekiga/ekiga-3.2.5-r2.ebuild +++ b/net-voip/ekiga/ekiga-3.2.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-3.2.5-r2.ebuild,v 1.2 2009/09/10 17:00:34 volkmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-3.2.5-r2.ebuild,v 1.3 2009/09/22 21:59:22 volkmar Exp $ EAPI="2" @@ -66,14 +66,16 @@ DOCS="AUTHORS ChangeLog FAQ MAINTAINERS NEWS README TODO" # contact ekiga team to be sure intltool and gettext are not nls deps pkg_setup() { + forceconf="" + if use kde; then kde4-base_pkg_setup fi if use kontact && ! use kde; then - eerror "To enable kontact USE flag, you need kde USE flag to be enabled" - eerror "Please, enable kde or disable kontact and re-emerge ${PN}." - die "You need to enable kde or disable kontact." + ewarn "To enable kontact USE flag, you need kde USE flag to be enabled." + ewarn "If you need kontact support, please, re-emerge with kde enabled." + forceconf="${forceconf} --disable-kab" fi # update scrollkeeper database if doc has been enabled @@ -111,7 +113,8 @@ pkg_setup() { $(use_enable shm) $(use_enable static static-libs) $(use_enable xcap) - $(use_enable xv)" + $(use_enable xv) + ${forceconf}" } src_prepare() { |