version bump to 3.2.4, bug 238554

Package-Manager: portage-13756-svn/cvs/Linux i686

5 files changed, 271 insertions, 14 deletions

diff --git a/net-voip/ekiga/ChangeLog b/net-voip/ekiga/ChangeLog
index c7c9481c986a..3e2409c33c15 100644
--- a/net-voip/ekiga/ChangeLog
+++ b/net-voip/ekiga/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2009/05/02 21:24:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.3 2009/07/03 11:36:47 volkmar Exp $
+
+*ekiga-3.2.4 (03 Jul 2009)
+
+  03 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
+  +files/ekiga-3.2.4-gtk+-2.12-fix.patch, metadata.xml, +ekiga-3.2.4.ebuild:
+  Version bump to 3.2.4. Adding myself as maintainer. Fix bug 238554
 
   28 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
   +files/ekiga-1.99.0-configure.patch, +files/ekiga-2.0.12-gdu.patch,
diff --git a/net-voip/ekiga/Manifest b/net-voip/ekiga/Manifest
index 4526b7f448e9..8d30345e00c4 100644
--- a/net-voip/ekiga/Manifest
+++ b/net-voip/ekiga/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ekiga-1.99.0-configure.patch 669 RMD160 fa6cfdb6f1613e63b3af9a60d4f14b0260bae2db SHA1 c7f05a63821c2f890f6bc4dc9b3a848500833e7d SHA256 5c8ffcb27ebf51a0f39ae866e8b9637f56bad8fe113adb6122da4d973d55dd80
 AUX ekiga-2.0.12-gdu.patch 2274 RMD160 b7f44eee0568e3baa844a2e08994718711bfe773 SHA1 6b5c6fdd950ff196f7f87546f403144f09a60b0a SHA256 c0877de2bb725f26d162d5f48d14302753ddf6e7b5ad318d5aa39759abc8e32c
+AUX ekiga-3.2.4-gtk+-2.12-fix.patch 652 RMD160 9105af5bac8217f21b6bfefa4992ac229cb677d9 SHA1 c7ef57f5c4569c826b187c9d58767205fe22a746 SHA256 1accddbb079d4de10af8782fa0ffe38828ecbf5918d5539a9500421677e014cd
 AUX ekiga-eggtrayicon-transparency.diff 2960 RMD160 9303bf9c0dcb2f666b88622a772540136f0a63df SHA1 d8a7b866ba119d286899f19a3ddb618f117398de SHA256 9cf235b64f1201e0119a55c76db6d1c243abb971757e5d781aa95c3724138e37
 AUX ekiga-eggtrayicon-update.diff 13969 RMD160 159f1164516362b90ef8e63988ba5fa77c544e13 SHA1 edc6809219a312483f2f8c77f07a0d88a2ce5cff SHA256 1db286369b81677d559b38261ce5f6686de41e3d645808f7ecb57cee6eaf82d6
 AUX not-gnome.patch 413 RMD160 571716d78f27b192ed36e5259d676ed4320bf1bd SHA1 1f19b5d7add4db5fa1f4e301d92101188c48006f SHA256 6287ffec378a85425ecd0b4f6ea9b445c3151c7259d130630de63f88dbd69c8d
 DIST ekiga-2.0.12.tar.bz2 6109264 RMD160 04ee5c8a878650b545e9e2a547a08dde4e7be3c8 SHA1 e80a2dae4541708768ac8c38ebb1452a2d0911d4 SHA256 5747802480b44a3cde8fd52f381b1761db52354d74fce7df380a2fbaa71910e9
+DIST ekiga-3.2.4.tar.bz2 7747447 RMD160 3012532f19f2220a8817f1b748e6ddb66c4ef9fc SHA1 7394fbf5d437a76fd7cfd8519ee7dbfb0604f0c6 SHA256 21032e8a420365d0539c6356d220bb8634e9c1ee839bfcceb3c03d9e427cd397
 EBUILD ekiga-2.0.12.ebuild 2373 RMD160 99cd6a5f486123ee6670034cff4abac1834889b3 SHA1 033920369d95b35f6a8d00663e8c2b9ee13dc729 SHA256 ef951f5be624e6f75621400c2921f9cc5cfdb3d76fd8abcb7ffe833840bdb38a
-MISC ChangeLog 8570 RMD160 8e7d994820bb8a9ee7f756c9dc5918213fe7c568 SHA1 fcd56ea37f5b62e5e60ff319119a27286894a71f SHA256 e2bcd4aeabe103941ae79a21937486a9e6fc73bfa84814fec4ee47bd48e96f0a
-MISC metadata.xml 157 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 SHA1 bbbbd897cfe8d8bac785b23bead8e185871055bd SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkn8ugcACgkQI1lqEGTUzyTVrQCgy+HVFjJ4A/RzcvwDcrxYZVND
-fdMAoNJVzJWnGAPqEYIOlRH11H6zKvul
-=kXgT
------END PGP SIGNATURE-----
+EBUILD ekiga-3.2.4.ebuild 6501 RMD160 8309c2d9e1769ea73ff7c1137ad4ea67c955e948 SHA1 f7c84be04bb2629f30f1c23ad780d4e9dc0d40ad SHA256 b30c630a604f422cfad4ba38452ac8cbfbb1890ace49795f8d6c6904e255dc4c
+MISC ChangeLog 8795 RMD160 02c887ce73270cef6bbe2f5fc2b06f5e56b46ad4 SHA1 4775880ee0736a66d22f4552aefd30784f9f1d6c SHA256 1c743289b57667a3de139820dd4541cf86f3ec6768dc0d54e2a953f59afac09a
+MISC metadata.xml 633 RMD160 b150c117256e7db16516e82f6b1af0251b9c249c SHA1 e0449bb6c85b7fee51ee4d1c97e6270befeb858f SHA256 80120551137ed52fd1085a838ed54772af862e793116f2d3e1bd2cdf538e8ccf
diff --git a/net-voip/ekiga/ekiga-3.2.4.ebuild b/net-voip/ekiga/ekiga-3.2.4.ebuild
new file mode 100644
index 000000000000..3acc21595db9
--- /dev/null
+++ b/net-voip/ekiga/ekiga-3.2.4.ebuild
@@ -0,0 +1,224 @@
+# 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.4.ebuild,v 1.1 2009/07/03 11:36:47 volkmar Exp $
+
+EAPI="2"
+
+KDE_REQUIRED="optional"
+
+inherit eutils kde4-base gnome2
+# gnome2 at the end to make it default
+
+DESCRIPTION="H.323 and SIP VoIP softphone"
+HOMEPAGE="http://www.ekiga.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+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/glib-2.8.0:2
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2
+	>=net-libs/opal-3.6.2[audio,sip,video,debug=,h323?]
+	>=net-libs/ptlib-2.6.2[stun,video,wav,debug=]
+	>=x11-libs/gtk+-2.12.0:2
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	dbus? ( >=sys-apps/dbus-0.36
+		>=dev-libs/dbus-glib-0.36 )
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	gconf? ( >=gnome-base/gconf-2.6.0: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-${KDE_MINIMAL}
+		x11-libs/qt-core:4
+		kontact? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} ) )
+	ldap? ( dev-libs/cyrus-sasl:2
+		net-nds/openldap )
+	libnotify? ( x11-libs/libnotify
+		debug? ( >=x11-libs/libnotify-0.4.5 ) )
+	shm? ( x11-libs/libXext )
+	xcap? ( net-libs/libsoup:2.4 )
+	xv? ( x11-libs/libXv )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.20
+	sys-devel/gettext
+	doc? ( app-text/scrollkeeper
+		app-text/gnome-doc-utils )
+	v4l? ( sys-kernel/linux-headers )"
+
+DOC_LINGUAS="bg ca de el en_GB es eu fi fr oc pt_BR ru sv uk"
+IUSE_LINGUAS="${DOC_LINGUAS} am ar as az be bg bn_IN bn bs ca crh cs cy da de dz
+el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kn ko ku
+lt lv mai mk ml mn mr ms nb ne nl nn oc or pa pl pt_BR pt ro ru rw si sk sl sq
+sr@latin sr sv ta te th tr uk vi wa xh zh_CN zh_HK zh_TW"
+
+for l in ${IUSE_LINGUAS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
+DOCS="AUTHORS ChangeLog FAQ MAINTAINERS NEWS README TODO"
+
+# debug is managed by the ebuild
+GCONF_DEBUG="no"
+
+# NOTES:
+# having >=gtk+-2.14 is actually removing need of +gnome but it's clearer to
+# 	represent it with || in gnome dep
+# 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)
+
+# TODO:
+# if really want to use ked4-base, should use COMMONDEPEND
+
+# UPSTREAM:
+# contact ekiga team to be sure intltool and gettext are not nls deps
+
+pkg_setup() {
+	if use kde; then
+		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}."
+		die "You need to enable kde or disable kontact."
+	fi
+
+	strip-linguas ${IUSE_LINGUAS}
+
+	if [[ -z "${LINGUAS}" ]]; then
+		# no linguas set, using the default one
+		LINGUAS=" "
+	fi
+
+	# update scrollkeeper database if doc has been enabled
+	if use doc; then
+		SCROLLKEEPER_UPDATE=1
+	else
+		SCROLLKEEPER_UPDATE=0
+	fi
+
+	# dbus-service: always enable if dbus is enabled, no reason to disable it
+	# scrollkeeper: updates scrollkeeper database
+	# schemas-install: install gconf schemas
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--disable-maintainer-mode
+		--enable-libtool-lock
+		$(use_enable avahi)
+		$(use_enable dbus)
+		$(use_enable dbus dbus_service)
+		$(use_enable debug gtk-debug)
+		$(use_enable debug opal-debug)
+		$(use_enable doc gdu)
+		$(use_enable doc scrollkeeper)
+		$(use_enable eds)
+		$(use_enable gconf)
+		$(use_enable gconf schemas-install)
+		$(use_enable gnome)
+		$(use_enable gstreamer)
+		$(use_enable kde)
+		$(use_enable kontact kab)
+		$(use_enable ldap)
+		$(use_enable libnotify notify)
+		$(use_enable mmx)
+		$(use_enable nls)
+		$(use_enable shm)
+		$(use_enable static static-libs)
+		$(use_enable xcap)
+		$(use_enable xv)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	epatch "${FILESDIR}"/${P}-gtk+-2.12-fix.patch
+
+	# remove call to gconftool-2 --shutdown, upstream bug 555976
+	# gnome-2 eclass is reloading schemas with SIGHUP
+	sed -i -e '/gconftool-2 --shutdown/d' Makefile.in \
+		|| die "patching Makefile.in 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 "patching configure failed"
+		sed -i -e \
+			"s:SIP=\`\$PKG_CONFIG --variable=OPAL_SIP opal\`:SIP=\"no\":" \
+			configure || die "patching configure failed"
+	fi
+
+	# H323 is automatically enabled with opal[h323], want it to be a user choice
+	# upstream bug 575833
+	if ! use h323; then
+		sed -i -e "s/H323=\"yes\"/H323=\"no\"/" configure \
+			|| die "patching configure failed"
+		sed -i -e \
+			"s:H323=\`\$PKG_CONFIG --variable=OPAL_H323 opal\`:H323=\"no\":" \
+			configure || die "patching configure failed"
+	fi
+
+	# V4L support is auto-enabled, want it to be a user choice
+	# do not contact upstream because that's a hack
+	# TODO: check if upstream has removed this hack
+	if ! use v4l; then
+		sed -i -e "s/V4L=\"enabled\"/V4L=\"disabled\"/" configure \
+			|| die "patching configure failed"
+	fi
+}
+
+src_test() {
+	# must be explicit because kde4-base in exporting a src_test function
+	emake -j1 check || die "emake check failed"
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc && use dbus; then
+		insinto "/usr/share/doc/${PF}/"
+		doins doc/using_dbus.html || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use kde; then
+		kde4-base_pkg_postinst
+	fi
+
+	if ! use gnome; then
+		ewarn "USE=-gnome is experimental, weirdness with UI and config keys can appear."
+	fi
+
+	if use gstreamer || use kde || use xcap || use kontact; then
+		ewarn "You have enabled gstreamer, kde, xcap or kontact USE flags."
+		ewarn "Those USE flags are considered experimental features."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if use kde; then
+		kde4-base_pkg_postrm
+	fi
+}
diff --git a/net-voip/ekiga/files/ekiga-3.2.4-gtk+-2.12-fix.patch b/net-voip/ekiga/files/ekiga-3.2.4-gtk+-2.12-fix.patch
new file mode 100644
index 000000000000..9378590a0252
--- /dev/null
+++ b/net-voip/ekiga/files/ekiga-3.2.4-gtk+-2.12-fix.patch
@@ -0,0 +1,21 @@
+From 6e79ecaaa2230a879ea51ff7c5680d9402b96321 Mon Sep 17 00:00:00 2001
+From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
+Date: Mon, 25 May 2009 12:14:23 +0000
+Subject: Fix compilation with gtk 2.12
+
+---
+diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
+index 238609b..883c10d 100644
+--- a/src/gui/assistant.cpp
++++ b/src/gui/assistant.cpp
+@@ -343,7 +343,7 @@ static void
+ name_changed_cb (GtkEntry     *entry,
+                  GtkAssistant *assistant)
+ {
+-  set_current_page_complete (assistant, gtk_entry_get_text_length (entry) > 0);
++  set_current_page_complete (assistant, (gtk_entry_get_text (entry))[0] != '\0');
+ }
+ 
+ 
+--
+cgit v0.8.2
diff --git a/net-voip/ekiga/metadata.xml b/net-voip/ekiga/metadata.xml
index 02207a5a38e2..7a65ad220684 100644
--- a/net-voip/ekiga/metadata.xml
+++ b/net-voip/ekiga/metadata.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>voip</herd>
+	<herd>voip</herd>
+	<maintainer>
+		<email>volkmar@gentoo.org</email>
+		<name>Mounir Lamouri</name>
+	</maintainer>
+	<use>
+		<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>
 </pkgmetadata>
+