Removing USE flags removed from ptlib from ptlib dep.

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

5 files changed, 19 insertions, 24 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/Manifest b/net-libs/opal/Manifest
index 0436709c3fbc..e2b39ebe93b6 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -4,7 +4,7 @@ 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-r1.ebuild 8181 RMD160 e79914d09a5dc3227ca5a10d177026bc5092e427 SHA1 6906e71ce20c592600932967edf6cba9efb656f3 SHA256 add46b9ce57903e8ced80cf9b658af7b186af2ed735ce3353e718a769348e7a9
-EBUILD opal-3.6.4.ebuild 8300 RMD160 07c588062e1c1803efae325cda2c1e1a65364e0f SHA1 52d8b5a0ad6fc109bb8d37e85c5379c16028912f SHA256 b8f5224c4253680cfae7fccf683bdbdedb09717e4bc60421170aa5bb24ad8668
-MISC ChangeLog 6649 RMD160 2f307b66ad53f42c2b4659cacaaa9aedcf7b7472 SHA1 013546d2ed22fbadf28469c4c4c0757f0ca435a7 SHA256 27f3d7cb0e95129df6ca9482236d639704b90effb6795523d211d044b0ea41e0
-MISC metadata.xml 2119 RMD160 01e799aa03d700533a4151a49899ce1f0731f145 SHA1 25f9524c7d7e319cff3eb2c786eb98af8856e2fc SHA256 a50a47ce34515833c8041814ac6800934555687cfb2af6bc2ac1fa465ce5d1f1
+EBUILD opal-3.6.4-r1.ebuild 8095 RMD160 b5cfb59d5a0d2ac28a0fea2b1bf3a92189bce4cb SHA1 fb619ce601ded21b7533ac6188dcb7ea34021006 SHA256 fd2b2662dbe050931f0a72ccb4c6689566089b9ec03a1c6ebefe1e5a1910bc18
+EBUILD opal-3.6.4.ebuild 8139 RMD160 89130c1e67c3b29f4ddee954ea573e8770ee53b2 SHA1 7320553bc454e491e16f1d910a9a315426408d2e SHA256 b8f4d3a1d6cd3d57675fa040528315180ac768cedfbbf4da012dc309b0d49202
+MISC ChangeLog 6800 RMD160 699f8b7836e6ed9c9943c1a327ec9dfc53ea1648 SHA1 77676720cf7cf8477e64e3cfadbb2cf4fd1ea932 SHA256 5dbd3c3c44af5fad813c0787213702306a3f0ba9ad175362f115997d7e404bdb
+MISC metadata.xml 2065 RMD160 72f5b31577c61334a802fa85c51b4163c81aced1 SHA1 d1b558b04691f19a9eccc648708487c8d169db82 SHA256 065bbfbad937a4e217f16a4d2f410f4ff282ca5f869ca9387986d85a99add8b4
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}"