Remove dns, url, pipechan and config-file USE flags (force auto-enabled).

Fix bug 276475
Remove remaining patch.
Package-Manager: portage-14103-svn/cvs/Linux ppc

4 files changed, 53 insertions, 100 deletions

diff --git a/net-libs/ptlib/ChangeLog b/net-libs/ptlib/ChangeLog
index 452b99e6a264..3cb41c4d4cdf 100644
--- a/net-libs/ptlib/ChangeLog
+++ b/net-libs/ptlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/ptlib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.9 2009/08/26 12:48:05 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.10 2009/09/12 20:22:53 volkmar Exp $
+
+  12 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> ptlib-2.6.4.ebuild,
+  metadata.xml:
+  Remove dns, url, pipechan and config-file USE flags (force auto-enabled).
+	Fix bug 276475
+  Remove remaining patch.
 
   26 Aug 2009; Mounir Lamouri <volkmar@gentoo.org> ptlib-2.6.4.ebuild:
   soap need http-server, fix bug 280850
diff --git a/net-libs/ptlib/Manifest b/net-libs/ptlib/Manifest
index 0ce0929019af..597527ac8e31 100644
--- a/net-libs/ptlib/Manifest
+++ b/net-libs/ptlib/Manifest
@@ -1,5 +1,5 @@
 DIST ptlib-2.6.4-htmldoc.tar.bz2 2089282 RMD160 67113ef082fa05ed10874c438d007fccf4aa864b SHA1 f2d53729a7cbf1e2e909fc62ed30e220a10b2fcc SHA256 588ee9c090e6d5f082cca7c11a51d29b563a6d46ed259f13c398820a89f78d8c
 DIST ptlib-2.6.4.tar.bz2 3302374 RMD160 53d0ea4b67438f61f86fd0d8b68959ef0aa18342 SHA1 2808a7546c354c1b6c140667a91da6f79a98f5c9 SHA256 22eae4f6c72247f8ac79c57ce4469797ad3df67614758c5096b7ce9290bd10b4
-EBUILD ptlib-2.6.4.ebuild 8388 RMD160 d12b948edbe76c2da74159e60e1a7c40e5f1f68e SHA1 b28f66391c3daf6c3290a60fcb469943b9f73962 SHA256 8334b4c750a39d49d8d99dee6e770932dac8ebc6d6a47a95697c59cf6a8fd8d2
-MISC ChangeLog 1483 RMD160 4b798107cd68046df96afc8f115326137ba3f6b4 SHA1 f7aaceaaaa67742c0c8ebdf536e4df5b6db05ee8 SHA256 85b0adbe4ee6ce57e2244a1a7ed6dd18358f031ac8c44ebef2836342a8505f40
-MISC metadata.xml 1557 RMD160 9fc3acd33e65c9c538f6f82540e29ad2c80e4ea3 SHA1 6e2c60a62ad7d5a343b4d77ffb23b27c55aa9461 SHA256 f37e4390595b04980d5e22d31c549dfac57979b0b2bb63f7c2d4125d9015e92c
+EBUILD ptlib-2.6.4.ebuild 7220 RMD160 5468e4c6b1e3ed4970d4cad9bfe9b6eab6134e28 SHA1 6d28eb56a12193f32ff40fa42ccb28711cedbdb7 SHA256 4b0aad99c3c8dad3d720a6c715015d55c8228f50d522bc4e8b485b3c65181486
+MISC ChangeLog 1690 RMD160 8ba55b7f7ced49265d82bcbdca6364a2510a28d9 SHA1 ccbc80e75cc77e91fdbe97534fc5669631e82d5e SHA256 e48dffced6ba19146676a6f5ec2ad76a2cceee23b128fad982dc723bf07d236a
+MISC metadata.xml 1160 RMD160 b259b8631049719fe5c9aed02f15b95232860d41 SHA1 78af21a8a19d1d988329da8a70babd744a4e0e6c SHA256 91aa203d63993f44e881c8ee7908d49596ddd1c03b89ea5b041ac86e2877fdb7
diff --git a/net-libs/ptlib/metadata.xml b/net-libs/ptlib/metadata.xml
index d685b89c82cb..1b6d6f60260e 100644
--- a/net-libs/ptlib/metadata.xml
+++ b/net-libs/ptlib/metadata.xml
@@ -9,14 +9,9 @@
 	<use>
 		<flag name="asn">Enable ASN decoding/encoding support</flag>
 		<flag name="audio">Enable audio support</flag>
-		<flag name="config-file">Enable config file support</flag>
-		<flag name="dns">Enable DNS resolver support</flag>
 		<flag name="dtmf">Enable DTMF encoding/decoding support</flag>
 		<flag name="http">Enable HTTP support</flag>
-		<flag name="http-forms">Enable http forms support</flag>
-		<flag name="http-server">Enable http server support</flag>
 		<flag name="mail">Enable mail protocols (POP3/SMTP)</flag>
-		<flag name="pipechan">Enable pipechannel support</flag>
 		<flag name="qos">Enable QOS support</flag>
 		<flag name="remote">Enable remote connection support</flag>
 		<flag name="serial">Enable serial port support</flag>
@@ -25,9 +20,7 @@
 		<flag name="stun">Enable STUN support</flag>
 		<flag name="telnet">Enable telnet protocol support</flag>
 		<flag name="tts">Enable Text-To-Speech server support</flag>
-		<flag name="url">Enable URL support</flag>
 		<flag name="video">Enable video support</flag>
-		<flag name="video-file">Enable video file support</flag>
 		<flag name="vxml">Enable VoiceXML support</flag>
 		<flag name="wav">Enable WAVFILE support</flag>
 	</use>
diff --git a/net-libs/ptlib/ptlib-2.6.4.ebuild b/net-libs/ptlib/ptlib-2.6.4.ebuild
index dbc63db198cd..4c1d40b4399f 100644
--- a/net-libs/ptlib/ptlib-2.6.4.ebuild
+++ b/net-libs/ptlib/ptlib-2.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/ptlib/ptlib-2.6.4.ebuild,v 1.2 2009/08/26 12:48:05 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.4.ebuild,v 1.3 2009/09/12 20:22:53 volkmar Exp $
 
 EAPI="2"
 
@@ -15,12 +15,12 @@ LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 # default enabled are features from 'minsize', the most used according to ptlib
-IUSE="alsa +asn +audio config-file debug dns doc dtmf esd examples ffmpeg ftp
-+http http-forms http-server ieee1394 ipv6 jabber ldap mail pipechan odbc oss
-pch qos remote sasl sdl serial shmvideo snmp soap socks ssl +stun telnet tts
-+url v4l v4l2 +video video-file vxml wav xml xmlrpc"
+IUSE="alsa +asn +audio debug doc dtmf esd examples ffmpeg ftp http ieee1394 ipv6
+jabber ldap mail odbc oss pch qos remote sasl sdl serial shmvideo snmp soap
+socks ssl +stun telnet tts v4l v4l2 +video vxml wav xml xmlrpc"
 
-COMMON_DEP="audio? ( alsa? ( media-libs/alsa-lib )
+CDEPEND="
+	audio? ( alsa? ( media-libs/alsa-lib )
 		esd? ( media-sound/esound ) )
 	ldap? ( net-nds/openldap )
 	odbc? ( dev-db/unixODBC )
@@ -33,9 +33,9 @@ COMMON_DEP="audio? ( alsa? ( media-libs/alsa-lib )
 				sys-libs/libraw1394 )
 		v4l2? ( media-libs/libv4l ) )
 	xml? ( dev-libs/expat )"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
 	ffmpeg? ( media-video/ffmpeg )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
 	dev-util/pkgconfig
 	sys-devel/bison
 	sys-devel/flex
@@ -53,111 +53,65 @@ DEPEND="${COMMON_DEP}
 # TODO:
 # manage in a better way the conditional use flags (with eapi-3 ?)
 
-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}"
+conditional_use_warn_msg() {
+	ewarn "To enable ${1} USE flag, you need ${2} USE flag to be enabled"
+	ewarn "Please, enable ${2} or disable ${1}"
 }
 
 pkg_setup() {
-	local use_error=false
+	local use_warn=false
 
-	# stop emerge if a conditional use flag is not respected
-
-	if ! use video; then
-		if use sdl; then
-			conditional_use_error_msg "sdl" "video"
-			use_error=true
-		fi
-		if use video-file; then
-			conditional_use_error_msg "video-file" "video"
-			use_error=true
-		fi
+	if use sdl && ! use video; then
+		conditional_use_warn_msg "sdl" "video"
+		use_warn=true
 	fi
 
 	if use jabber && ! use xml; then
-		conditional_use_error_msg "jabber" "xml"
-		use_error=true
-	fi
-
-	if use ldap && ! use dns; then
-		conditional_use_error_msg "ldap" "dns"
-		use_error=true
-	fi
-
-	if use ffmpeg && ! use pipechan; then
-		conditional_use_error_msg "ffmpeg" "pipechan"
-		use_error=true
-	fi
-
-	if use http && ! use url; then
-		conditional_use_error_msg "http" "url"
-		use_error=true
-	fi
-
-	if use http-forms; then
-		if ! use http; then
-			conditional_use_error_msg "http-forms" "http"
-			use_error=true
-		fi
-		if ! use config-file; then
-			conditional_use_error_msg "http-forms" "config-file"
-			use_error=true
-		fi
-	fi
-
-	if use http-server && ! use http-forms; then
-		conditional_use_error_msg "http-server" "http-forms"
-		use_error=true
+		conditional_use_warn_msg "jabber" "xml"
+		use_warn=true
 	fi
 
 	if use vxml; then
 		if ! use xml; then
-			conditional_use_error_msg "vxml" "xml"
-			use_error=true
+			conditional_use_warn_msg "vxml" "xml"
+			use_warn=true
 		fi
 		if ! use http; then
-			conditional_use_error_msg "vxml" "http"
-			use_error=true
+			conditional_use_warn_msg "vxml" "http"
+			use_warn=true
 		fi
 	fi
 
 	if use xmlrpc; then
 		if ! use xml; then
-			conditional_use_error_msg "xmlrpc" "xml"
-			use_error=true
+			conditional_use_warn_msg "xmlrpc" "xml"
+			use_warn=true
 		fi
 		# configure script tells it needs http but it fails, see bug 277385
 		# the bug has been reported at upstream bug 2820814
-		if ! use http-server; then
-			conditional_use_error_msg "xmlrpc" "http-server"
-			use_error=true
+		if ! use http; then
+			conditional_use_warn_msg "xmlrpc" "http"
+			use_warn=true
 		fi
 	fi
 
 	if use soap; then
 		if ! use xml; then
-			conditional_use_error_msg "soap" "xml"
-			use_error=true
+			conditional_use_warn_msg "soap" "xml"
+			use_warn=true
 		fi
 		# fix bug 280850, see upstream bug 2844915
-		if ! use http-server; then # this means http and http-forms
-			conditional_use_error_msg "soap" "http-server"
-			use_error=true
-		fi
-	fi
-
-	# fix bug 277617, upstream bug 2820953
-	if use remote; then
-		if ! use config-file; then
-			conditional_use_error_msg "remote" "config-file"
-			use_error=true
+		if ! use http; then
+			conditional_use_warn_msg "soap" "http"
+			use_warn=true
 		fi
 	fi
 
-	if ${use_error}; then
+	if ${use_warn}; then
 		echo
-		eerror "Please look at previous messages and re-emerge ${PN} accordingly."
-		die "conditional USE flags error"
+		ewarn "Please look at previous messages and re-emerge accordingly if needed."
+		ebeep
+		epause 5
 	fi
 }
 
@@ -188,6 +142,7 @@ src_configure() {
 	# appshare, vfw: only for windows
 	# samples: no need to build samples
 	# avc: disabled, bug 276514, upstream bug 2821744
+	# pipechan, configfile, resolver, url: force enabling
 	econf ${myconf} \
 		--disable-minsize \
 		--disable-openh323 \
@@ -201,21 +156,23 @@ src_configure() {
 		--disable-vfw \
 		--disable-samples \
 		--disable-avc \
+		--enable-configfile \
+		--enable-pipechan \
+		--enable-resolver \
+		--enable-url \
 		$(use_enable audio) \
 		$(use_enable alsa) \
 		$(use_enable asn) \
-		$(use_enable config-file configfile) \
 		$(use_enable debug exceptions) \
 		$(use_enable debug memcheck) \
 		$(use_enable debug tracing) \
-		$(use_enable dns resolver) \
 		$(use_enable dtmf) \
 		$(use_enable esd) \
 		$(use_enable ffmpeg ffvdev) \
 		$(use_enable ftp) \
 		$(use_enable http) \
-		$(use_enable http-forms httpforms) \
-		$(use_enable http-server httpsvc) \
+		$(use_enable http httpforms) \
+		$(use_enable http httpsvc) \
 		$(use_enable ieee1394 dc) \
 		$(use_enable ipv6) \
 		$(use_enable jabber) \
@@ -224,7 +181,6 @@ src_configure() {
 		$(use_enable odbc) \
 		$(use_enable oss) \
 		$(use_enable pch) \
-		$(use_enable pipechan) \
 		$(use_enable qos) \
 		$(use_enable remote remconn) \
 		$(use_enable sasl) \
@@ -238,11 +194,9 @@ src_configure() {
 		$(use_enable stun) \
 		$(use_enable telnet) \
 		$(use_enable tts) \
-		$(use_enable url) \
 		$(use_enable v4l) \
 		$(use_enable v4l2) \
-		$(use_enable video) \
-		$(use_enable video-file vidfile) \
+		$(use_enable video) $(use_enable video vidfile) \
 		$(use_enable vxml) \
 		$(use_enable wav wavfile) \
 		$(use_enable xml expat) \