Merge rfc4175 USE flag with video.

(Portage version: 14103-svn/cvs/Linux ppc)

3 files changed, 10 insertions, 13 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 0bdeac748b5c..06fa47189f8e 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/opal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.50 2009/09/11 15:28:23 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.51 2009/09/11 22:25:01 volkmar Exp $
+
+  11 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> opal-3.6.4.ebuild,
+  metadata.xml:
+  Merge rfc4175 USE flag with video.
 
   11 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> opal-3.6.4.ebuild:
   Warning instead of dying when USE="-x264 x265-static"
diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
index 3de6baa7f519..a2fd4da3fc3d 100644
--- a/net-libs/opal/metadata.xml
+++ b/net-libs/opal/metadata.xml
@@ -20,8 +20,6 @@
 		<flag name="ixj">Enable xJack cards support</flag>
 		<flag name="lid">Enable Line Interface Device</flag>
 		<flag name="plugins">Enable plugins support</flag>
-		<flag name="rfc4175">Enable RTP Payload Format for Uncompressed Video
-		</flag>
 		<flag name="sbc">Enable the Bluetooth low-complexity, SubBand Codec
 		</flag>
 		<flag name="sip">Enable Session Initiation Protocol</flag>
diff --git a/net-libs/opal/opal-3.6.4.ebuild b/net-libs/opal/opal-3.6.4.ebuild
index 969e335cc282..4317f497c22a 100644
--- a/net-libs/opal/opal-3.6.4.ebuild
+++ b/net-libs/opal/opal-3.6.4.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-libs/opal/opal-3.6.4.ebuild,v 1.2 2009/09/11 15:28:23 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.4.ebuild,v 1.3 2009/09/11 22:25:01 volkmar Exp $
 
 EAPI="2"
 
@@ -15,8 +15,8 @@ LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE="+audio capi debug dns doc dtmf examples fax ffmpeg h224 h281 h323 iax ipv6
-ivr ixj java ldap lid +plugins rfc4175 sbc sip sipim srtp ssl stats swig theora
-+video vpb vxml wav x264 x264-static xml"
+ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl stats swig theora +video
+vpb vxml wav x264 x264-static xml"
 
 RDEPEND=">=net-libs/ptlib-2.0.0[stun,url,debug=,audio?,dns?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
 	>=media-libs/speex-1.2_beta
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
 # OPALDIR should not be used anymore but if a package still need it, create it
 
 # TODO:
+# remove h281, maybe sipim and dns
 # force or merge some non-plugin USE flags wo/ deps ?
 # celt is not in the tree and should be added
 
@@ -70,11 +71,6 @@ pkg_setup() {
 
 	# stop emerge if a conditional use flag is not respected
 
-	if use rfc4175 && ! use video; then
-		conditional_use_error_msg "rfc4175" "video"
-		use_error=true
-	fi
-
 	if use h281 && ! use h224; then
 		conditional_use_error_msg "h281" "h224"
 		use_error=true
@@ -213,12 +209,11 @@ src_configure() {
 		$(use_enable java) \
 		$(use_enable lid) \
 		$(use_enable plugins) \
-		$(use_enable rfc4175) \
 		$(use_enable sbc) \
 		$(use_enable sip) \
 		$(use_enable sipim) \
 		$(use_enable stats statistics) \
-		$(use_enable video) \
+		$(use_enable video) $(use_enable video rfc4175) \
 		$(use_enable vpb) \
 		$(use_enable x264 h264) \
 		$(use_enable x264-static x264-link-static) \