Removing USE flags removed from ptlib from ptlib dep.

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

4 files changed, 15 insertions, 20 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 1b66a9ad10c9..3d909accf93c 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.52 2009/09/12 13:59:38 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.53 2009/09/12 20:46:11 volkmar Exp $
+
+  12 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> opal-3.6.4.ebuild,
+  opal-3.6.4-r1.ebuild:
+  Removing USE flags removed from ptlib from ptlib dep.
 
   12 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> +opal-3.6.4.ebuild,
   metadata.xml:
diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
index 6b802c676a4b..3c9538307bec 100644
--- a/net-libs/opal/metadata.xml
+++ b/net-libs/opal/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="audio">Enable audio support</flag>
 		<flag name="capi">Enable CAPI support</flag>
 		<flag name="celt">Enable CELT ultra-low delay audio codec</flag>
-		<flag name="dns">Enable DNS resolver support</flag>
 		<flag name="dtmf">Enable DTMF encoding/decoding support</flag>
 		<flag name="fax">Enable T.38 FAX protocol</flag>
 		<flag name="h224">Enable H.224 real time control protocol</flag>
diff --git a/net-libs/opal/opal-3.6.4-r1.ebuild b/net-libs/opal/opal-3.6.4-r1.ebuild
index 5e78ad35aaa6..1d55b564b531 100644
--- a/net-libs/opal/opal-3.6.4-r1.ebuild
+++ b/net-libs/opal/opal-3.6.4-r1.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-r1.ebuild,v 1.1 2009/09/12 13:59:38 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.4-r1.ebuild,v 1.2 2009/09/12 20:46:11 volkmar Exp $
 
 EAPI="2"
 
@@ -14,11 +14,11 @@ SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
 LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+audio capi celt debug dns doc dtmf examples fax ffmpeg h224 h281 h323 iax
+IUSE="+audio capi celt debug doc dtmf examples fax ffmpeg h224 h281 h323 iax
 ipv6 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?]
+RDEPEND=">=net-libs/ptlib-2.0.0[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
 	>=media-libs/speex-1.2_beta
 	fax? ( net-libs/ptlib[asn] )
 	h323? ( net-libs/ptlib[asn] )
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
 
 # NOTES:
 # ffmpeg[encode] is for h263 and mpeg4
-# ssl, xml, vxml, ipv6, dtmf, ldap, audio, wav, dns and video are use flags
+# ssl, xml, vxml, ipv6, dtmf, ldap, audio, wav, and video are use flags
 #   herited from ptlib: feature is enabled if ptlib has enabled it
 #   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
 #   forcing ptlib to disable it for opal is not a solution too
@@ -51,9 +51,6 @@ DEPEND="${RDEPEND}
 #   (asn is used for fax and config _only_ for examples)
 # OPALDIR should not be used anymore but if a package still need it, create it
 
-# TODO:
-# update "audio dns dtmf vxml wav" flags after ptlib update
-
 pkg_setup() {
 	# need >=gcc-3
 	if [[ $(gcc-major-version) -lt 3 ]]; then
diff --git a/net-libs/opal/opal-3.6.4.ebuild b/net-libs/opal/opal-3.6.4.ebuild
index 4317f497c22a..b9c13b9ccb0c 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.3 2009/09/11 22:25:01 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.4.ebuild,v 1.4 2009/09/12 20:46:11 volkmar Exp $
 
 EAPI="2"
 
@@ -14,11 +14,11 @@ SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
 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 sbc sip sipim srtp ssl stats swig theora +video
-vpb vxml wav x264 x264-static xml"
+IUSE="+audio capi debug doc dtmf examples fax ffmpeg h224 h281 h323 iax ipv6 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?]
+RDEPEND=">=net-libs/ptlib-2.0.0[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
 	>=media-libs/speex-1.2_beta
 	fax? ( net-libs/ptlib[asn] )
 	h323? ( net-libs/ptlib[asn] )
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
 
 # NOTES:
 # ffmpeg[encode] is for h263 and mpeg4
-# ssl, xml, vxml, ipv6, dtmf, ldap, audio, wav, dns and video are use flags
+# ssl, xml, vxml, ipv6, dtmf, ldap, audio, wav, and video are use flags
 #   herited from ptlib: feature is enabled if ptlib has enabled it
 #   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
 #   forcing ptlib to disable it for opal is not a solution too
@@ -50,11 +50,6 @@ DEPEND="${RDEPEND}
 #   (asn is used for fax and config _only_ for examples)
 # 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
-
 conditional_use_error_msg() {
 	eerror "To enable ${1} USE flag, you need ${2} USE flag to be enabled"
 	eerror "Please, enable ${2} or disable ${1}"