fix gaim dual executable build

3 files changed, 80 insertions, 1 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 674279d68eb9..ff9838dd63e1 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.13 2002/05/16 17:29:52 sandymac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.14 2002/05/17 04:45:51 blocke Exp $
+
+
+*gaim-0.58-r1 (17 May 2002)
+
+  17 May 2002; Bruce A. Locke <blocke@shivan.org> gaim-0.58-r1.ebuild :
+
+  Building of both gaim and gaim_applet executables fixed (econf added back).
+  Fixes bug #2786.
 
 *gaim-0.58 (16 May 2002)
 
diff --git a/net-im/gaim/files/digest-gaim-0.58-r1 b/net-im/gaim/files/digest-gaim-0.58-r1
new file mode 100644
index 000000000000..658e27f1c910
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.58-r1
@@ -0,0 +1 @@
+MD5 fd7b6eeb624810cb23c924802825e1b4 gaim-0.58.tar.bz2 1424757
diff --git a/net-im/gaim/gaim-0.58-r1.ebuild b/net-im/gaim/gaim-0.58-r1.ebuild
new file mode 100644
index 000000000000..5def72d832cc
--- /dev/null
+++ b/net-im/gaim/gaim-0.58-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.58-r1.ebuild,v 1.1 2002/05/17 04:45:51 blocke Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Gtk Instant Messenger client"
+
+SRC_URI1="http://unc.dl.sourceforge.net/sourceforge/gaim/${P}.tar.bz2"
+SRC_URI2="http://telia.dl.sourceforge.net/sourceforge/gaim/${P}.tar.bz2"
+SRC_URI3="http://belnet.dl.sourceforge.net/sourceforge/gaim/${P}.tar.bz2"
+SRC_URI="${SRC_URI1} ${SRC_URI2} ${SRC_URI3}"
+
+HOMEPAGE="http://gaim.sourceforge.net"
+LICENSE="GPL-2"
+SLOT="0"
+DEPEND=">=x11-libs/gtk+-1.2.10-r4
+	=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 )
+	gnome? ( >=gnome-base/gnome-core-1.4
+		>=media-libs/gdk-pixbuf-0.16.0 )"
+
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	
+	local myopts gnomeopts
+
+	use esd  || myopts="--disable-esd"
+	use nas  || myopts="${myopts} --disable-nas"
+	use perl || myopts="${myopts} --disable-perl"
+
+	use arts || myopts="${myopts} --disable-artsc"
+	use arts && KDEDIR="${KDE3DIR}"
+
+	use nls  || myopts="${myopts} --disable-nls"
+
+	gnomeopts="${myopts}"
+	myopts="${myopts} --disable-gnome"
+
+	# always build standalone gaim program
+	econf ${myopts} || die
+	emake || die
+
+	# if gnome support is enabled, then build gaim_applet
+	use gnome && ( \
+		gnomeopts="${gnomeopts} --with-gnome=${GNOME_PATH} --enable-panel"
+
+		# save appletless version and clean up
+		cp src/gaim ${S}/gaim || die "standalone version failed to build"
+		make distclean || die
+
+		econf ${gnomeopts} || die
+		emake || die
+	)
+
+}
+
+src_install () {
+
+	make DESTDIR=${D} install || die
+
+	# if gnome enabled, make sure to install standalone version also
+	use gnome && dobin ${S}/gaim
+
+	dodoc ABOUT-NLS AUTHORS HACKING INSTALL NEWS README TODO
+}