Version bump and straight to stable on x86 and amd64 (security bug #102000)

(Portage version: 2.0.51.22-r2)

4 files changed, 153 insertions, 15 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 71bd41fdf647..b5aa8b527966 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.361 2005/08/04 21:25:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.362 2005/08/12 04:43:01 tester Exp $
+
+*gaim-1.5.0 (12 Aug 2005)
+
+  12 Aug 2005; Olivier Crête <tester@gentoo.org> +gaim-1.5.0.ebuild:
+  Version bump and straight to stable on x86 and amd64 (security bug #102000)
 
   04 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> gaim-1.4.0-r2.ebuild:
   Stable on ia64, bug 99881.
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index db96c47f7b44..2c9050f0cf98 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fa8181abfe4696b781a2762cf070212e ChangeLog 52663
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
+MD5 fa8181abfe4696b781a2762cf070212e ChangeLog 52663
 MD5 f0320b012e455c11a4ff683409df1309 gaim-1.3.1.ebuild 4275
+MD5 d149afe9d89bbef2f0afd4dfcb24bf9d gaim-1.5.0.ebuild 4193
 MD5 9df76a32e4fd5088a67b49fb3a41d7c4 gaim-1.4.0-r2.ebuild 4354
-MD5 1a1937855d7436ad73db7062927a2be2 files/gaim-1.4.0-msn-userlist.diff 729
-MD5 d28b7cad9b42f5e1ecd276003220a0f8 files/gaim-1.4.0-oscar-ssi.diff 1200
+MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
 MD5 20166c600c6de257f42af05bea6efd22 files/digest-gaim-1.4.0-r2 64
+MD5 55807d838af0375bc41eabe3534fdda8 files/digest-gaim-1.5.0 64
 MD5 7eeaeb97528ef69941cf3fa3d04dea3e files/gaim-1.3.0-silc-ft.patch 567
 MD5 34466df05198ffffaa36d5469babd2aa files/digest-gaim-1.3.1 64
-MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
+MD5 1a1937855d7436ad73db7062927a2be2 files/gaim-1.4.0-msn-userlist.diff 729
+MD5 d28b7cad9b42f5e1ecd276003220a0f8 files/gaim-1.4.0-oscar-ssi.diff 1200
 MD5 11f026799a722bb53a2f4cdac2dad2d7 files/gaim-1.4.0-libgg-mem.patch 477
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC8of0Kf2g/qXtneoRAjWOAKC3V6V4ZNpblOwiKogFhC9oyIvaIwCguKh1
-c/yGfbj2pvQiXZ77EWHfShg=
-=ov35
------END PGP SIGNATURE-----
diff --git a/net-im/gaim/files/digest-gaim-1.5.0 b/net-im/gaim/files/digest-gaim-1.5.0
new file mode 100644
index 000000000000..2fb8a57e9dea
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-1.5.0
@@ -0,0 +1 @@
+MD5 9205321ac11fad271c90f2f0d7c5e7ce gaim-1.5.0.tar.bz2 6123237
diff --git a/net-im/gaim/gaim-1.5.0.ebuild b/net-im/gaim/gaim-1.5.0.ebuild
new file mode 100644
index 000000000000..ae89c114c049
--- /dev/null
+++ b/net-im/gaim/gaim-1.5.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.5.0.ebuild,v 1.1 2005/08/12 04:43:01 tester Exp $
+
+inherit flag-o-matic eutils toolchain-funcs debug multilib
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls perl spell nas cjk gnutls silc eds krb4 tcltk debug"
+
+RDEPEND=">=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2.0
+	nas? ( >=media-libs/nas-1.4.1-r1 )
+	media-libs/libao
+	>=media-libs/audiofile-0.2.0
+	perl? ( >=dev-lang/perl-5.8.2-r1
+			!<perl-core/ExtUtils-MakeMaker-6.17 )
+	spell? ( >=app-text/gtkspell-2.0.2 )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( >=dev-libs/nss-3.9.2-r2 )
+	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
+	eds? ( gnome-extra/evolution-data-server )
+	krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 )
+	tcltk? ( dev-lang/tcl
+			dev-lang/tk )
+	x11-libs/startup-notification"
+
+DEPEND="$RDEPEND
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+# List of plugins
+#	app-accessibility/festival-gaim
+#	net-im/gaim-blogger
+#	net-im/gaim-bnet
+#	net-im/gaim-meanwhile
+#	net-im/gaim-snpp
+#	x11-plugins/autoprofile
+#	x11-plugins/gaim-assistant
+#	x11-plugins/gaim-encryption
+#	x11-plugins/gaim-extprefs
+#	x11-plugins/gaim-latex
+#	x11-plugins/gaim-otr
+#	x11-plugins/gaim-rhythmbox
+#	x11-plugins/gaim-xmms-remote
+#	x11-plugins/gaimosd
+#	x11-plugins/guifications
+
+
+print_gaim_warning() {
+	ewarn
+	ewarn "If you are merging ${P} from an earlier version, you may 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
+	if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4 ; then
+		eerror
+		eerror You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to
+		eerror enable krb4 support for the zephyr protocol in gaim.
+		eerror
+		die "Configure failed"
+	fi
+}
+
+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"
+	use krb4 && myconf="${myconf} --with-krb4"
+	use tcltk || myconf="${myconf} --disable-tcl --disable-tk"
+
+	if use gnutls ; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf="${myconf} --enable-nss=no"
+		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
+		myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
+	else
+		einfo "Disabling GnuTLS, using NSS"
+		myconf="${myconf} --enable-gnutls=no"
+		myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
+		myconf="${myconf} --with-nss-includes=/usr/include/nss"
+		myconf="${myconf} --with-nspr-libs=/usr/$(get_libdir)/nspr"
+		myconf="${myconf} --with-nss-libs=/usr/$(get_libdir)/nss"
+	fi
+
+
+	econf ${myconf} || die "Configuration failed"
+
+	emake -j1 || 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
+}