[patch] Don't die, disable configure options instead

ptlib-2.6.2.ebuild.patch (text/plain), 6.61 KB, created by Jeroen Roovers (RETIRED) on 2009-07-04 16:28:12 UTC

Index: ptlib-2.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.2.ebuild,v
retrieving revision 1.1
diff -u -B -r1.1 ptlib-2.6.2.ebuild
--- ptlib-2.6.2.ebuild	3 Jul 2009 09:57:10 -0000	1.1
+++ ptlib-2.6.2.ebuild	4 Jul 2009 16:25:49 -0000
@@ -49,127 +49,163 @@
 # looks to have an auto-magic dep with medialibs, but not in the tree so...
 #	upstream bug 2794736
 
-# TODO:
-# manage in a better way the conditional use flags (with eapi-3 ?)
+src_prepare() {
+	# move files from doc tarball into ${S}
+	if use doc; then
+		mv ../html . || die "moving doc files failed"
+	fi
+
+	# remove visual studio related files from samples/
+	if use examples; then
+		rm -f samples/*/*.vcproj
+		rm -f samples/*/*.sln
+		rm -f samples/*/*.dsp
+		rm -f samples/*/*.dsw
+	fi
+
+	# workaround for a compilation issue in contain.cxx, upstream bug 2794741
+	epatch "${FILESDIR}"/${P}-gcc-allocator.patch
+}
 
 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}"
+	ewarn "To enable USE=\"${1}\", you need USE=\"${2}\" as well"
+	ewarn "Please, enable ${2} or disable ${1}"
 }
 
-pkg_setup() {
-	local use_error=false
+use_disable() {
+	if [ -z "$1" ]; then
+		echo "!!! use_disable() called without a parameter." >&2
+		echo "!!! use_disable <USEFLAG> [<flagname> [value]]" >&2
+		return 1
+	fi
+
+	local UE_SUFFIX=""
+	if [ ! -z "${3}" ]; then
+		UE_SUFFIX="=${3}"
+	fi
+
+	local UWORD="$2"
+	if [ -z "${UWORD}" ]; then
+		UWORD="$1"
+	fi
 
-	# stop emerge if a conditional use flag is not respected
+	echo "--disable-${UWORD}"
+	return 0	
+}
+
+src_configure() {
+	local myconf=""
 
 	if ! use video; then
 		if use sdl; then
 			conditional_use_error_msg "sdl" "video"
-			use_error=true
+			myconf="${myconf} $(use_disable sdl)"
+		else
+			myconf="${myconf} $(use_enable sdl)"
 		fi
 		if use video-file; then
 			conditional_use_error_msg "video-file" "video"
-			use_error=true
+			myconf="${myconf} $(use_disable video-file vidfile)"
+		else
+			myconf="${myconf} $(use_enable video-file vidfile)"
 		fi
 	fi
 
 	if use jabber && ! use xml; then
 		conditional_use_error_msg "jabber" "xml"
-		use_error=true
+		myconf="${myconf} $(use_disable jabber)"
+	else
+		myconf="${myconf} $(use_enable jabber)"
 	fi
 
 	if use ldap && ! use dns; then
 		conditional_use_error_msg "ldap" "dns"
-		use_error=true
+		myconf="${myconf} $(use_disable ldap openldap)"
+	else
+		myconf="${myconf} $(use_enable ldap openldap)"
 	fi
 
 	if use ffmpeg && ! use pipechan; then
 		conditional_use_error_msg "ffmpeg" "pipechan"
-		use_error=true
+		myconf="${myconf} $(use_disable ffmpeg ffvdev)"
+	else
+		myconf="${myconf} $(use_enable ffmpeg ffvdev)"
 	fi
 
 	if use http && ! use url; then
 		conditional_use_error_msg "http" "url"
-		use_error=true
+		myconf="${myconf} $(use_disable http)"
+	else
+		myconf="${myconf} $(use_enable http)"
 	fi
 
 	if use http-forms; then
 		if ! use http; then
 			conditional_use_error_msg "http-forms" "http"
-			use_error=true
+			myconf="${myconf} $(use_disable http-forms httpforms)"
+		else
+			myconf="${myconf} $(use_enable http-forms httpforms)"
 		fi
 		if ! use config-file; then
 			conditional_use_error_msg "http-forms" "config-file"
-			use_error=true
+			myconf="${myconf} $(use_disable http-forms httpforms)"
+		else
+			myconf="${myconf} $(use_enable http-forms httpforms)"
 		fi
 	fi
 
 	if use http-server && ! use http-forms; then
 		conditional_use_error_msg "http-server" "http-forms"
-		use_error=true
+		myconf="${myconf} $(use_disable http-server httpserver)"
+	else
+		myconf="${myconf} $(use_enable http-server httpserver)"
 	fi
 
 	if use vxml; then
 		if ! use xml; then
 			conditional_use_error_msg "vxml" "xml"
-			use_error=true
+			myconf="${myconf} $(use_disable vxml)"
+		else
+			myconf="${myconf} $(use_enable vxml)"
 		fi
 		if ! use http; then
 			conditional_use_error_msg "vxml" "http"
-			use_error=true
+			myconf="${myconf} $(use_disable vxml)"
+		else
+			myconf="${myconf} $(use_enable vxml)"
 		fi
 	fi
 
 	if use xmlrpc; then
 		if ! use xml; then
 			conditional_use_error_msg "xmlrpc" "xml"
-			use_error=true
+			myconf="${myconf} $(use_disable xmlrpc)"
+		else
+			myconf="${myconf} $(use_enable xmlrpc)"
 		fi
 		if ! use http; then
 			conditional_use_error_msg "xmlrpc" "http"
-			use_error=true
+			myconf="${myconf} $(use_disable xmlrpc)"
+		else
+			myconf="${myconf} $(use_enable xmlrpc)"
 		fi
 	fi
 
 	if use soap; then
 		if ! use xml; then
 			conditional_use_error_msg "soap" "xml"
-			use_error=true
+			myconf="${myconf} $(use_disable soap)"
+		else
+			myconf="${myconf} $(use_enable soap)"
 		fi
 		if ! use http; then
 			conditional_use_error_msg "soap" "http"
-			use_error=true
+			myconf="${myconf} $(use_disable soap)"
+		else
+			myconf="${myconf} $(use_enable soap)"
 		fi
 	fi
 
-	if ${use_error}; then
-		echo
-		eerror "Please see messages above and re-emerge ${PN} accordingly."
-		die
-	fi
-}
-
-src_prepare() {
-	# move files from doc tarball into ${S}
-	if use doc; then
-		mv ../html . || die "moving doc files failed"
-	fi
-
-	# remove visual studio related files from samples/
-	if use examples; then
-		rm -f samples/*/*.vcproj
-		rm -f samples/*/*.sln
-		rm -f samples/*/*.dsp
-		rm -f samples/*/*.dsw
-	fi
-
-	# workaround for a compilation issue in contain.cxx, upstream bug 2794741
-	epatch "${FILESDIR}"/${P}-gcc-allocator.patch
-}
-
-src_configure() {
-	local myconf=""
-
 	# plugins are disabled only if ! audio and ! video
 	if ! use audio && ! use video; then
 		myconf="${myconf} --disable-plugins"
@@ -207,16 +243,10 @@
 		$(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 ieee1394 avc) \
 		$(use_enable ieee1394 dc) \
 		$(use_enable ipv6) \
-		$(use_enable jabber) \
-		$(use_enable ldap openldap) \
 		$(use_enable mail pop3smtp) \
 		$(use_enable odbc) \
 		$(use_enable oss) \
@@ -225,11 +255,9 @@
 		$(use_enable qos) \
 		$(use_enable remote remconn) \
 		$(use_enable sasl) \
-		$(use_enable sdl) \
 		$(use_enable serial) \
 		$(use_enable shmvideo) \
 		$(use_enable snmp) \
-		$(use_enable soap) \
 		$(use_enable socks) \
 		$(use_enable ssl openssl) \
 		$(use_enable stun) \
@@ -239,11 +267,8 @@
 		$(use_enable v4l) \
 		$(use_enable v4l2) \
 		$(use_enable video) \
-		$(use_enable video-file vidfile) \
-		$(use_enable vxml) \
 		$(use_enable wav wavfile) \
-		$(use_enable xml expat) \
-		$(use_enable xmlrpc)
+		$(use_enable xml expat)
 }
 
 src_compile() {