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 | 3a47a29bef53ae0ef76d03cd928f001cde2d4d62 (patch) | |
| tree | 8da0c86e738ee68a4f4a67cd951a8ed03f2070a8 /net-voip | |
| parent | Add patch from Bob Johnson to enable build with x11-libs/wxGTK[odbc] (bug #28... (diff) | |
| download | historical-3a47a29bef53ae0ef76d03cd928f001cde2d4d62.tar.gz historical-3a47a29bef53ae0ef76d03cd928f001cde2d4d62.tar.bz2 historical-3a47a29bef53ae0ef76d03cd928f001cde2d4d62.zip | |
Warn instead of dying when USE="kontact -kde".
Fix bug 282862.
Package-Manager: portage-14103-svn/cvs/Linux ppc
Diffstat (limited to 'net-voip')
| -rw-r--r-- | net-voip/ekiga/ChangeLog | 5 | ||||
| -rw-r--r-- | net-voip/ekiga/Manifest | 4 | ||||
| -rw-r--r-- | net-voip/ekiga/ekiga-3.2.5-r2.ebuild | 13 |
3 files changed, 14 insertions, 8 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/Manifest b/net-voip/ekiga/Manifest index 274f9d862885..91dd86deb575 100644 --- a/net-voip/ekiga/Manifest +++ b/net-voip/ekiga/Manifest @@ -6,6 +6,6 @@ AUX not-gnome.patch 413 RMD160 571716d78f27b192ed36e5259d676ed4320bf1bd SHA1 1f1 DIST ekiga-2.0.12.tar.bz2 6109264 RMD160 04ee5c8a878650b545e9e2a547a08dde4e7be3c8 SHA1 e80a2dae4541708768ac8c38ebb1452a2d0911d4 SHA256 5747802480b44a3cde8fd52f381b1761db52354d74fce7df380a2fbaa71910e9 DIST ekiga-3.2.5.tar.bz2 7714135 RMD160 5792890c13d376242defd0757a67c8aa7772ae23 SHA1 fc8b9ed0492ebc083655cf706048032e552d347f SHA256 6a624b741b110b5b1d9cdff8179760f52b0a623bf597b8e6be757fc18af20a4c EBUILD ekiga-2.0.12.ebuild 2373 RMD160 99cd6a5f486123ee6670034cff4abac1834889b3 SHA1 033920369d95b35f6a8d00663e8c2b9ee13dc729 SHA256 ef951f5be624e6f75621400c2921f9cc5cfdb3d76fd8abcb7ffe833840bdb38a -EBUILD ekiga-3.2.5-r2.ebuild 5354 RMD160 7f21ec3ddd79cf0eb61c4a7e465a3ee34395526f SHA1 d1ec2bcb354c641fe3bd2ead45c385ccdbe9c23a SHA256 99a1e056441e36a5c8f65304b41e701a222a015f68a3cafbc7f2706243877cd5 -MISC ChangeLog 10036 RMD160 775847b5c48f955bffbe028d650f1211663a36ee SHA1 9b896c53032fc8171bf7ed2162cba853459b78e0 SHA256 e06f9b5f35df164cb3eb05cea1f022e72dacf2130d349256d3e91657c89da31e +EBUILD ekiga-3.2.5-r2.ebuild 5379 RMD160 332a146694988203b14904611d121475f66a7dd6 SHA1 957ee41e8cd6e1593f110e82bfdc55e7adc15ab7 SHA256 9b82b1200135b9cd9d7f020f0d77d56a19fd7b42499d74fde9dcc243eb2d6741 +MISC ChangeLog 10175 RMD160 4bd3a9c62acb54399f70df22598a94dee137fd5a SHA1 791323bbf6dc1254c074d66910fe931646acd01a SHA256 42b3176958124c8f453b9c35133d378eb12f6392613e7805dc340f0826980ae8 MISC metadata.xml 572 RMD160 ed1c0b6f7b51be67aa96c2c5c042fbef023c6a72 SHA1 33e80a99b5ad43d02439c5454f594adb961307d8 SHA256 6c1b059a423b06dae8acda431a06e0a80568b3fce52d6c9d42cceddc2325a8b2 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() { |