Version bump and bug fix for evolution-data-server support. gaim-1.0.2 and gaim-encryption-2.32 should be stabilized on all arches ASAP.

5 files changed, 123 insertions, 8 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 3e1edba9c6cb..bfe09d6c44ac 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.254 2004/10/08 03:55:53 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.255 2004/10/20 05:34:54 rizzo Exp $
+
+*gaim-1.0.2 (19 Oct 2004)
+
+  19 Oct 2004; Don Seiler <rizzo@gentoo.org> +gaim-1.0.2.ebuild:
+  Version bump, security fixes.  Also switched from USE evo to eds, fixes
+  bug #67418.
 
 *gaim-1.0.1 (07 Oct 2004)
 
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index abc17bc88016..4c2b5a4724a2 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,9 +1,10 @@
-MD5 cc14584d97ec4018be6f46ccc56d4d0c ChangeLog 39736
+MD5 8b388d5dc3af06a5b86143a0ec2a1be4 ChangeLog 39917
 MD5 0314903fdd2fb1069541e87a3a3fc0e6 gaim-0.81-r5.ebuild 3356
 MD5 fac2f3cdad87d2ec1d4c1f47163bae44 gaim-0.82.1.ebuild 3360
 MD5 b55bbf65c7aef20177612b709854b478 gaim-1.0.0.ebuild 3238
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
-MD5 624f4a99f65ed6c770cbe69e3fc312bf gaim-1.0.1.ebuild 3148
+MD5 da1a2f6dc17af65a8bff6bd050c84a7b gaim-1.0.1.ebuild 3152
+MD5 2fb6ceae616ba859f200b3a5a1630dfa gaim-1.0.2.ebuild 3164
 MD5 ed679fa262748c5626af4d9dcfd4b278 files/digest-gaim-0.81-r5 63
 MD5 c8c73743c47ef3956b6b499fa0d91347 files/digest-gaim-0.82.1 65
 MD5 46cd327a59460bd2d31ccd06cd712700 files/digest-gaim-1.0.0 64
@@ -13,3 +14,4 @@ MD5 8126122fdccc9c046ba5c5a8e151980b files/gaim-0.83cvs-gtkcellrendererprogress.
 MD5 ee4d6e1ffb8d36e2296864a1e420dfb1 files/gaim-1.0.1cvs-jabber-roomlist.diff 2304
 MD5 22aae7173f7cbf5d93d1db9907740064 files/syslog_fd_leak.diff 8423
 MD5 e7b2997aece3c4ab4421c863e8625a7b files/digest-gaim-1.0.1 64
+MD5 f9039f6cb5717109cf48a9f7e5d51a32 files/digest-gaim-1.0.2 64
diff --git a/net-im/gaim/files/digest-gaim-1.0.2 b/net-im/gaim/files/digest-gaim-1.0.2
new file mode 100644
index 000000000000..3245e384dee3
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-1.0.2
@@ -0,0 +1 @@
+MD5 80fbe23c6206ca6c0c62c30d5091d7e4 gaim-1.0.2.tar.bz2 4809084
diff --git a/net-im/gaim/gaim-1.0.1.ebuild b/net-im/gaim/gaim-1.0.1.ebuild
index f43c898c8b94..7a896129ca53 100644
--- a/net-im/gaim/gaim-1.0.1.ebuild
+++ b/net-im/gaim/gaim-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.0.1.ebuild,v 1.1 2004/10/08 03:55:53 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.0.1.ebuild,v 1.2 2004/10/20 05:34:54 rizzo Exp $
 
 inherit flag-o-matic eutils gcc debug
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
-IUSE="nls perl spell nas crypt cjk gnutls silc evo debug"
+IUSE="nls perl spell nas crypt cjk gnutls silc eds debug"
 
 DEPEND=">=x11-libs/gtk+-2.0
 	>=dev-libs/glib-2.0
@@ -26,7 +26,7 @@ DEPEND=">=x11-libs/gtk+-2.0
 	dev-libs/nss
 	gnutls? ( net-libs/gnutls )
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	evo? ( mail-client/evolution )"
+	eds? ( gnome-extra/evolution-data-server )"
 
 PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-2.31 )"
 
@@ -77,7 +77,7 @@ src_compile() {
 	use spell || myconf="${myconf} --disable-gtkspell"
 	use nls  || myconf="${myconf} --disable-nls"
 	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
-	use evo || myconf="${myconf} --disable-gevolution"
+	use eds || myconf="${myconf} --disable-gevolution"
 
 	if use gnutls ; then
 		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
@@ -89,7 +89,7 @@ src_compile() {
 	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
 	myconf="${myconf} --with-nss-includes=/usr/include/nss"
 	myconf="${myconf} --with-nspr-libs=/usr/lib"
-	myconf="${myconf} --with-nss-libs=/usr/lib"
+	myconf="${myconf} --with-nss-libs=/usr/lib/nss"
 
 	econf ${myconf} || die "Configuration failed"
 
diff --git a/net-im/gaim/gaim-1.0.2.ebuild b/net-im/gaim/gaim-1.0.2.ebuild
new file mode 100644
index 000000000000..703e75e7fb47
--- /dev/null
+++ b/net-im/gaim/gaim-1.0.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.0.2.ebuild,v 1.1 2004/10/20 05:34:54 rizzo Exp $
+
+inherit flag-o-matic eutils gcc debug
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
+IUSE="nls perl spell nas crypt cjk gnutls silc eds debug"
+
+DEPEND=">=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2.0
+	nas? ( >=media-libs/nas-1.4.1-r1 )
+	dev-util/pkgconfig
+	sys-devel/gettext
+	media-libs/libao
+	>=media-libs/audiofile-0.2.0
+	perl? ( >=dev-lang/perl-5.8.2-r1
+			!<dev-perl/ExtUtils-MakeMaker-6.17 )
+	spell? ( >=app-text/gtkspell-2.0.2 )
+	dev-libs/nss
+	gnutls? ( net-libs/gnutls )
+	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
+	eds? ( gnome-extra/evolution-data-server )"
+
+PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-2.32 )"
+
+print_gaim_warning() {
+	ewarn
+	ewarn "If you are merging ${P} from an earlier version, you will need"
+	ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
+	ewarn
+	ewarn "If you experience problems with gaim, file them as bugs with"
+	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
+	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
+	ewarn "seek help in #gaim."
+	ewarn
+	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
+	ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
+	ewarn "backtraces."
+	ewarn
+	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
+	ewarn
+	einfo
+	einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
+	einfo
+	ebeep 5
+	epause 3
+}
+
+pkg_setup() {
+	print_gaim_warning
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
+}
+
+src_compile() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+
+	# -msse2 doesn't play nice on gcc 3.2
+	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
+
+	local myconf
+	use debug && myconf="${myconf} --enable-debug"
+	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"
+	use eds || myconf="${myconf} --disable-gevolution"
+
+	if use gnutls ; then
+		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
+		myconf="${myconf} --with-gnutls-libs=/usr/lib"
+	else
+		myconf="${myconf} --enable-gnutls=no"
+	fi
+
+	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
+	myconf="${myconf} --with-nss-includes=/usr/include/nss"
+	myconf="${myconf} --with-nspr-libs=/usr/lib"
+	myconf="${myconf} --with-nss-libs=/usr/lib/nss"
+
+	econf ${myconf} || die "Configuration failed"
+
+	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "Install failed"
+	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
+}
+
+pkg_postinst() {
+	print_gaim_warning
+}