Removing sip from USE flags and h323 is no longer default enabled, bug 282862.

Reverting last commit.
(Portage version: 14103-svn/cvs/Linux ppc)

3 files changed, 12 insertions, 24 deletions

diff --git a/net-voip/ekiga/ChangeLog b/net-voip/ekiga/ChangeLog
index bb0701af13bb..9f94db9aa353 100644
--- a/net-voip/ekiga/ChangeLog
+++ b/net-voip/ekiga/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-voip/ekiga
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.9 2009/08/27 08:45:54 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.10 2009/08/31 17:36:14 volkmar Exp $
+
+*ekiga-3.2.5-r2 (31 Aug 2009)
+
+  31 Aug 2009; Mounir Lamouri <volkmar@gentoo.org> metadata.xml,
+	-ekiga-3.2.5-r1.ebuild, +ekiga-3.2.5-r2.ebuild:
+  Removing sip from USE flags and h323 is no longer default enabled, bug 282862
+	Reverting last commit.
 
   27 Aug 2009; Mounir Lamouri <volkmar@gentoo.org> ekiga-3.2.5-r1.ebuild:
   Change openldap dep version to prevent bug 189817
diff --git a/net-voip/ekiga/ekiga-3.2.5-r1.ebuild b/net-voip/ekiga/ekiga-3.2.5-r2.ebuild
index dae045e22f5b..5a74cbb9f0d1 100644
--- a/net-voip/ekiga/ekiga-3.2.5-r1.ebuild
+++ b/net-voip/ekiga/ekiga-3.2.5-r2.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-voip/ekiga/ekiga-3.2.5-r1.ebuild,v 1.2 2009/08/27 08:45:54 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-3.2.5-r2.ebuild,v 1.1 2009/08/31 17:36:14 volkmar Exp $
 
 EAPI="2"
 
@@ -17,8 +17,8 @@ HOMEPAGE="http://www.ekiga.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="avahi dbus debug doc eds gconf gnome gstreamer +h323 kde kontact ldap
-libnotify mmx nls +shm +sip static v4l xcap xv"
+IUSE="avahi dbus debug doc eds gconf gnome gstreamer h323 kde kontact ldap
+libnotify mmx nls +shm static v4l xcap xv"
 
 RDEPEND=">=dev-libs/glib-2.8.0:2
 	dev-libs/libsigc++:2
@@ -37,7 +37,7 @@ RDEPEND=">=dev-libs/glib-2.8.0:2
 	gstreamer? ( >=media-libs/gst-plugins-base-0.10.21.3:0.10 )
 	kde? ( kontact? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} ) )
 	ldap? ( dev-libs/cyrus-sasl:2
-		>=net-nds/openldap-2.3.43-r1 )
+		net-nds/openldap )
 	libnotify? ( x11-libs/libnotify
 		debug? ( >=x11-libs/libnotify-0.4.5 ) )
 	shm? ( x11-libs/libXext )
@@ -59,10 +59,8 @@ DOCS="AUTHORS ChangeLog FAQ MAINTAINERS NEWS README TODO"
 # TODO: gnome2 eclass add --[dis|en]able-gtk-doc wich throws a QA warning
 #	a patch has been submitted, see bug 262491
 # ptlib/opal needed features are not checked by ekiga, upstream bug 577249
-# opal[sip] should be opal[sip?], upstream bug 577248
 # libnotify-0.4.4 bug with +debug, upstream bug 583719
 # +doc is not installing dev doc (doxygen)
-# forcing openldap version to >=2.3.43-r1 to prevent bug 189817
 
 # UPSTREAM:
 # contact ekiga team to be sure intltool and gettext are not nls deps
@@ -72,13 +70,6 @@ pkg_setup() {
 		kde4-base_pkg_setup
 	fi
 
-	if ! use h323 && ! use sip; then
-		eerror "You have disabled h323 and sip USE flags."
-		eerror "At least one of these USE flags needs to be enabled."
-		eerror "Please, enable h323 and/or sip and re-emerge ${PN}."
-		die "At least sip or h323 need to be enabled."
-	fi
-
 	if use kontact && ! use kde; then
 		eerror "To enable kontact USE flag, you need kde USE flag to be enabled"
 		eerror "Please, enable kde or disable kontact and re-emerge ${PN}."
@@ -130,15 +121,6 @@ src_prepare() {
 	# gnome-2 eclass is reloading schemas with SIGHUP
 	sed -i -e '/gconftool-2 --shutdown/d' Makefile.in || die "sed failed"
 
-	# SIP is automatically enabled with opal[sip], want it to be a user choice
-	# upstream bug 575832
-	if ! use sip; then
-		sed -i -e "s/SIP=\"yes\"/SIP=\"no\"/" configure || die "sed failed"
-		sed -i -e \
-			"s:SIP=\`\$PKG_CONFIG --variable=OPAL_SIP opal\`:SIP=\"no\":" \
-			configure || die "sed failed"
-	fi
-
 	# H323 is automatically enabled with opal[h323], want it to be a user choice
 	# upstream bug 575833
 	if ! use h323; then
diff --git a/net-voip/ekiga/metadata.xml b/net-voip/ekiga/metadata.xml
index 7a65ad220684..9cf7a358759e 100644
--- a/net-voip/ekiga/metadata.xml
+++ b/net-voip/ekiga/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="gconf">Enable GConf support</flag>
 		<flag name="h323">Enable H.323 protocol</flag>
 		<flag name="shm">Enable the Shared Memory Extension from libXext</flag>
-		<flag name="sip">Enable Session Initiation Protocol</flag>
 		<flag name="static">Statically link to opal and ptlib</flag>
 		<flag name="xcap">Enable XML Configuration Access Protocal</flag>
 	</use>