version bump to latest devel version plus stable bump for x86

10 files changed, 84 insertions, 155 deletions

diff --git a/net-im/gnomemeeting/ChangeLog b/net-im/gnomemeeting/ChangeLog
index 0f3d170b487c..353eb0805556 100644
--- a/net-im/gnomemeeting/ChangeLog
+++ b/net-im/gnomemeeting/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # $Header:
 
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> gnomemeeting-0.96.0.ebuild,
+  gnomemeeting-0.96.1.ebuild, gnomemeeting-0.98.0.ebuild:
+  version bump and cleanups
+
   21 Jul 2003; Alastair Tse <liquidx@gentoo.org> gnomemeeting-0.98.0.ebuild:
   removed gnome USE flag because it doesn't work anymore
 
diff --git a/net-im/gnomemeeting/Manifest b/net-im/gnomemeeting/Manifest
index a5f755692087..f0b42545f6e8 100644
--- a/net-im/gnomemeeting/Manifest
+++ b/net-im/gnomemeeting/Manifest
@@ -1,13 +1,10 @@
-MD5 30b84266a4fde9bfaf69e8e22f87b4fa ChangeLog 4680
+MD5 54b853dba74e5ac71eda252db8590aa1 ChangeLog 4844
 MD5 9125b0114ab29f20517e4d0a4159b464 gnomemeeting-0.94.1.ebuild 2054
-MD5 c0c025f4227e02365a0f3af232bf789e gnomemeeting-0.96.0.ebuild 2023
 MD5 1fdaf524c2f0b4538ade1339b56f5c5e gnomemeeting-0.96.1-r1.ebuild 2237
-MD5 8df42e321f20d9a8ffcd73b625f8dce7 gnomemeeting-0.96.1.ebuild 2023
-MD5 5a18d3230864965965900b70e3e3ed00 gnomemeeting-0.98.0.ebuild 1831
-MD5 a63bd0cab4fe6c064724f9c342fdc8f6 gnomemeeting-0.98.4.ebuild 1856
+MD5 722a2ed52de70ffc3eb61c981826fdf9 gnomemeeting-0.98.0.ebuild 1831
+MD5 e9743675671b433c48a35369bd66f1d1 gnomemeeting-0.98.4.ebuild 1856
+MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
 MD5 458cb44a30e47a07c5116219068ab5a3 files/digest-gnomemeeting-0.94.1 72
-MD5 0ebd76f122695483b4073de3a8e7ba89 files/digest-gnomemeeting-0.96.0 72
-MD5 abb5207ac1546a0bb5e8bdefb8755631 files/digest-gnomemeeting-0.96.1 72
 MD5 abb5207ac1546a0bb5e8bdefb8755631 files/digest-gnomemeeting-0.96.1-r1 72
 MD5 d7f5c8ebbb84deee9a443e843b2633a2 files/digest-gnomemeeting-0.98.0 72
 MD5 4a3686c5f4a07cfe93d2025668e96498 files/digest-gnomemeeting-0.98.4 73
diff --git a/net-im/gnomemeeting/files/digest-gnomemeeting-0.96.0 b/net-im/gnomemeeting/files/digest-gnomemeeting-0.96.0
deleted file mode 100644
index d8844ad61f17..000000000000
--- a/net-im/gnomemeeting/files/digest-gnomemeeting-0.96.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0051642ac542a17085fd5e8c5964249c gnomemeeting-0.96.0.tar.gz 1819042
diff --git a/net-im/gnomemeeting/files/digest-gnomemeeting-0.96.1 b/net-im/gnomemeeting/files/digest-gnomemeeting-0.96.1
deleted file mode 100644
index c8a03220c281..000000000000
--- a/net-im/gnomemeeting/files/digest-gnomemeeting-0.96.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 980825e1cde57c3294d209380af5a36b gnomemeeting-0.96.1.tar.gz 1938080
diff --git a/net-im/gnomemeeting/files/digest-gnomemeeting-0.98.4 b/net-im/gnomemeeting/files/digest-gnomemeeting-0.98.4
new file mode 100644
index 000000000000..8d376bc4c291
--- /dev/null
+++ b/net-im/gnomemeeting/files/digest-gnomemeeting-0.98.4
@@ -0,0 +1 @@
+MD5 a85d6db696764196ec1b390c2edcc278 gnomemeeting-0.98.4.tar.bz2 1729926
diff --git a/net-im/gnomemeeting/gnomemeeting-0.96.0.ebuild b/net-im/gnomemeeting/gnomemeeting-0.96.0.ebuild
deleted file mode 100644
index 9975209affcb..000000000000
--- a/net-im/gnomemeeting/gnomemeeting-0.96.0.ebuild
+++ /dev/null
@@ -1,72 +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.96.0.ebuild,v 1.4 2003/06/27 12:29:59 liquidx Exp $
-
-IUSE="sdl ssl"
-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.7*
-	=net-libs/openh323-1.11*
-	>=net-nds/openldap-2.0.25
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sdl? ( >=media-libs/libsdl-1.2.3 )
-	virtual/x11
-	gnome-base/libgnomeui
-	gnome-base/libbonoboui
-	gnome-base/libgnomecanvas
-	gnome-base/libgnome
-	media-libs/libart_lgpl
-	x11-libs/pango
-	>=x11-libs/gtk+-2.0.0
-	dev-libs/atk
-	gnome-base/gnome-vfs
-	gnome-base/gconf
-	gnome-base/libbonobo
-	gnome-base/ORBit2
-	dev-libs/popt
-	dev-libs/libxml2
-	sys-libs/zlib
-	net-libs/linc
-	>=dev-libs/glib-2.0.0
-	media-libs/freetype
-	dev-libs/expat
-	media-libs/fontconfig
-	media-sound/esound"
-
-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.ebuild b/net-im/gnomemeeting/gnomemeeting-0.96.1.ebuild
deleted file mode 100644
index 5d7fb74fd0aa..000000000000
--- a/net-im/gnomemeeting/gnomemeeting-0.96.1.ebuild
+++ /dev/null
@@ -1,72 +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.96.1.ebuild,v 1.3 2003/07/13 12:44:50 aliz Exp $
-
-IUSE="sdl ssl"
-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.7*
-   	=net-libs/openh323-1.11*
-	>=net-nds/openldap-2.0.25
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sdl? ( >=media-libs/libsdl-1.2.3 )
-	virtual/x11
-	gnome-base/libgnomeui
-	gnome-base/libbonoboui
-	gnome-base/libgnomecanvas
-	gnome-base/libgnome
-	media-libs/libart_lgpl
-	x11-libs/pango
-	>=x11-libs/gtk+-2.0.0
-	dev-libs/atk
-	gnome-base/gnome-vfs
-	gnome-base/gconf
-	gnome-base/libbonobo
-	gnome-base/ORBit2
-	dev-libs/popt
-	dev-libs/libxml2
-	sys-libs/zlib
-	net-libs/linc
-	>=dev-libs/glib-2.0.0
-	media-libs/freetype
-	dev-libs/expat
-	media-libs/fontconfig
-	media-sound/esound"
-
-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.98.0.ebuild b/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
index 38286c1ed015..3132f18b8297 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-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.98.0.ebuild,v 1.2 2003/07/21 22:27:47 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild,v 1.3 2003/09/03 13:27:08 liquidx Exp $
 
 IUSE="sdl ssl ipv6"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Gnome NetMeeting client"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc -sparc"
+KEYWORDS="x86 ~ppc -sparc"
 
 DEPEND=">=dev-libs/pwlib-1.5.0
 	>=net-libs/openh323-1.12.0
diff --git a/net-im/gnomemeeting/gnomemeeting-0.98.4.ebuild b/net-im/gnomemeeting/gnomemeeting-0.98.4.ebuild
new file mode 100644
index 000000000000..164950b8d7ce
--- /dev/null
+++ b/net-im/gnomemeeting/gnomemeeting-0.98.4.ebuild
@@ -0,0 +1,67 @@
+# 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.98.4.ebuild,v 1.1 2003/09/03 13:27:08 liquidx Exp $
+
+inherit gnome2
+
+DESCRIPTION="Gnome NetMeeting client"
+HOMEPAGE="http://www.gnomemeeting.org"
+# now part of gnome-2.4
+#SRC_URI="http://www.gnomemeeting.org/downloads/latest/sources/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc -sparc"
+IUSE="sdl ssl ipv6"
+
+DEPEND=">=dev-libs/pwlib-1.5.0
+	>=net-libs/openh323-1.12.0
+	>=net-nds/openldap-2.0.25
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sdl? ( >=media-libs/libsdl-1.2.4 )
+	>=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"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+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 [ -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"
+
+    econf ${myconf} || die "configure failed"
+	emake || die
+}
+
+DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO"
diff --git a/net-im/gnomemeeting/metadata.xml b/net-im/gnomemeeting/metadata.xml
new file mode 100644
index 000000000000..e5f0495c7a9b
--- /dev/null
+++ b/net-im/gnomemeeting/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<maintainer><email>liquidx@gentoo.org</email></maintainer>
+</pkgmetadata>