summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-05-22 15:58:07 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-05-22 15:58:07 +0000
commitb1c17b8c981bdb4d6bc7375c5aec2bb250b7936e (patch)
tree24ced00c3ce5afa5dc42bd27e0eb50e831422f93 /net-libs/libjingle
parentthis revbump adds the execve patch for exg in bug #118508, the cracklib suppo... (diff)
downloadgentoo-2-b1c17b8c981bdb4d6bc7375c5aec2bb250b7936e.tar.gz
gentoo-2-b1c17b8c981bdb4d6bc7375c5aec2bb250b7936e.tar.bz2
gentoo-2-b1c17b8c981bdb4d6bc7375c5aec2bb250b7936e.zip
Make ortp depend really optional and do not always enable-libjingle thanks to epix in irc.
(Portage version: 2.1_rc1-r2)
Diffstat (limited to 'net-libs/libjingle')
-rw-r--r--net-libs/libjingle/ChangeLog7
-rw-r--r--net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild16
2 files changed, 15 insertions, 8 deletions
diff --git a/net-libs/libjingle/ChangeLog b/net-libs/libjingle/ChangeLog
index 4cad1b56640b..4d185640a7e7 100644
--- a/net-libs/libjingle/ChangeLog
+++ b/net-libs/libjingle/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-libs/libjingle
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/ChangeLog,v 1.1 2006/05/21 14:42:43 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/ChangeLog,v 1.2 2006/05/22 15:58:07 genstef Exp $
+
+ 22 May 2006; Stefan Schweizer <genstef@gentoo.org>
+ libjingle-0.3.0_p20060508.ebuild:
+ Make ortp depend really optional and do not always enable-libjingle thanks
+ to epix in irc.
*libjingle-0.3.0_p20060508 (21 May 2006)
diff --git a/net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild b/net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild
index 1739fb450570..82227da5a92a 100644
--- a/net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild
+++ b/net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild,v 1.1 2006/05/21 14:42:43 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libjingle/libjingle-0.3.0_p20060508.ebuild,v 1.2 2006/05/22 15:58:07 genstef Exp $
inherit autotools
@@ -14,11 +14,13 @@ KEYWORDS="~x86"
IUSE="speex ilbc ortp"
SLOT="0"
-RDEPEND="dev-libs/openssl"
+RDEPEND="dev-libs/openssl
+ ortp? (
+ ~net-libs/ortp-0.7.1
+ ilbc? ( dev-libs/ilbc-rfc3951 )
+ speex? ( media-libs/speex )
+ )"
DEPEND="${RDEPEND}
- ilbc? ( dev-libs/ilbc-rfc3951 )
- speex? ( media-libs/speex )
- ortp? ( ~net-libs/ortp-0.7.1 )
dev-util/pkgconfig"
src_compile() {
@@ -29,10 +31,10 @@ src_compile() {
sed -i "s:libmediastreamer_la_LIBADD.*:\0 \$(SPEEX_CFLAGS):" talk/third_party/mediastreamer/Makefile.am || die
eautoreconf || die "eautoreconf failed"
- econf --enable-linphone \
+ econf $(use_enable ortp linphone) \
+ $(use_enable ortp) \
$(use_with ilbc) \
$(use_with speex) \
- $(use_enable ortp) \
--disable-examples || die "econf failed"
emake || die "emake failed"
}