net-im/ekiga: moving ekiga from net-voip to net-im to make gnome aware of it

svn path=/trunk/; revision=821

5 files changed, 327 insertions, 0 deletions

diff --git a/net-im/ekiga/ChangeLog b/net-im/ekiga/ChangeLog
new file mode 100644
index 0000000..d221e7d
--- /dev/null
+++ b/net-im/ekiga/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for net-voip/ekiga
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  18 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
+  ekiga-3.0.2:
+  Add ~x86 keyword
+
+*ekiga-3.0.2 (18 Mar 2009)
+
+  18 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
+  +ekiga-3.0.2.ebuild:
+  New ekiga ebuild, see bug 238554
+
diff --git a/net-im/ekiga/Manifest b/net-im/ekiga/Manifest
new file mode 100644
index 0000000..b1d7486
--- /dev/null
+++ b/net-im/ekiga/Manifest
@@ -0,0 +1,5 @@
+AUX ekiga-3.0.2-ptracing.patch 5708 RMD160 1031c2a8fa5b2ade6ceb513a56e9b5ae95a60809 SHA1 419c06ac2058943bea9fa21f96b231cc11b9fdba SHA256 1a83b04db2ab039c616ccf1b4f1071290b08d64a4929643d5147da53d353d3fe
+DIST ekiga-3.0.2.tar.bz2 7142789 RMD160 997b890f5a18ae89020f7511db977f5ae0561ba2 SHA1 a89e2b493a1fcc518ffa2af36f6ffb2955bc2090 SHA256 df17dea4e6eb4c67ba3949e03fdc665840d9848c124126e765a510146f1e638e
+EBUILD ekiga-3.0.2.ebuild 4700 RMD160 de289cb1ea6f334be16c435ee0e534d2078febf4 SHA1 2245015dddd99a3461c43cba12fac58cc92a9226 SHA256 23ae2dbc5186a110089301f6bc51c51f2197ba7c3c2a499356da2b55bd9cfacd
+MISC ChangeLog 371 RMD160 a5a1a6c2ae8dfbb5fb5e2a38785a1b470239a86d SHA1 a8846e1b04e1ca855a0b520eb4b26c54075817e5 SHA256 510cbb1fbe38d6d342675af339ea235f2f8902f5a25c895b9b2dd09f75d11a6a
+MISC metadata.xml 474 RMD160 df4af0d05d375ddc171449124d71eacb3ff59581 SHA1 d2b9e343072e0b706680f6c222858c606c3e329f SHA256 afeef65ec57f8bbc62f2045cbec1bc564daf5858f0e8a3b052974aeadd92b654
diff --git a/net-im/ekiga/ekiga-3.0.2.ebuild b/net-im/ekiga/ekiga-3.0.2.ebuild
new file mode 100644
index 0000000..cab1880
--- /dev/null
+++ b/net-im/ekiga/ekiga-3.0.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils gnome2
+
+DESCRIPTION="H.323 and SIP VoIP softphone"
+HOMEPAGE="http://www.ekiga.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~x86"
+IUSE="avahi dbus debug doc eds gconf gnome +h323 ldap libnotify mmx nls +shm
++sip static v4l xv"
+
+RDEPEND=">=dev-libs/glib-2.8.0:2
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2
+	=net-libs/ptlib-2.4*[debug=]
+	=net-libs/opal-3.4*[debug=,h323?,sip?,wav]
+	>=x11-libs/gtk+-2.12.0:2
+	sys-devel/gettext
+	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? ( >=gnome-base/libgnome-2.14.0
+		>=gnome-base/libgnomeui-2.14.0 )
+	ldap? ( net-nds/openldap )
+	libnotify? ( x11-libs/libnotify )
+	shm? ( x11-libs/libXext )
+	xv? ( x11-libs/libXv )"
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	>=dev-util/pkgconfig-0.20
+	>=dev-util/intltool-0.35
+	doc? ( app-text/scrollkeeper
+		app-text/gnome-doc-utils )
+	v4l? ( sys-kernel/linux-headers )"
+
+DOCS="AUTHORS ChangeLog FAQ NEWS README TODO"
+
+# NOTES:
+#
+# make 3.80 is breaking installation phase, need make 3.81 at least
+# gettext is required for glib and intltool so not directly but painless to add
+# ekiga doesn't work with opal-3.5* and ptlib-2.5*
+
+pkg_setup() {
+	# 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
+		--enable-fast-install
+		--disable-maintainer-mode
+		--enable-libtool-lock
+		$(use_enable avahi)
+		$(use_enable dbus)
+		$(use_enable dbus dbus_service)
+		$(use_enable 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 ldap)
+		$(use_enable libnotify notify)
+		$(use_enable nls)
+		$(use_enable static static-libs)
+		$(use_enable xv)"
+}
+
+src_prepare() {
+	# remove call to gconftool-2 --shutdown
+	# upstream has been contacted, see bug 555976 in their bugtracker
+	# TODO: ekiga team don't agree with this patch
+	sed -i -e '/gconftool-2 --shutdown/d' Makefile.in \
+		|| die "patching Makefile.in failed"
+
+	# fix ekiga-helper dbus service .in file
+	# has been fixed by upstream, see bug 555974 in their bug tracker
+	# TODO: check for fix in new releases
+	sed -i -e 's/@PACKAGE_NAME@/ekiga/'\
+		src/components/org.ekiga.Helper.service.in \
+		|| die "patching src/components/org.ekiga.Helper.service.in failed"
+
+	# fix compilation issues when PTRACING is disabled in ptlib
+	# upstream has been contacted, see bug 575433 in their bugtracker
+	epatch "${FILESDIR}"/${P}-ptracing.patch
+
+	# mmx is automatically enabled for some arch, want it to be a user choice
+	# upstream has been contacted, see bug 575831 in their bugtracker
+	if use mmx; then
+		sed -i -e "s/use_x86_asm=no/use_x86_asm=yes/" configure \
+			|| die "patching configure failed"
+	else
+		sed -i -e "s/use_x86_asm=yes/use_x86_asm=no/" configure \
+			|| die "patching configure failed"
+	fi
+
+	# SIP is automatically enabled with opal[sip], want it to be a user choice
+	# upstream has been contacted, see bug 575832 in their bugtracker
+	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 has been contacted, see bug 575833 in their bugtracker
+	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
+
+	# SHM support from libXext is auto-enabled, want it to be a user choice
+	# upstream has been contacted, see bug 575835 in their bugtracker
+	if ! use shm; then
+		sed -i -e "s/with_shm=\"yes\"/with_shm=\"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
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! use gnome; then
+		ewarn "USE=-gnome is experimental, some weirdness with the UI and"
+		ewarn "config keys should appear."
+	fi
+}
diff --git a/net-im/ekiga/files/ekiga-3.0.2-ptracing.patch b/net-im/ekiga/files/ekiga-3.0.2-ptracing.patch
new file mode 100644
index 0000000..089a0be
--- /dev/null
+++ b/net-im/ekiga/files/ekiga-3.0.2-ptracing.patch
@@ -0,0 +1,148 @@
+diff -ru ekiga-3.0.2-old/lib/engine/audioinput/skel/audioinput-core.cpp ekiga-3.0.2/lib/engine/audioinput/skel/audioinput-core.cpp
+--- ekiga-3.0.2-old/lib/engine/audioinput/skel/audioinput-core.cpp	2009-01-12 14:52:58.000000000 -0500
++++ ekiga-3.0.2/lib/engine/audioinput/skel/audioinput-core.cpp	2009-03-14 13:54:09.000000000 -0400
+@@ -198,14 +198,13 @@
+        iter++)
+     (*iter)->get_devices (devices);
+ 
+-  if (PTrace::CanTrace(4)) {
+-     for (std::vector<AudioInputDevice>::iterator iter = devices.begin ();
+-         iter != devices.end ();
+-         iter++) {
+-      PTRACE(4, "AudioInputCore\tDetected Device: " << *iter);
+-    }
+-  }
+-
++#if PTRACING
++	for (std::vector<AudioInputDevice>::iterator iter = devices.begin ();
++			iter != devices.end ();
++			iter++) {
++		PTRACE(4, "AudioInputCore\tDetected Device: " << *iter);
++	}
++#endif // PTRACING
+ }
+ 
+ void AudioInputCore::set_device(const AudioInputDevice & device)
+diff -ru ekiga-3.0.2-old/lib/engine/audiooutput/skel/audiooutput-core.cpp ekiga-3.0.2/lib/engine/audiooutput/skel/audiooutput-core.cpp
+--- ekiga-3.0.2-old/lib/engine/audiooutput/skel/audiooutput-core.cpp	2009-01-12 14:52:58.000000000 -0500
++++ ekiga-3.0.2/lib/engine/audiooutput/skel/audiooutput-core.cpp	2009-03-14 13:53:59.000000000 -0400
+@@ -151,14 +151,13 @@
+        iter++)
+     (*iter)->get_devices (devices);
+ 
+-  if (PTrace::CanTrace(4)) {
+-     for (std::vector<AudioOutputDevice>::iterator iter = devices.begin ();
+-         iter != devices.end ();
+-         iter++) {
+-      PTRACE(4, "AudioOutputCore\tDetected Device: " << *iter);
+-    }
+-  }
+-
++#if PTRACING
++	for (std::vector<AudioOutputDevice>::iterator iter = devices.begin ();
++			iter != devices.end ();
++			iter++) {
++		PTRACE(4, "AudioOutputCore\tDetected Device: " << *iter);
++	}
++#endif // PTRACING
+ }
+ 
+ void AudioOutputCore::set_device(AudioOutputPS ps, const AudioOutputDevice & device)
+diff -ru ekiga-3.0.2-old/lib/engine/videoinput/skel/videoinput-core.cpp ekiga-3.0.2/lib/engine/videoinput/skel/videoinput-core.cpp
+--- ekiga-3.0.2-old/lib/engine/videoinput/skel/videoinput-core.cpp	2009-01-12 14:52:59.000000000 -0500
++++ ekiga-3.0.2/lib/engine/videoinput/skel/videoinput-core.cpp	2009-03-14 13:54:35.000000000 -0400
+@@ -201,13 +201,13 @@
+        iter++)
+     (*iter)->get_devices (devices);
+ 
+-  if (PTrace::CanTrace(4)) {
+-     for (std::vector<VideoInputDevice>::iterator iter = devices.begin ();
+-         iter != devices.end ();
+-         iter++) {
+-      PTRACE(4, "VidInputCore\tDetected Device: " << *iter);
+-    }
+-  }
++#if PTRACING
++	for (std::vector<VideoInputDevice>::iterator iter = devices.begin ();
++			iter != devices.end ();
++			iter++) {
++		PTRACE(4, "VidInputCore\tDetected Device: " << *iter);
++	}
++#endif
+ }
+ 
+ void VideoInputCore::set_device(const VideoInputDevice & device, int channel, VideoInputFormat format)
+diff -ru ekiga-3.0.2-old/lib/gui/xvwindow.cpp ekiga-3.0.2/lib/gui/xvwindow.cpp
+--- ekiga-3.0.2-old/lib/gui/xvwindow.cpp	2009-01-12 14:52:58.000000000 -0500
++++ ekiga-3.0.2/lib/gui/xvwindow.cpp	2009-03-14 13:56:05.000000000 -0400
+@@ -409,8 +409,9 @@
+           continue;
+         }
+ 
+-        if (PTrace::CanTrace (4)) 
+-          DumpCapabilities (candidateXVPort);
++#if PTRACING
++				DumpCapabilities (candidateXVPort);
++#endif // PTRACING
+ 
+         // Check if the Port supports YV12/YUV colorspace
+         supportsYV12 = false;
+@@ -684,16 +685,16 @@
+       }
+     }
+   
+-    if ( (_useShm) && (PTrace::CanTrace (4)) ) {
+-      int j = 0;
+-      PTRACE(4, "XVideo\tCreated XvImage (" << _XVImage[i]->width << "x" << _XVImage[i]->height 
+-            << ", data size: " << _XVImage[i]->data_size << ", num_planes: " << _XVImage[i]->num_planes);
+-  
+-      for (j = 0 ; j < _XVImage[i]->num_planes ; j++) 
+-        PTRACE(4, "XVideo\t  Plane " << j << ": pitch=" << _XVImage[i]->pitches [j] << ", offset=" << _XVImage[i]->offsets [j]);
+-    }
+-  
+-    if (_useShm) {
++#if PTRACING
++		int j = 0;
++		PTRACE(4, "XVideo\tCreated XvImage (" << _XVImage[i]->width << "x" << _XVImage[i]->height 
++				<< ", data size: " << _XVImage[i]->data_size << ", num_planes: " << _XVImage[i]->num_planes);
++
++		for (j = 0 ; j < _XVImage[i]->num_planes ; j++) 
++			PTRACE(4, "XVideo\t  Plane " << j << ": pitch=" << _XVImage[i]->pitches [j] << ", offset=" << _XVImage[i]->offsets [j]);
++#endif // PTRACING
++
++		if (_useShm) {
+       _XShmInfo[i].shmid = shmget (IPC_PRIVATE, _XVImage[i]->data_size, IPC_CREAT | 0777);
+       if (_XShmInfo[i].shmid < 0) {
+         XFree (_XVImage[i]);
+diff -ru ekiga-3.0.2-old/lib/gui/xwindow.cpp ekiga-3.0.2/lib/gui/xwindow.cpp
+--- ekiga-3.0.2-old/lib/gui/xwindow.cpp	2009-01-12 14:52:57.000000000 -0500
++++ ekiga-3.0.2/lib/gui/xwindow.cpp	2009-03-14 13:56:50.000000000 -0400
+@@ -200,8 +200,9 @@
+   PTRACE(4, "X11\tInitiasing new X11 window with " << windowWidth << "x" << windowHeight << " at " << x << "," << y);
+   XLockDisplay (_display);
+ 
+-  if (PTrace::CanTrace (4)) 
+-    DumpVisuals();
++#if PTRACING
++	DumpVisuals();
++#endif // PTRACING
+ 
+   if (!CreateAtomsAndWindow(gc, x, y, windowWidth, windowHeight)) {
+     XUnlockDisplay(_display);
+diff -ru ekiga-3.0.2-old/src/gui/main.cpp ekiga-3.0.2/src/gui/main.cpp
+--- ekiga-3.0.2-old/src/gui/main.cpp	2009-01-12 14:56:04.000000000 -0500
++++ ekiga-3.0.2/src/gui/main.cpp	2009-03-14 12:47:03.000000000 -0400
+@@ -4713,10 +4713,13 @@
+   /* Ekiga initialisation */
+   static GnomeMeeting instance;
+ 
++#if PTRACING
+   if (debug_level != 0)
+     PTrace::Initialise (PMAX (PMIN (5, debug_level), 0), NULL,
+ 			PTrace::Timestamp | PTrace::Thread
+ 			| PTrace::Blocks | PTrace::DateAndTime);
++#endif // PTRACING
++
+ #ifdef EKIGA_REVISION
+   PTRACE(1, "Ekiga SVN revision: " << EKIGA_REVISION);
+ #endif
diff --git a/net-im/ekiga/metadata.xml b/net-im/ekiga/metadata.xml
new file mode 100644
index 0000000..ef56750
--- /dev/null
+++ b/net-im/ekiga/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>maintainer-wanted</herd>
+<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>
+</use>
+</pkgmetadata>