New version, closes #74244

11 files changed, 156 insertions, 16 deletions

diff --git a/net-im/gnomemeeting/ChangeLog b/net-im/gnomemeeting/ChangeLog
index 40b3edcf99d9..e96574d558a0 100644
--- a/net-im/gnomemeeting/ChangeLog
+++ b/net-im/gnomemeeting/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/gnomemeeting
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.44 2004/12/22 02:45:46 obz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.45 2005/01/09 00:26:51 stkn Exp $
+
+*gnomemeeting-1.2.0 (09 Jan 2005)
+
+  09 Jan 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/gnomemeeting-1.2.0-gk-hang-fix.patch, +gnomemeeting-1.2.0.ebuild:
+  New version, ebuild changes submitted by Stefan Schweizer
+  <genstef@gentoo.org>, patch for gk issues included thx to Mihai Rusu
+  <dizzy@roedu.net>
 
 *gnomemeeting-1.0.2-r1 (22 Dec 2004)
 
diff --git a/net-im/gnomemeeting/files/digest-gnomemeeting-1.2.0 b/net-im/gnomemeeting/files/digest-gnomemeeting-1.2.0
new file mode 100644
index 000000000000..adfacf2d8c1d
--- /dev/null
+++ b/net-im/gnomemeeting/files/digest-gnomemeeting-1.2.0
@@ -0,0 +1 @@
+MD5 91028599e3822f7f071b64ecbb9c1452 gnomemeeting-1.2.0.tar.gz 5379825
diff --git a/net-im/gnomemeeting/files/gnomemeeting-1.2.0-gk-hang-fix.patch b/net-im/gnomemeeting/files/gnomemeeting-1.2.0-gk-hang-fix.patch
new file mode 100644
index 000000000000..bd1621106996
--- /dev/null
+++ b/net-im/gnomemeeting/files/gnomemeeting-1.2.0-gk-hang-fix.patch
@@ -0,0 +1,41 @@
+--- src/endpoint.cpp.orig	2004-11-25 21:12:40.000000000 +0200
++++ src/endpoint.cpp	2004-12-23 17:22:40.000000000 +0200
+@@ -2315,8 +2315,6 @@
+                               BOOL set, 
+ 			      unsigned int &vol) 
+ {
+-  H323Connection *con = NULL;
+-
+ #ifdef HAS_IXJ
+   GMLid *l = NULL;
+ #endif
+@@ -2326,10 +2324,6 @@
+ 
+   call_token = GetCurrentCallToken ();
+ 
+-  con = FindConnectionWithLock (call_token);
+-
+-  if (con) {
+-
+ #ifdef HAS_IXJ
+     if (set) {
+ 
+@@ -2339,8 +2333,6 @@
+         l->SetVolume (is_encoding, vol);
+         l->Unlock ();
+ 
+-        con->Unlock ();
+-
+         return TRUE; /* Ignore the sound channel if a LID is used. Hopefully,
+                         OpenH323 will be fixed soon */
+       }
+@@ -2365,9 +2357,6 @@
+       }
+     }
+ 
+-    con->Unlock ();
+-  }
+-
+   return err;
+ }
+ 
diff --git a/net-im/gnomemeeting/gnomemeeting-0.94.1.ebuild b/net-im/gnomemeeting/gnomemeeting-0.94.1.ebuild
index 49fc3b19bd3b..1d8170ef6663 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.94.1.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.94.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.94.1.ebuild,v 1.13 2004/08/22 05:12:47 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.94.1.ebuild,v 1.14 2005/01/09 00:26:51 stkn Exp $
 
 IUSE="sdl ssl"
 
diff --git a/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild b/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
index a252a2bce1c4..43665d34ca5c 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild,v 1.10 2004/10/04 22:37:39 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild,v 1.11 2005/01/09 00:26:51 stkn Exp $
 
 IUSE="sdl ssl ipv6"
 
diff --git a/net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild b/net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild
index 6e50bcd7c7bf..e9fdafc241e7 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild,v 1.5 2004/08/22 05:12:47 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild,v 1.6 2005/01/09 00:26:51 stkn Exp $
 
 inherit gnome2 eutils
 
diff --git a/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild b/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild
index 3f9573f3aace..54f247c3e371 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild,v 1.11 2004/10/04 22:37:39 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild,v 1.12 2005/01/09 00:26:51 stkn Exp $
 
 inherit gnome2 eutils
 
diff --git a/net-im/gnomemeeting/gnomemeeting-1.0.2-r1.ebuild b/net-im/gnomemeeting/gnomemeeting-1.0.2-r1.ebuild
index 35a16e0d5612..d897ffc3a1e2 100644
--- a/net-im/gnomemeeting/gnomemeeting-1.0.2-r1.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.0.2-r1.ebuild,v 1.1 2004/12/22 02:45:46 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.0.2-r1.ebuild,v 1.2 2005/01/09 00:26:51 stkn Exp $
 
 inherit gnome2 eutils
 
diff --git a/net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild b/net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild
index 40d1714bb66c..a1b80dd0dafa 100644
--- a/net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild,v 1.12 2004/12/22 02:45:46 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild,v 1.13 2005/01/09 00:26:51 stkn Exp $
 
 inherit gnome2 eutils
 
diff --git a/net-im/gnomemeeting/gnomemeeting-1.00.ebuild b/net-im/gnomemeeting/gnomemeeting-1.00.ebuild
index 3f15ab8d2cdb..9232ecc6f04d 100644
--- a/net-im/gnomemeeting/gnomemeeting-1.00.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-1.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.00.ebuild,v 1.11 2004/10/04 22:37:39 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.00.ebuild,v 1.12 2005/01/09 00:26:51 stkn Exp $
 
 inherit gnome2
 
diff --git a/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild b/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild
new file mode 100644
index 000000000000..ba70df9848be
--- /dev/null
+++ b/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild,v 1.1 2005/01/09 00:26:51 stkn Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Gnome NetMeeting client"
+HOMEPAGE="http://www.gnomemeeting.org/"
+# now part of gnome-2.4
+SRC_URI="http://www.gnomemeeting.org/includes/clicks_counter.php?http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="ipv6 sdl ssl howl"
+
+RDEPEND=">=dev-libs/pwlib-1.8.3
+	>=net-libs/openh323-1.15.2
+	>=net-nds/openldap-2.0.0
+	>=gnome-base/libbonoboui-2.2.0
+	>=gnome-base/libbonobo-2.2.0
+	>=gnome-base/libgnomeui-2.2.0
+	>=gnome-base/libgnome-2.2.0
+	>=gnome-base/gnome-vfs-2.2.0
+	>=gnome-base/gconf-2.2.0
+	>=gnome-base/orbit-2.5.0
+	>=x11-libs/gtk+-2.4.0
+	>=dev-libs/glib-2.0.0
+	>=dev-libs/libxml2-2.6.1
+	>=media-sound/esound-0.2.28
+	gnome-extra/evolution-data-server
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sdl? ( >=media-libs/libsdl-1.2.4 )
+	howl? ( >=net-misc/howl-0.9.7 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.20
+	dev-lang/perl
+	app-text/scrollkeeper"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Fix a hanging bug which shows up when registered to a GateKeeper
+	# see http://cvs.gnome.org/viewcvs/gnomemeeting/src/endpoint.cpp?only_with_tag=HEAD&r2=1.434&r1=1.433
+	epatch ${FILESDIR}/gnomemeeting-1.2.0-gk-hang-fix.patch
+}
+
+src_compile() {
+
+	local myconf
+
+	myconf="${myconf} --with-ptlib-includes=/usr/include/ptlib"
+	myconf="${myconf} --with-ptlib-libs=/usr/lib"
+	myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
+	myconf="${myconf} --with-openh323-libs=/usr/lib"
+
+	if use ssl; then
+		myconf="${myconf} --with-openssl-libs=/usr/lib"
+		myconf="${myconf} --with-openssl-includes=/usr/include/openssl"
+	fi
+
+	use sdl \
+		&& myconf="${myconf} --with-sdl-prefix=/usr" \
+		|| myconf="${myconf} --disable-sdltest"
+
+	econf \
+		--prefix=/usr \
+		--host=${CHOST} \
+		${myconf} \
+		$(use_enable howl) \
+		$(use_enable ipv6) || die "configure failed"
+	emake || die
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+	# we need to fix the GConf permissions, see bug #59764
+	# <obz@gentoo.org>
+	einfo "Fixing GConf permissions for gnomemeeting"
+	gnomemeeting-config-tool --fix-permissions
+
+}
+
+DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO"