gnome friendliness

4 files changed, 34 insertions, 20 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index f36b61bf4ac5..92c1f0c493d6 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
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.10 2002/04/25 19:12:47 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.11 2002/04/25 21:11:42 seemant Exp $
+
+*gaim-0.56-r2 (25 Apr 2002)
+
+  25 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gaim-0.56-r2.ebuild :
+
+  Bundled gdk-pixbuf dependency with gnome flag for now.  Thanks to
+  punkball@ccs.neu.edu (James Dennis) in bug #2103 for this.
 
 *gaim-0.56-r1 (25 Apr 2002)
 
diff --git a/net-im/gaim/files/digest-gaim-0.55 b/net-im/gaim/files/digest-gaim-0.55
deleted file mode 100644
index 5b5d17997fe9..000000000000
--- a/net-im/gaim/files/digest-gaim-0.55
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc9fa709bf33b253a9a1f5decb2141b6 gaim-0.55.tar.bz2 1323247
diff --git a/net-im/gaim/files/digest-gaim-0.56-r2 b/net-im/gaim/files/digest-gaim-0.56-r2
new file mode 100644
index 000000000000..6473b1ea79fc
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.56-r2
@@ -0,0 +1 @@
+MD5 fd7c5cbea0a862d0bcefbf16e4a27db1 gaim-0.56.tar.bz2 1317730
diff --git a/net-im/gaim/gaim-0.55.ebuild b/net-im/gaim/gaim-0.56-r2.ebuild
index 8fe590479c0f..3287da9823ce 100644
--- a/net-im/gaim/gaim-0.55.ebuild
+++ b/net-im/gaim/gaim-0.56-r2.ebuild
@@ -1,6 +1,7 @@
 # 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.55.ebuild,v 1.1 2002/03/30 11:20:51 seemant Exp $
+# Maintainer: system@gentoo.org
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.56-r2.ebuild,v 1.1 2002/04/25 21:11:42 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gtk AOL Instant Messenger client"
@@ -8,13 +9,13 @@ SRC_URI="http://prdownloads.sourceforge.net/gaim/${P}.tar.bz2"
 HOMEPAGE="http://gaim.sourceforge.net"
 SLOT="0"
 DEPEND=">=x11-libs/gtk+-1.2.10-r4
-	>=media-libs/gdk-pixbuf-0.16.0
+	esd? ( >=media-sound/esound-0.2.22-r2 )
 	nls? ( sys-devel/gettext )
-	gnome? ( >=gnome-base/gnome-core-1.4 )
-	perl? ( >=sys-devel/perl-5.6.1 )
 	nas? ( >=media-libs/nas-1.4.1-r1 )
-	esd? ( >=media-sound/esound-0.2.22-r2 )
-	arts? ( >=kde-base/kdelibs-2.2 )"
+	arts? ( kde-base/arts )
+	perl? ( >=sys-devel/perl-5.6.1 )
+	gnome? ( >=gnome-base/gnome-core-1.4
+		>=media-libs/gdk-pixbuf-0.16.0 )"
 	
 src_compile() {
     
@@ -25,28 +26,34 @@ src_compile() {
     use perl || myopts="$myopts --disable-perl"
 
     use arts || myopts="$myopts --disable-arts"
-    use arts && KDEDIR=/usr/kde/2
+    use arts && KDEDIR=/usr/kde/3
 
     use nls || myopts="$myopts --disable-nls"
 
     gnomeopts="${myopts}"
 
     # always build standalone gaim program
-    ./configure --host=${CHOST} --disable-gnome --prefix=/usr ${myopts} || die
-    emake || die
+    ./configure 	\
+		--host=${CHOST}	\
+		--disable-gnome	\
+		--prefix=/usr	\
+		${myopts} || die
 
+    emake || die
 
-    # if gnome support is enabled, also build gaim_applet
-    if [ "`use gnome`" ]
-    then
 	# if gnome support is enabled, then build gaim_applet
-	gnomeopts="${gnomeopts} --with-gnome=${GNOME_PATH} --enable-panel"
+    if [ "`use gnome`" ]
+	then
+		gnomeopts="${gnomeopts} --with-gnome=${GNOME_PATH} --enable-panel"
 
-	# save appletless version and clean up
-	cp src/gaim ${S}/gaim
-	make distclean || die
+		# save appletless version and clean up
+		cp src/gaim ${S}/gaim
+		make distclean || die
 
-	./configure --host=${CHOST} --prefix=/usr ${gnomeopts} || die
+		./configure 	\
+			--host=${CHOST}	\
+			--prefix=/usr	\
+			${gnomeopts} || die
     	emake || die
     fi
 
@@ -54,7 +61,7 @@ src_compile() {
 
 src_install () {
 
-    try make DESTDIR=${D} install
+    make DESTDIR=${D} install
 
     # if gnome enabled, make sure to install standalone version also
     use gnome && dobin ${S}/gaim