A new gaim, unmasked for x86 for the 1.4 release. Significant ebuild cleanups too.

3 files changed, 73 insertions, 1 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index e5f43fb069f7..82bb19f60297 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.31 2002/12/24 21:14:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.32 2002/12/30 02:58:07 drobbins Exp $
+
+*gaim-0.5.7 (29 Dec 2002)
+
+  29 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: updated to latest version
+  of gaim, reworked deps to make them simpler, cleaned up the build code, and
+  allowed gtk+ and glib version 2.2.x to satisfy their respective deps (closing
+  bug 12641.) Unmasked for the 1.4 release for x86, ~ for ppc.
 
   23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
   Fix glib and gtk+ deps, as it seems to work with versions 2.2.0 ...
diff --git a/net-im/gaim/files/digest-gaim-0.59.7 b/net-im/gaim/files/digest-gaim-0.59.7
new file mode 100644
index 000000000000..74a7dd4e8e85
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.59.7
@@ -0,0 +1 @@
+MD5 65155b1da1fd5262671a9f21eeaf5e54 gaim-0.59.7.tar.bz2 1533891
diff --git a/net-im/gaim/gaim-0.59.7.ebuild b/net-im/gaim/gaim-0.59.7.ebuild
new file mode 100644
index 000000000000..9c23b282553a
--- /dev/null
+++ b/net-im/gaim/gaim-0.59.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.59.7.ebuild,v 1.1 2002/12/30 02:58:07 drobbins Exp $
+
+#This needs to be defined globally
+inherit kde-functions
+
+IUSE="nas nls esd gnome arts gtk2 perl"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="GTK Instant Messenger client"
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
+HOMEPAGE="http://gaim.sourceforge.net"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc"
+
+DEPEND="=sys-libs/db-1*
+	esd? ( >=media-sound/esound-0.2.22-r2 )
+	nls? ( sys-devel/gettext )
+	nas? ( >=media-libs/nas-1.4.1-r1 )
+	arts? ( >=kde-base/arts-0.9.5 )
+	perl? ( >=sys-devel/perl-5.6.1 )
+	gtk2? ( >=x11-libs/gtk+-2* >=dev-libs/glib-2* ) : 
+	( gnome? ( =gnome-base/gnome-panel-1.4* >=media-libs/gdk-pixbuf-0.16.0 ) : 
+  	( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* ) )"
+
+src_compile() {
+	local myconf
+	use esd  || myconf="--disable-esd"
+	use perl || myconf="${myconf} --disable-perl"
+	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
+
+	use arts && set-kdedir 3 || myconf="${myconf} --disable-artsc"
+	use nls || myconf="${myconf} --disable-nls"
+	use gtk2 && myconf="${myconf} --enable-gtk2"
+
+	# We always build a standalone version of gaim.
+	# In this build, GNOME is always disabled.
+	econf ${myconf} --disable-gnome || die
+	emake || die
+
+	# if gnome support is enabled (and gtk2 disabled), then build gaim_applet
+	if [ "`use gnome`" -a -z "`use gtk2`" ];
+	then
+		# save applet-less version and clean up...
+		cp src/gaim ${S}/gaim || die "standalone version failed to build"
+		make distclean || die
+
+		econf ${myconf} --with-gnome=${GNOME_PATH} --enable-panel || die
+		emake || die "applet failed to build"
+	fi
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	# if gnome enabled, make sure to install standalone version also
+	if [ "`use gnome`" -a -z "`use gtk2`" ]
+	then
+		dobin ${S}/gaim
+	fi
+	dodoc ABOUT-NLS AUTHORS HACKING INSTALL NEWS README TODO
+}