housekeeping and revision bump

10 files changed, 103 insertions, 190 deletions

diff --git a/net-im/gnomemeeting/ChangeLog b/net-im/gnomemeeting/ChangeLog
index 394e06cb6fb7..f4eaf0a06bc5 100644
--- a/net-im/gnomemeeting/ChangeLog
+++ b/net-im/gnomemeeting/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # $Header:
 
+*gnomemeeting-0.96.1-r1 (01 Apr 2003)
+
+  01 Apr 2003; Alastair Tse <liquidx@gentoo.org>
+  gnomemeeting-0.96.1-r1.ebuild,
+  files/gnomemeeting-0.96.1-pwcworkaround.patch:
+  backported patch from cvs to fix for PWC cameras. 
+  added gnome and ipv6 use flags. deps cleanup.
+  depends on newest openh323 and pwlib
+
 *gnomemeeting-0.96.1 (20 Mar 2003)
 
   20 Mar 2003; Alastair Tse <liquidx@gentoo.org> gnomemeeting-0.96.1.ebuild:
diff --git a/net-im/gnomemeeting/files/digest-gnomemeeting-0.92.1-r1 b/net-im/gnomemeeting/files/digest-gnomemeeting-0.92.1-r1
deleted file mode 100644
index 989882301be3..000000000000
--- a/net-im/gnomemeeting/files/digest-gnomemeeting-0.92.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e0e4fd4be47ddd42f74056f04ef5f008 GnomeMeeting-0.92.1.tar.gz 1202441
diff --git a/net-im/gnomemeeting/files/digest-gnomemeeting-0.93.0 b/net-im/gnomemeeting/files/digest-gnomemeeting-0.93.0
deleted file mode 100644
index ad99cf4b96fa..000000000000
--- a/net-im/gnomemeeting/files/digest-gnomemeeting-0.93.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e485c24c111b7ad45b7da0349a028852 GnomeMeeting-0.93.0.tar.gz 1349806
diff --git a/net-im/gnomemeeting/files/digest-gnomemeeting-0.93.1 b/net-im/gnomemeeting/files/digest-gnomemeeting-0.93.1
deleted file mode 100644
index 3a93420ad70f..000000000000
--- a/net-im/gnomemeeting/files/digest-gnomemeeting-0.93.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09521fcca99613294590f7954e2a5e72 GnomeMeeting-0.93.1.tar.gz 1347294
diff --git a/net-im/gnomemeeting/files/digest-gnomemeeting-0.96.1-r1 b/net-im/gnomemeeting/files/digest-gnomemeeting-0.96.1-r1
new file mode 100644
index 000000000000..c8a03220c281
--- /dev/null
+++ b/net-im/gnomemeeting/files/digest-gnomemeeting-0.96.1-r1
@@ -0,0 +1 @@
+MD5 980825e1cde57c3294d209380af5a36b gnomemeeting-0.96.1.tar.gz 1938080
diff --git a/net-im/gnomemeeting/files/gnomemeeting-0.96.1-pwcworkaround.patch b/net-im/gnomemeeting/files/gnomemeeting-0.96.1-pwcworkaround.patch
new file mode 100644
index 000000000000..9780948ec34c
--- /dev/null
+++ b/net-im/gnomemeeting/files/gnomemeeting-0.96.1-pwcworkaround.patch
@@ -0,0 +1,20 @@
+--- gnomemeeting-0.96.1/src/videograbber.cpp	2003-03-04 22:04:48.000000000 +0000
++++ gnomemeeting-cvs/src/videograbber.cpp	2003-03-31 00:07:44.000000000 +0100
+@@ -517,14 +517,14 @@
+         if (!grabber->SetChannel(video_channel))
+           error_code = 2;
+       else
++	if (!grabber->SetFrameSizeConverter (width, height, FALSE))
++	   error_code = 5;
++      else
+ 	if (!grabber->SetColourFormatConverter ("YUV420P"))
+ 	  error_code = 3;
+       else
+ 	if (!grabber->SetFrameRate (30))
+ 	  error_code = 4;
+-      else
+-	if (!grabber->SetFrameSizeConverter (width, height, FALSE))
+-	   error_code = 5;
+     }
+ 
+ 
diff --git a/net-im/gnomemeeting/gnomemeeting-0.92.1-r1.ebuild b/net-im/gnomemeeting/gnomemeeting-0.92.1-r1.ebuild
deleted file mode 100644
index 599c2137103e..000000000000
--- a/net-im/gnomemeeting/gnomemeeting-0.92.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.92.1-r1.ebuild,v 1.5 2003/02/13 14:09:07 vapier Exp $
-
-inherit gnome2
-
-S="${WORKDIR}/GnomeMeeting-${PV}"
-SRC_URI="http://www.gnomemeeting.org/downloads/latest/sources/GnomeMeeting-${PV}.tar.gz"
-HOMEPAGE="http://www.gnomemeeting.org"
-DESCRIPTION="Gnome NetMeeting client"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-RDEPEND="net-libs/openh323
-	>=dev-libs/glib-2.0.3
-	>=x11-libs/gtk+-2.0.5
-	>=gnome-base/gconf-1.2.0
-	>=sys-devel/autoconf-2.52
-	>=dev-libs/pwlib-1.2.19
-	>=net-nds/openldap-2.0.21
-	>=dev-libs/libIDL-0.8.0
-	>=net-libs/linc-0.5.0-r2
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnomeui-2.0.0
-	>=gnome-base/gnome-common-1.2.4-r3"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17"
-
-src_compile() {
-
-	cd ${S}
-	export PWLIBDIR=/usr/share/pwlib
-	export OPENH323DIR=/usr/share/openh323
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--with-ptlib-includes=$PWLIBDIR/include/ptlib \
-		--with-ptlib-libs=/usr/lib \
-		--with-openh323-includes=$OPENH323DIR/include \
-		--with-openh323-libs=/usr/lib \
-		--host=${CHOST} || die
-
-	#manually disable installation of schemas
-	cp Makefile Makefile.orig
-	sed -e "s/^install-data-local: install-schemas/install-data-local:/g" Makefile.orig > Makefile || die
-	emake || die
-}
-
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO"
-G2CONF="${G2CONF} --enable-platform-gnome-2"
-SCHEMAS="gnomemeeting.schema"
-	
-															
diff --git a/net-im/gnomemeeting/gnomemeeting-0.93.0.ebuild b/net-im/gnomemeeting/gnomemeeting-0.93.0.ebuild
deleted file mode 100644
index 6783da341937..000000000000
--- a/net-im/gnomemeeting/gnomemeeting-0.93.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.93.0.ebuild,v 1.2 2003/02/13 14:09:11 vapier Exp $
-
-inherit gnome2
-
-S="${WORKDIR}/GnomeMeeting-${PV}"
-SRC_URI="http://www.gnomemeeting.org/downloads/latest/sources/GnomeMeeting-${PV}.tar.gz"
-HOMEPAGE="http://www.gnomemeeting.org"
-DESCRIPTION="Gnome NetMeeting client"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-RDEPEND="net-libs/openh323
-	>=dev-libs/glib-2.0.3
-	>=x11-libs/gtk+-2.0.5
-	>=gnome-base/gconf-1.2.0
-	>=sys-devel/autoconf-2.52
-	>=dev-libs/pwlib-1.2.19
-	>=net-nds/openldap-2.0.21
-	>=dev-libs/libIDL-0.8.0
-	>=net-libs/linc-0.5.0-r2
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnomeui-2.0.0
-	>=gnome-base/gnome-common-1.2.4-r3"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17"
-
-src_compile() {
-
-	cd ${S}
-	export PWLIBDIR=/usr/share/pwlib
-	export OPENH323DIR=/usr/share/openh323
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--with-ptlib-includes=$PWLIBDIR/include/ptlib \
-		--with-ptlib-libs=/usr/lib \
-		--with-openh323-includes=$OPENH323DIR/include \
-		--with-openh323-libs=/usr/lib \
-		--host=${CHOST} || die
-
-	# disable arts stuff even if arts is found 
-	# I can't get gnomemeeting to compile with arts support
-	# This is a new "feature" of the latest version and there
-	# isn't a configure option available for disabling support
-	if [ "`use kde`" ] ; then
-                cd ..
-                patch -p0 < ${FILESDIR}/ifarts.diff
-                cd ${S}
-        fi
-	
-	#manually disable installation of schemas
-	cp Makefile Makefile.orig
-	sed -e "s/^install-data-local: install-schemas/install-data-local:/g" Makefile.orig > Makefile || die
-	make || die
-}
-
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO"
-G2CONF="${G2CONF} --enable-platform-gnome-2"
-SCHEMAS="gnomemeeting.schema"
-	
-															
diff --git a/net-im/gnomemeeting/gnomemeeting-0.93.1.ebuild b/net-im/gnomemeeting/gnomemeeting-0.93.1.ebuild
deleted file mode 100644
index 8db5ce7ff176..000000000000
--- a/net-im/gnomemeeting/gnomemeeting-0.93.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.93.1.ebuild,v 1.7 2003/02/13 14:09:17 vapier Exp $
-
-IUSE="sdl ssl"
-
-inherit gnome2
-
-S="${WORKDIR}/GnomeMeeting-${PV}"
-
-SRC_URI="http://www.gnomemeeting.org/downloads/latest/sources/GnomeMeeting-${PV}.tar.gz"
-HOMEPAGE="http://www.gnomemeeting.org"
-DESCRIPTION="Gnome NetMeeting client"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc "
-
-DEPEND="=dev-libs/pwlib-1.3.3*
-	=net-libs/openh323-1.9.3*
-	>=net-nds/openldap-2.0.25
-	>=gnome-base/gnome-2.0.1
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sdl? ( >=media-libs/libsdl-1.2.3 )"
-
-RDEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17"
-
-src_compile() {
-
-	cd ${S}
-	local myconf
-
-	use ssl && myconf="--with-openssl-includes=/usr/include/openssl --with-openssl-libs=/usr/lib"
-
-	use sdl && myconf="${myconf} --with-sdl-prefix=/usr" \
-		|| myconf="${myconf} --disable-sdltest"
-		
-	export PWLIBDIR=/usr/share/pwlib
-	export OPENH323DIR=/usr/share/openh323
-
-	econf \
-		--with-ptlib-includes=$PWLIBDIR/include/ptlib \
-		--with-ptlib-libs=/usr/lib \
-		--with-openh323-includes=$OPENH323DIR/include \
-		--with-openh323-libs=/usr/lib \
-		${myconf} || die "configure failed"
-
-	#manually disable installation of schemas
-	cp Makefile Makefile.orig
-	sed -e "s/^install-data-local: install-schemas/install-data-local:/g" Makefile.orig > Makefile || die
-	make || die
-}
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO"
-G2CONF="${G2CONF} --enable-platform-gnome-2"
-SCHEMAS="gnomemeeting.schema"
-	
-															
diff --git a/net-im/gnomemeeting/gnomemeeting-0.96.1-r1.ebuild b/net-im/gnomemeeting/gnomemeeting-0.96.1-r1.ebuild
new file mode 100644
index 000000000000..965f696fbabb
--- /dev/null
+++ b/net-im/gnomemeeting/gnomemeeting-0.96.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.96.1-r1.ebuild,v 1.1 2003/04/01 13:00:12 liquidx Exp $
+
+IUSE="sdl ssl ipv6 gnome"
+inherit gnome2
+
+S="${WORKDIR}/${P}"
+SRC_URI="http://www.gnomemeeting.org/downloads/latest/sources/${P}.tar.gz"
+HOMEPAGE="http://www.gnomemeeting.org"
+DESCRIPTION="Gnome NetMeeting client"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc -sparc"
+DEPEND=">=dev-libs/pwlib-1.4.11
+	>=net-libs/openh323-1.11.7
+	>=net-nds/openldap-2.0.25
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sdl? ( >=media-libs/libsdl-1.2.4 )
+    gnome? ( >=gnome-base/libbonoboui-2.0
+    	>=gnome-base/libbonobo-2.0
+    	>=gnome-base/libgnomeui-2.0
+        >=gnome-base/libgnome-2.0
+		>=net-libs/linc-0.5.0 )
+	>=x11-libs/gtk+-2.0.0
+	>=dev-libs/glib-2.0.0    
+	>=gnome-base/gconf-2.0
+	>=dev-libs/libxml2-2.4.23
+	>=media-sound/esound-0.2.28 
+    >=gnome-base/ORBit2-2.5.0"
+
+RDEPEND="${DEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.20
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+    # backported patch from CVS. remove this in next release.
+    epatch ${FILESDIR}/${P}-pwcworkaround.patch || die "patch failed"
+}
+
+src_compile() {
+
+	local myconf
+	export PWLIBDIR=/usr/share/pwlib
+	export OPENH323DIR=/usr/share/openh323
+    
+    myconf="${myconf} --with-ptlib-includes=${PWLIBDIR}/include/ptlib"
+    myconf="${myconf} --with-ptlib-libs=/usr/lib"
+    myconf="${myconf} --with-openh323-includes=${OPENH323DIR}/include"
+    myconf="${myconf} --with-openh323-libs=/usr/lib"
+    
+    if [ -n "`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"
+	use ipv6 && myconf="${myconf} --enable-ipv6" \
+    	|| myconf="${myconf} --disable-ipv6"
+	use gnome || myconf="${myconf} --disable-gnome"
+        
+    econf ${myconf} || die "configure failed"
+    make || die
+}
+
+DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO"
+G2CONF="${G2CONF} --enable-platform-gnome-2"
+SCHEMAS="gnomemeeting.schema"
+	
+