Bump, remove unneeded ebuilds

8 files changed, 28 insertions, 98 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index b06725357d15..e41aa8348f61 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.85 2003/10/28 13:19:21 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.86 2003/11/01 08:08:08 lostlogic Exp $
+
+*gaim-0.72 (01 Nov 2003)
+
+  01 Nov 2003; Brandon Low <lostlogic@gentoo.org> gaim-0.72.ebuild:
+  Bump
 
   28 Oct 2003; Martin Holzer <mholzer@gentoo.org> gaim-0.66-r3.ebuild,
   gaim-0.66-r4.ebuild, gaim-0.67-r1.ebuild, gaim-0.67.ebuild,
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index c0222a677cfe..109c21383b64 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,18 +1,14 @@
 MD5 bed467c3e7077888cf4fd615c5f47678 gaim-0.67.ebuild 2185
-MD5 fd1f0e8151af4562cb83679f8bdb1202 gaim-0.67-r1.ebuild 2182
-MD5 aff498139198caa84579227ea6d81f6d gaim-0.66-r4.ebuild 1990
-MD5 f826c765f8dfe28bba26ee96d7cb33a7 gaim-0.71-r2.ebuild 2657
+MD5 7f89f602fb6fe4954a39c6909cbf3333 gaim-0.71-r2.ebuild 2658
 MD5 01f40714eb213a4d4f1911cd3863b9da gaim-0.66-r3.ebuild 1987
-MD5 56dc3b37f6310a5edef3efc6f8245d38 gaim-0.72.ebuild 2507
+MD5 59fe169133f9292aebafb199cb149a58 gaim-0.72.ebuild 2506
 MD5 1a9b1940485519f26cffa675c833ca7d gaim-0.70-r2.ebuild 2506
-MD5 36985e0585d789ae7b4b2587f5512db9 ChangeLog 14654
+MD5 88b24d020241b5d2747682aa3d24098b ChangeLog 14758
 MD5 dc9ef26d3efea7cbe38cbe534cdeaa53 metadata.xml 510
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
 MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
 MD5 eaec78ac2e19b5e10a20a2c86bf65a34 files/gaim-0.66-prefs.c.diff 598
 MD5 ac8c28584ee56def0cea65e38e235f0b files/digest-gaim-0.66-r3 126
-MD5 33402ae3eb7e61ffae5ab976f90121b2 files/digest-gaim-0.66-r4 126
-MD5 6850f68d67c0633c22c07fb1ecf8ed07 files/digest-gaim-0.67-r1 135
 MD5 964ed187fa4d6e26816bf39aeb5cd8f1 files/digest-gaim-0.70-r2 135
 MD5 7b98aff453d6189397e4a822c69389f0 files/digest-gaim-0.71-r2 135
 MD5 0b625a0ccaa6c9ec3b7cde1b806fa87d files/gaim-0.71-icq-crash-hack.patch 1584
diff --git a/net-im/gaim/files/digest-gaim-0.66-r4 b/net-im/gaim/files/digest-gaim-0.66-r4
deleted file mode 100644
index aab01a1cb78f..000000000000
--- a/net-im/gaim/files/digest-gaim-0.66-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 80c52fc8c969a65ea7bbd6444142fe5f gaim-0.66.tar.bz2 2744562
-MD5 339990dc321210196be978eb375184c5 encrypt-2.04.tar.gz 58904
diff --git a/net-im/gaim/files/digest-gaim-0.67-r1 b/net-im/gaim/files/digest-gaim-0.67-r1
deleted file mode 100644
index 417fe6d5e9cc..000000000000
--- a/net-im/gaim/files/digest-gaim-0.67-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1b28da4a480e2217f0b653bb95a5e4c5 gaim-0.67.tar.bz2 2934003
-MD5 358847f0fc516842f8a913f8c6b38d52 gaim-encryption-2.08.tar.gz 222617
diff --git a/net-im/gaim/files/digest-gaim-0.72 b/net-im/gaim/files/digest-gaim-0.72
new file mode 100644
index 000000000000..4f8a236d8d61
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.72
@@ -0,0 +1,2 @@
+MD5 2eb9478126ffc76b9a5f3cbf7cd82062 gaim-0.72.tar.bz2 3165345
+MD5 c82fe0e745259ba479975f820610a3a9 gaim-encryption-2.16.tar.gz 316688
diff --git a/net-im/gaim/gaim-0.66-r4.ebuild b/net-im/gaim/gaim-0.66-r4.ebuild
deleted file mode 100644
index 96bf16bfbb57..000000000000
--- a/net-im/gaim/gaim-0.66-r4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.66-r4.ebuild,v 1.3 2003/10/28 13:19:21 mholzer Exp $
-
-IUSE="nls perl spell nas ssl cjk"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-EV=2.04
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-	ssl? ( mirror://sourceforge/gaim-encryption/encrypt-${EV}.tar.gz )"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
-
-DEPEND="=sys-libs/db-1*
-	>=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	sys-devel/gettext
-	media-libs/libao
-	>=media-libs/audiofile-0.2.0
-	perl? ( >=dev-lang/perl-5.6.1 )
-	ssl? ( dev-libs/nss )
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${P}
-	epatch ${FILESDIR}/gaim-0.66-prefs.c.diff
-	use ssl && {
-		cd ${S}/plugins
-		unpack encrypt-${EV}.tar.gz
-		cd encrypt
-		epatch patchfile.0.66
-	}
-	use cjk && {
-		cd ${S}/src
-		epatch ${FILESDIR}/gaim_gtkimcontext_patch.diff
-	}
-}
-
-src_compile() {
-
-	local myconf
-	use perl || myconf="${myconf} --disable-perl"
-	use spell || myconf="${myconf} --disable-gtkspell"
-	use nls  || myconf="${myconf} --disable-nls"
-	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
-
-	econf ${myconf} || die "Configuration failed"
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
-}
-
-src_install() {
-	einstall || die "Install failed"
-	dodoc ABOUT-NLS AUTHORS HACKING INSTALL NEWS README TODO ChangeLog
-}
-
-pkg_postinst() {
-	if [ `use ssl` ]; then
-		ewarn
-		ewarn "You have chosen (by selecting 'USE=ssl') to install"
-		ewarn "the gaim-encryption plugin ( http://gaim-encryption.sf.net/ )"
-		ewarn "this plugin is NOT supported by the Gaim project, and if you"
-		ewarn "expierence problems related to it, contact the Gentoo project"
-		ewarn "via http://bugs.gentoo.org/ or the gaim-encryption project."
-		ewarn
-	fi
-}
diff --git a/net-im/gaim/gaim-0.71-r2.ebuild b/net-im/gaim/gaim-0.71-r2.ebuild
index 56b5007583ff..462236d02647 100644
--- a/net-im/gaim/gaim-0.71-r2.ebuild
+++ b/net-im/gaim/gaim-0.71-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.71-r2.ebuild,v 1.2 2003/10/28 13:19:21 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.71-r2.ebuild,v 1.3 2003/11/01 08:08:08 lostlogic Exp $
 
 IUSE="nls perl spell nas ssl"
 
@@ -13,7 +13,7 @@ RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 
 DEPEND="=sys-libs/db-1*
 	>=x11-libs/gtk+-2.0
diff --git a/net-im/gaim/gaim-0.67-r1.ebuild b/net-im/gaim/gaim-0.72.ebuild
index 0053bd5ebc16..dbba533d79b7 100644
--- a/net-im/gaim/gaim-0.67-r1.ebuild
+++ b/net-im/gaim/gaim-0.72.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.67-r1.ebuild,v 1.4 2003/10/28 13:19:21 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.72.ebuild,v 1.1 2003/11/01 08:08:08 lostlogic Exp $
 
 IUSE="nls perl spell nas ssl"
 
 DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://gaim.sourceforge.net/"
-EV=2.08
+EV=2.16
 SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
 	ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
 RESTRICT="nomirror"
@@ -22,20 +22,17 @@ DEPEND="=sys-libs/db-1*
 	sys-devel/gettext
 	media-libs/libao
 	>=media-libs/audiofile-0.2.0
-	perl? ( >=dev-lang/perl-5.6.1 )
-	ssl? ( dev-libs/nss )
+	perl? ( >=dev-lang/perl-5.6.1
+		>=sys-apps/sed-4.0.0 )
+	dev-libs/nss
 	spell? ( >=app-text/gtkspell-2.0.2 )"
 
 src_unpack() {
-	unpack ${P}.tar.bz2
+	unpack ${A} || die
 	use ssl && {
 		cd ${S}/plugins
 		unpack gaim-encryption-${EV}.tar.gz
 	}
-	#use cjk && {
-		#cd ${S}/src
-		#epatch ${FILESDIR}/gaim_gtkimcontext_patch.diff
-	#}
 }
 
 src_compile() {
@@ -45,13 +42,20 @@ src_compile() {
 	use spell || myconf="${myconf} --disable-gtkspell"
 	use nls  || myconf="${myconf} --disable-nls"
 	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
+	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
+	myconf="${myconf} --with-nss-includes=/usr/include/nss"
 
 	econf ${myconf} || die "Configuration failed"
+	use perl && sed -i -e 's:^\(PERL_MM_PARAMS =.*PREFIX=\)\(.*\):\1'${D}'\2:' plugins/perl/Makefile
 	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
 
 	use ssl && {
+		local myencconf
 		cd ${S}/plugins/gaim-encryption-${EV}
-		econf || die "Configuration failed for encryption"
+
+		myencconf="${myencconf} --with-nspr-includes=/usr/include/nspr"
+		myencconf="${myencconf} --with-nss-includes=/usr/include/nss"
+		econf ${myencconf} || die "Configuration failed for encryption"
 		emake || die "Make failed for encryption"
 	}
 }
@@ -63,7 +67,7 @@ src_install() {
 		einstall || die "Install failed for encryption"
 		cd ${S}
 	}
-	dodoc ABOUT-NLS AUTHORS HACKING INSTALL NEWS README TODO ChangeLog
+	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
 }
 
 pkg_postinst() {
@@ -74,6 +78,5 @@ pkg_postinst() {
 		ewarn "this plugin is NOT supported by the Gaim project, and if you"
 		ewarn "expierence problems related to it, contact the Gentoo project"
 		ewarn "via http://bugs.gentoo.org/ or the gaim-encryption project."
-		ewarn
 	fi
 }