Changed description by request of gnomemeeting head developer (to reflect changes in gnomemeeting-1.2.0)

2 files changed, 40 insertions, 21 deletions

diff --git a/net-im/gnomemeeting/ChangeLog b/net-im/gnomemeeting/ChangeLog
index a6ce817ba30b..1b5e30b9439f 100644
--- a/net-im/gnomemeeting/ChangeLog
+++ b/net-im/gnomemeeting/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gnomemeeting
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.47 2005/01/09 23:31:53 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.48 2005/01/10 16:07:07 stkn Exp $
+
+  10 Jan 2005; Stefan Knoblich <stkn@gentoo.org> gnomemeeting-1.2.0.ebuild:
+  Updated the description to reflect recent changes in gnomeeting-1.2.0 (by request
+  of gnomemeeting head developer).
 
   10 Jan 2005; Stefan Knoblich <stkn@gentoo.org> gnomemeeting-1.2.0.ebuild:
   Marked ~alpha.
diff --git a/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild b/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild
index 41e0a1196538..1351eac92b19 100644
--- a/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild
@@ -1,10 +1,10 @@
 # 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.3 2005/01/09 23:31:53 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild,v 1.4 2005/01/10 16:07:07 stkn Exp $
 
 inherit gnome2 eutils
 
-DESCRIPTION="Gnome NetMeeting client"
+DESCRIPTION="H.323 videoconferencing and VoIP softphone"
 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"
@@ -12,32 +12,33 @@ SRC_URI="http://www.gnomemeeting.org/includes/clicks_counter.php?http://www.gnom
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc ~alpha"
-IUSE="ipv6 sdl ssl howl"
+IUSE="ipv6 sdl ssl howl gnome"
 
 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 )"
+	howl? ( >=net-misc/howl-0.9.7 )
+	gnome? ( >=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
+		gnome-extra/evolution-data-server )"
+
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.20
 	dev-lang/perl
-	app-text/scrollkeeper"
+	gnome? ( app-text/scrollkeeper )"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
@@ -73,18 +74,32 @@ src_compile() {
 		--host=${CHOST} \
 		${myconf} \
 		$(use_enable howl) \
-		$(use_enable ipv6) || die "configure failed"
+		$(use_enable ipv6) \
+		$(use_enable gnome) || die "configure failed"
 	emake || die
 }
 
-pkg_postinst() {
+src_install() {
+
+	if use gnome; then
+		gnome2_src_install
+	else
+		emake DESTDIR=${D} install || die "make install failed"
+		rm -rf ${D}/usr/lib/bonobo
+
+		dodoc AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO
+	fi
+}
 
-	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
+pkg_postinst() {
 
+	if use gnome; then
+		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
+	fi
 }
 
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO"