nas support properly handled

8 files changed, 20 insertions, 288 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index e1fde3b34fdd..26b8b5125dc0 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,9 +1,14 @@
 # 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.24 2002/09/21 05:00:55 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.25 2002/09/24 15:36:48 seemant Exp $
 
 *gaim-0.59.3 (19 Sep 2002)
 
+  24 Sep 2002; Seemant Kulleen <seemant@gentoo.org> gaim-0.59.3.ebuild :
+
+  in bug #8283 drh@myrealbox.com (Daniel Harding) pointed out that nas
+  support is disabled by default.  adjusted ebuild to that effect.
+
   19 Sep 2002; Brandon Low <lostlogic@shivan.org> gaim-0.59.3.ebuild:
 
   This one unbreaks what broke in .2
diff --git a/net-im/gaim/files/digest-gaim-0.59-r2 b/net-im/gaim/files/digest-gaim-0.59-r2
deleted file mode 100644
index 9db3fc84d835..000000000000
--- a/net-im/gaim/files/digest-gaim-0.59-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d32006df4d76095413b4bf0ab2d29351 gaim-0.59.tar.bz2 1496899
diff --git a/net-im/gaim/files/digest-gaim-0.59-r3 b/net-im/gaim/files/digest-gaim-0.59-r3
deleted file mode 100644
index 9db3fc84d835..000000000000
--- a/net-im/gaim/files/digest-gaim-0.59-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d32006df4d76095413b4bf0ab2d29351 gaim-0.59.tar.bz2 1496899
diff --git a/net-im/gaim/files/digest-gaim-0.59.1 b/net-im/gaim/files/digest-gaim-0.59.1
deleted file mode 100644
index 16eb0c7033a0..000000000000
--- a/net-im/gaim/files/digest-gaim-0.59.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 54b85690b75ee1b9f4801f01f1af4f82 gaim-0.59.1.tar.bz2 1553000
diff --git a/net-im/gaim/gaim-0.59-r2.ebuild b/net-im/gaim/gaim-0.59-r2.ebuild
deleted file mode 100644
index 502a29de995f..000000000000
--- a/net-im/gaim/gaim-0.59-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.59-r2.ebuild,v 1.3 2002/08/15 14:47:35 gerk Exp $
-
-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="=x11-libs/gtk+-1.2*
-	=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-panel-1.4.1 
-			<gnome-base/gnome-panel-1.5.0
-		>=media-libs/gdk-pixbuf-0.16.0 )"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-
-	unpack ${P}.tar.bz2
-	
-	# patch for korean encoding
-	# It should be ok with other languages
-	# the patch only works with nls 
-	use nls && patch -p0 < ${FILESDIR}/${P}-korean.patch
-
-}
-
-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
-	
-	# transparency
-	# patch -p1 < ${FILESDIR}/transparency.diff || die
-	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
-}
diff --git a/net-im/gaim/gaim-0.59-r3.ebuild b/net-im/gaim/gaim-0.59-r3.ebuild
deleted file mode 100644
index d1cdde1b53e9..000000000000
--- a/net-im/gaim/gaim-0.59-r3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.59-r3.ebuild,v 1.2 2002/08/19 00:21:12 blocke Exp $
-
-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.0* =dev-libs/glib-2.0* )
-		  || ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2*
-		     ( gnome? ( =gnome-base/gnome-panel-1.4* >=media-libs/gdk-pixbuf-0.16.0 ) ) )"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-
-	unpack ${P}.tar.bz2
-	
-	# patch for korean encoding
-	# It should be ok with other languages
-	# the patch only works with nls 
-	# PULLED -- got complaints it was hosing gtk2 non-korean users
-	# use nls && patch -p0 < ${FILESDIR}/${P}-korean.patch
-
-}
-
-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}"
-
-	if [ "`use gtk2`" ];
-	then
-
-		# GTK+ 2 support
-		myopts="${myopts} --enable-gtk2"
-
-	fi
-
-	gnomeopts="${myopts}"
-
-	# Gnome is disabled for GTK+ 2.0 build and first build of GTK 1.4 version
-	myopts="${myopts} --disable-gnome"
-
-	# always build standalone gaim program
-	econf ${myopts} || die
-	emake || die
-
-	# if gnome support is enabled (and gtk2 disabled), then build gaim_applet
-	if [ use gnome -a -z "`use gtk2`" ];
-	then
-		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
-	fi
-}
-
-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
-}
diff --git a/net-im/gaim/gaim-0.59.1.ebuild b/net-im/gaim/gaim-0.59.1.ebuild
deleted file mode 100644
index 987a03a3117d..000000000000
--- a/net-im/gaim/gaim-0.59.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.59.1.ebuild,v 1.2 2002/08/31 19:35:32 danarmak Exp $
-
-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.0* =dev-libs/glib-2.0* )
-		  || ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2*
-		     ( gnome? ( =gnome-base/gnome-panel-1.4* >=media-libs/gdk-pixbuf-0.16.0 ) ) )"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-
-	unpack ${P}.tar.bz2
-	
-	# patch for korean encoding
-	# It should be ok with other languages
-	# the patch only works with nls 
-	# PULLED -- got complaints it was hosing gtk2 non-korean users
-	# use nls && patch -p0 < ${FILESDIR}/${P}-korean.patch
-
-}
-
-src_compile() {
-	
-	local myopts gnomeopts
-
-	use esd  || myopts="--disable-esd"
-	use nas  || myopts="${myopts} --disable-nas"
-	use perl || myopts="${myopts} --disable-perl"
-
-	if [ "` use arts`" ]; then
-	    inherit kde-functions
-	    set-kdedir 3
-	    # $KDEDIR now points to arts location
-	else
-	    myopts="${myopts} --disable-artsc"
-	fi
-
-	use nls  || myopts="${myopts} --disable-nls"
-
-	gnomeopts="${myopts}"
-
-	if [ "`use gtk2`" ];
-	then
-
-		# GTK+ 2 support
-		myopts="${myopts} --enable-gtk2"
-
-	fi
-
-	gnomeopts="${myopts}"
-
-	# Gnome is disabled for GTK+ 2.0 build and first build of GTK 1.4 version
-	myopts="${myopts} --disable-gnome"
-
-	# always build standalone gaim program
-	econf ${myopts} || die
-	emake || die
-
-	# if gnome support is enabled (and gtk2 disabled), then build gaim_applet
-	if [ use gnome -a -z "`use gtk2`" ];
-	then
-		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
-	fi
-}
-
-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
-}
diff --git a/net-im/gaim/gaim-0.59.3.ebuild b/net-im/gaim/gaim-0.59.3.ebuild
index c1f98aefd6ac..d58f60b91e0a 100644
--- a/net-im/gaim/gaim-0.59.3.ebuild
+++ b/net-im/gaim/gaim-0.59.3.ebuild
@@ -1,6 +1,6 @@
 # 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.59.3.ebuild,v 1.1 2002/09/21 05:00:55 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.59.3.ebuild,v 1.2 2002/09/24 15:36:48 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GTK Instant Messenger client"
@@ -37,39 +37,41 @@ src_unpack() {
 
 src_compile() {
 	
-	local myopts gnomeopts
+	local myconf gnomeopts
 
-	use esd  || myopts="--disable-esd"
-	use nas  || myopts="${myopts} --disable-nas"
-	use perl || myopts="${myopts} --disable-perl"
+	use esd  || myconf="--disable-esd"
+	use perl || myconf="${myconf} --disable-perl"
+	use nas \
+		&& myconf="${myconf} --enable-nas" \
+		|| myconf="${myconf} --disable-nas"
 
 	if [ "` use arts`" ]; then
 	    inherit kde-functions
 	    set-kdedir 3
 	    # $KDEDIR now points to arts location
 	else
-	    myopts="${myopts} --disable-artsc"
+	    myconf="${myconf} --disable-artsc"
 	fi
 
-	use nls  || myopts="${myopts} --disable-nls"
+	use nls  || myconf="${myconf} --disable-nls"
 
-	gnomeopts="${myopts}"
+	gnomeopts="${myconf}"
 
 	if [ "`use gtk2`" ];
 	then
 
 		# GTK+ 2 support
-		myopts="${myopts} --enable-gtk2"
+		myconf="${myconf} --enable-gtk2"
 
 	fi
 
-	gnomeopts="${myopts}"
+	gnomeopts="${myconf}"
 
 	# Gnome is disabled for GTK+ 2.0 build and first build of GTK 1.4 version
-	myopts="${myopts} --disable-gnome"
+	myconf="${myconf} --disable-gnome"
 
 	# always build standalone gaim program
-	econf ${myopts} || die
+	econf ${myconf} || die
 	emake || die
 
 	# if gnome support is enabled (and gtk2 disabled), then build gaim_applet