Make ortp depend really optional and do not always enable-libjingle thanks to epix in irc.

Package-Manager: portage-2.1_rc1-r2

3 files changed, 26 insertions, 19 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/Manifest b/net-libs/libjingle/Manifest
index cba22ae9b7c3..e26c7ebcb020 100644
--- a/net-libs/libjingle/Manifest
+++ b/net-libs/libjingle/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST libjingle-0.3.0_p20060508.tar.bz2 255837 RMD160 9ea53904b7da28f12fc4489dec64de5928017589 SHA256 63632413cedbc03ec239c1126a483c00b7a2ad50443f222d1cf84cc5903cd280 size 255837
-EBUILD libjingle-0.3.0_p20060508.ebuild 1459 RMD160 886bbaf98b483eb0f47fdb255c6ba6dd1379e39d SHA1 ea5f26ac0706e341b16ca901b028bc0f085fe24a SHA256 e3413b8a1aff7b8231b484ab238ffcf7f2f81a6291b7fee63b4b1ad5667d6d89 size 1459
-MD5 0cdbfd69017610a2c289376317477bc3 libjingle-0.3.0_p20060508.ebuild 1459
-RMD160 886bbaf98b483eb0f47fdb255c6ba6dd1379e39d libjingle-0.3.0_p20060508.ebuild 1459
-SHA256 e3413b8a1aff7b8231b484ab238ffcf7f2f81a6291b7fee63b4b1ad5667d6d89 libjingle-0.3.0_p20060508.ebuild 1459
-MISC ChangeLog 459 RMD160 575d9dfd2d530105f331ab326f9564f03e3714bb SHA1 905d5e426c4c90237644e34ca41d571168b515f1 SHA256 40162029bb99b1a6445f29d462f0c71509f0fdd194215bdc1bf7cae690b7487b size 459
-MD5 b04ad7aa0323ca844cbeb2e2a645139f ChangeLog 459
-RMD160 575d9dfd2d530105f331ab326f9564f03e3714bb ChangeLog 459
-SHA256 40162029bb99b1a6445f29d462f0c71509f0fdd194215bdc1bf7cae690b7487b ChangeLog 459
+EBUILD libjingle-0.3.0_p20060508.ebuild 1475 RMD160 af5fd447258a016c7dae8c12dfc5837951b53b6c SHA1 2791a382d9bf949d20a7d4af1202453b5fe9659e SHA256 4ea1a06ece328747a4ca2584155f5bc6624da3f94c07960324b5a4dbb1736460 size 1475
+MD5 b926622ef7f18c5d344e739ac3890ee7 libjingle-0.3.0_p20060508.ebuild 1475
+RMD160 af5fd447258a016c7dae8c12dfc5837951b53b6c libjingle-0.3.0_p20060508.ebuild 1475
+SHA256 4ea1a06ece328747a4ca2584155f5bc6624da3f94c07960324b5a4dbb1736460 libjingle-0.3.0_p20060508.ebuild 1475
+MISC ChangeLog 644 RMD160 9bbfac9d9d138dc9d08c8451a323548a88a9de15 SHA1 19ae94048facef35a01110fe31298dab9af9ee99 SHA256 7c5262fbe5e75e5399c3c1a77a0605b050469108724cfb580160d4e4888cc9d3 size 644
+MD5 12cbda22592d5ca786d96808d4aae8a0 ChangeLog 644
+RMD160 9bbfac9d9d138dc9d08c8451a323548a88a9de15 ChangeLog 644
+SHA256 7c5262fbe5e75e5399c3c1a77a0605b050469108724cfb580160d4e4888cc9d3 ChangeLog 644
 MISC metadata.xml 252 RMD160 2bdf45f14b53a5560dbef91ae921bcdad16f54a9 SHA1 29708c7608f219747a539e2f9685a1830db94213 SHA256 fab6485f67a6b64cd62096d04d11c86ffd7a79d603b755e9aff8a023b13cb37c size 252
 MD5 39b14f9ca843493f4bc6bf376951713d metadata.xml 252
 RMD160 2bdf45f14b53a5560dbef91ae921bcdad16f54a9 metadata.xml 252
@@ -20,7 +20,7 @@ SHA256 ad1b2060231cae4945d921c04b8807fae7d9b829ff86d095c98e82f1650a17b5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEcHxpNJowsmZ/PzARAtzHAJ4mlqtIbSl3Deb9qcijl3zVqCpT+wCeIyLE
-YTfxtmOpmNEVIIf1swLrm9g=
-=C9ti
+iD8DBQFEcd+UNJowsmZ/PzARAs+UAKCWR8pVL3GZ2Y6ozOBLG42pllVTpQCgxtN7
+d6xDUCp/SH+8JJa8C4/VPYY=
+=7skO
 -----END PGP SIGNATURE-----
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"
 }