net-im/ekiga: bump to -r1 with gstreamer support, cyrus-sasl dep fix, warning about kde USE flag

svn path=/trunk/; revision=833

4 files changed, 26 insertions, 18 deletions

diff --git a/net-im/ekiga/ChangeLog b/net-im/ekiga/ChangeLog
index 1104315..6b60651 100644
--- a/net-im/ekiga/ChangeLog
+++ b/net-im/ekiga/ChangeLog
@@ -2,10 +2,15 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Apr 2009; Mounir Lamouri <volkmar@gentoo.org> -ekiga-3.2.0.ebuild,
+	+ekiga-3.2.0-r1.ebuild, metadata.xml:
+  Add gstreamer support, fix cyrus-sasl dep, add a warning about breaking kde
+  USE flag. Bump to -r1.
+
 *ekiga-3.2.0 (29 Mar 2009)
 
   29 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
-  +ekiga-3.2.0:
+  +ekiga-3.2.0.ebuild:
   Version bump to 3.2.0
 
   18 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
diff --git a/net-im/ekiga/Manifest b/net-im/ekiga/Manifest
index a33fccf..9333396 100644
--- a/net-im/ekiga/Manifest
+++ b/net-im/ekiga/Manifest
@@ -5,6 +5,6 @@ AUX ekiga-3.2.0-xcap.patch 2640 RMD160 c112e0a93c5dd121f83368ccf3dcf6f78bdd7eb6
 DIST ekiga-3.0.2.tar.bz2 7142789 RMD160 997b890f5a18ae89020f7511db977f5ae0561ba2 SHA1 a89e2b493a1fcc518ffa2af36f6ffb2955bc2090 SHA256 df17dea4e6eb4c67ba3949e03fdc665840d9848c124126e765a510146f1e638e
 DIST ekiga-3.2.0.tar.bz2 7679645 RMD160 f31e94dbe03038e39fb5b50bd71372992c13ae8b SHA1 6a8d6f203cd982cbfb37822b2a96f176176cd763 SHA256 998b50e3920546cb43cd281d519394a2db23f5bf10223cac49120296407b3c6d
 EBUILD ekiga-3.0.2.ebuild 4700 RMD160 de289cb1ea6f334be16c435ee0e534d2078febf4 SHA1 2245015dddd99a3461c43cba12fac58cc92a9226 SHA256 23ae2dbc5186a110089301f6bc51c51f2197ba7c3c2a499356da2b55bd9cfacd
-EBUILD ekiga-3.2.0.ebuild 6437 RMD160 79bf7b99da07f76ade77c2c78961327e75c14981 SHA1 7581d3af3fe3df870e09c889de12058a1e58ebee SHA256 7e632fe1f9f288c5baa32ebbea1661ef151f63132e76e7d6c1fb2f637e43d371
-MISC ChangeLog 507 RMD160 5530962739d787f90bf2a2463785baddc708b6c6 SHA1 faa4198b08a1adf9794da687d8bb9eadead15845 SHA256 899fd217cde890b9e083051eb71d414735d5620f18136b49162039671bb7406d
-MISC metadata.xml 541 RMD160 1864969c975d3a2aae9e53374ba6eebfa2ddd7f9 SHA1 3c5c0f86e7b52e1111bd001d113db8a513f5ae8e SHA256 108cbc3a85578bccc058d02217c6a6e89441910eff3608be54881766558dddc9
+EBUILD ekiga-3.2.0-r1.ebuild 6395 RMD160 b6535b4ef939dfe5ff7948322837d40487616a82 SHA1 d5b96af38fe375c074b80e62377f40875e7de7ab SHA256 0d5b6e3cca56cfa1fc91fd15adaa83bbbcd7583a0c5816d0452b11afff870136
+MISC ChangeLog 729 RMD160 fe2fc7bf3ae6b06af95801446a241e617f04cd85 SHA1 df6a2ff73790b74e3a1e76fbb8a2ffbf9df4d9c5 SHA256 00a8ace7e396f505abe7f64cb5efdd3e00906cee808396def986366e3fbdad40
+MISC metadata.xml 528 RMD160 e925e497011180300d392e98206ff24e4b06911b SHA1 cf734d7d2b7c55c01e5ce3779e4bd3c89ffcad35 SHA256 b9895d5d6170742d1d26a135bab40a97c3aa1f4941c96d6018a3daead65bf12a
diff --git a/net-im/ekiga/ekiga-3.2.0.ebuild b/net-im/ekiga/ekiga-3.2.0-r1.ebuild
index 80d4628..039b319 100644
--- a/net-im/ekiga/ekiga-3.2.0.ebuild
+++ b/net-im/ekiga/ekiga-3.2.0-r1.ebuild
@@ -12,11 +12,9 @@ HOMEPAGE="http://www.ekiga.org/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ppc ~x86"
-IUSE="avahi dbus debug doc eds gconf gnome +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 +sip static v4l xcap xv"
 
-RDEPEND="dev-libs/cyrus-sasl:2
-	>=dev-libs/glib-2.8.0:2
+RDEPEND=">=dev-libs/glib-2.8.0:2
 	dev-libs/libsigc++:2
 	dev-libs/libxml2:2
 	>=net-libs/opal-3.6.1[audio,sip,video,debug=,h323?]
@@ -30,9 +28,11 @@ RDEPEND="dev-libs/cyrus-sasl:2
 	gnome? ( || ( >=x11-libs/gtk+-2.14:2
 		( >=gnome-base/libgnome-2.14.0
 		>=gnome-base/libgnomeui-2.14.0 ) ) )
+	gstreamer? ( >=media-libs/gst-plugins-base-0.10.21.3:0.10 )
 	kde? ( kde-base/kdelibs
 		kontact? ( || ( kde-base/kdelibs:3.5 kde-base/kdepimlibs ) ) )
-	ldap? ( net-nds/openldap[sasl] )
+	ldap? ( dev-libs/cyrus-sasl:2
+		net-nds/openldap[sasl] )
 	libnotify? ( x11-libs/libnotify
 		debug? ( >=x11-libs/libnotify-0.4.5 ) )
 	shm? ( x11-libs/libXext )
@@ -52,14 +52,9 @@ DOCS="AUTHORS ChangeLog FAQ MAINTAINERS NEWS README TODO"
 GCONF_DEBUG="no"
 
 # NOTES:
-#
 # make 3.80 is breaking installation phase, need make 3.81 at least
 # having >=gtk+-2.14 is actually removing need of +gnome but it's clearer to
 # 	represent it with || in gnome dep
-#	btw, configure.ac checks for >2.13.1 but ekiga blog talks about >=2.14
-# TODO: gstreamer version needed is not in portage, see bug 261879
-#	gstreamer? ( >=media-libs/gst-plugins-base-0.10.21.3:0.10 )
-#	and probably media-libs/gst-plugins-bad
 # 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, see bug 577249 (upstream)
@@ -68,10 +63,19 @@ GCONF_DEBUG="no"
 # there is a bug in libnotify-0.4.4 fixed in 0.4.5 wich is thrown in debug
 
 # TODO: fix build with kde-4.2 (kde and kontact use flags)
-# TODO: test with kde-3.5 (kde and kontact use flags)
+# TODO: looks not working with kde-3.5, need confirmation
 # TODO: what is blocking ekiga.net register ?
 
 pkg_setup() {
+	# kde is not working
+	if use kde; then
+		ewarn "KDE support is broken."
+		ewarn "Please, stop the merge and disable kde if you don't want to test it"
+		echo
+		ebeep
+		epause
+	fi
+
 	if use kontact && ! use kde; then
 		eerror "You need to enable kde if you want to enable kontact"
 		eerror "Please, re-emerge with disabling kontact or enabling kde"
@@ -88,13 +92,11 @@ pkg_setup() {
 	# dbus-service: always enable if dbus is enabled, no reason to disable it
 	# scrollkeeper: updates scrollkeeper database
 	# schemas-install: install gconf schemas
-	# TODO: needed gstreamer version is not in portage yet
 	G2CONF="${G2CONF}
 		--disable-dependency-tracking
 		--enable-fast-install
 		--disable-maintainer-mode
 		--enable-libtool-lock
-		--disable-gstreamer
 		$(use_enable avahi)
 		$(use_enable dbus)
 		$(use_enable dbus dbus_service)
@@ -106,6 +108,7 @@ pkg_setup() {
 		$(use_enable gconf)
 		$(use_enable gconf schemas-install)
 		$(use_enable gnome)
+		$(use_enable gstreamer)
 		$(use_enable kde)
 		$(use_enable kontact kab)
 		$(use_enable ldap)
diff --git a/net-im/ekiga/metadata.xml b/net-im/ekiga/metadata.xml
index 6db3b1f..df6c079 100644
--- a/net-im/ekiga/metadata.xml
+++ b/net-im/ekiga/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>maintainer-wanted</herd>
+<herd>voip</herd>
 <use>
 	<flag name="gconf">Enable GConf support</flag>
 	<flag name="h323">Enable H.323 protocol</flag>