Merge rfc4175 USE flag with video.

Package-Manager: portage-14103-svn/cvs/Linux ppc

4 files changed, 13 insertions, 16 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/Manifest b/net-libs/opal/Manifest
index f9f3979bb9f8..b52ddf235117 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -4,6 +4,6 @@ DIST opal-2.2.11.tar.gz 4165191 RMD160 7ef2d505cc52eca9136ca10a865c7b7f3a8dc2b5
 DIST opal-3.6.4-htmldoc.tar.bz2 5844646 RMD160 0fd63fa69d443f8aa0778470d2c28d62d7351749 SHA1 42478f4ace029df1989649b3cbb9eb4a6f9baf5b SHA256 0e978f8b4175ff477491726750f615f9bfdbc05834432e88306493d2f1496c4e
 DIST opal-3.6.4.tar.bz2 7059671 RMD160 c0c6aa17aef0051d0b9fb2e794c163fbabe4bac9 SHA1 65c7462a0aa58720f1c0b6a2f3347527bd9aea8d SHA256 b1fb3bad0c8581b82f0da9c69673f43ad9aed7868a7e4f2a68c6c72ed656237b
 EBUILD opal-2.2.11.ebuild 2615 RMD160 5813bfa6dfec68fd1b53b0d1e27627b159b458f8 SHA1 4b3f79d487aa433eaf1eea0445cfe800fc0a0c49 SHA256 e593cb9a845b95ad728f75f0be0f906f0fad7e55fc55c061cb0dcf34f0409d80
-EBUILD opal-3.6.4.ebuild 8376 RMD160 8aba6b9e699cd2ec7eda3d6411ac8d22b349f257 SHA1 f03a1818ac8fb9b911c42e56e4216c43c16c1210 SHA256 527df174713a6ec1ff699b9109dcf4f2cb099b488ae1e585f88011f49a64add2
-MISC ChangeLog 6330 RMD160 633e1015177314beee87fd095a4e5d13c58d837e SHA1 5e84aad2730bb7ef71da3d76613770ebe048623b SHA256 ca28f4b8d6b3ab4f449f5e02979234bfd1acaea0334b4c6538ca2c90d9a0c9ee
-MISC metadata.xml 2134 RMD160 dff91836c6fccbef35dd686578181e81968de197 SHA1 bb1bf80994438405e437af6e773cd2a3016c262a SHA256 67ed42267461216c9cc592e0629e6743f415efd20715074b170681b7404ec04b
+EBUILD opal-3.6.4.ebuild 8300 RMD160 07c588062e1c1803efae325cda2c1e1a65364e0f SHA1 52d8b5a0ad6fc109bb8d37e85c5379c16028912f SHA256 b8f5224c4253680cfae7fccf683bdbdedb09717e4bc60421170aa5bb24ad8668
+MISC ChangeLog 6454 RMD160 aad1ebd962ca3c3f57d92f022697fcfaf4cd2224 SHA1 dc3feaf9ef22bc418a16bccda7ec7c5066c81b23 SHA256 e0530560497a19a4fb0b6dbff1804ee27d9a2d710c49400af2a1b795951f352d
+MISC metadata.xml 2052 RMD160 d98c60f39ab8f053e86f2ac2d6f42f30eba0aff0 SHA1 5355a34be91238e49dc54881612afe1c8af921d5 SHA256 c1bd91b5974edbb8cde22f5a4c5160245c00d66cdb674fc2acbe5fccda76d5cd
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) \