"Resolving bug#155404 and bug#158697

Package-Manager: portage-2.1.2_rc3-r9

3 files changed, 17 insertions, 14 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index e3063e8dc8d5..1cbd46674790 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.423 2006/12/20 05:10:49 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.424 2006/12/21 14:06:56 gothgirl Exp $
+
+  21 Dec 2006; <gothgirl@gentoo.org> gaim-2.0.0_beta5-r1.ebuild:
+  Resolving bug#155404 and bug#158697
 
 *gaim-2.0.0_beta5-r1 (20 Dec 2006)
 
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index fdeb712079ff..41ea45202b81 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -12,18 +12,18 @@ EBUILD gaim-1.5.0.ebuild 3993 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 SH
 MD5 33700f7439472df3bb31923316010694 gaim-1.5.0.ebuild 3993
 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 gaim-1.5.0.ebuild 3993
 SHA256 f644ac37595f2727fa58198a7d16409a4b3102fae684bfc7e8acc91a8ad0db63 gaim-1.5.0.ebuild 3993
-EBUILD gaim-2.0.0_beta5-r1.ebuild 6863 RMD160 5aa29a12356e447049ffe0c77b8c46fa48fe6698 SHA1 fd10c920b2daa438b5a249e321854c8669da5a3e SHA256 0d55c6c4b1cce6a3a5e5568c630abc8df8a63343399b7c0b147ded954715b662
-MD5 1bb3faf6156c3cd87155dbf0aff9a270 gaim-2.0.0_beta5-r1.ebuild 6863
-RMD160 5aa29a12356e447049ffe0c77b8c46fa48fe6698 gaim-2.0.0_beta5-r1.ebuild 6863
-SHA256 0d55c6c4b1cce6a3a5e5568c630abc8df8a63343399b7c0b147ded954715b662 gaim-2.0.0_beta5-r1.ebuild 6863
+EBUILD gaim-2.0.0_beta5-r1.ebuild 6873 RMD160 b02e39e65e2bb22d158373355f28a5ae6696c32e SHA1 5950ad352a92a390634145adfba062b6fc4f68de SHA256 fa4d2a18f8a8c1f8edf2d85b6413e5b097f22ecacbb7cd38fd107d21dbc26563
+MD5 733f66213bce88f60210908b8faaecb2 gaim-2.0.0_beta5-r1.ebuild 6873
+RMD160 b02e39e65e2bb22d158373355f28a5ae6696c32e gaim-2.0.0_beta5-r1.ebuild 6873
+SHA256 fa4d2a18f8a8c1f8edf2d85b6413e5b097f22ecacbb7cd38fd107d21dbc26563 gaim-2.0.0_beta5-r1.ebuild 6873
 EBUILD gaim-2.0.0_beta5.ebuild 6633 RMD160 b4ef1feeb7e758e4da6c7d8db796a0d9d0ae0c92 SHA1 458ecd9a30437695f7456c509cdfde4cf128dbde SHA256 aa934161d3ba10715dba730fb2cde05952bcd9643bd4975c8dcf0534fcebf19c
 MD5 e5879ae6ca7137a352a5d6f5a8376bd9 gaim-2.0.0_beta5.ebuild 6633
 RMD160 b4ef1feeb7e758e4da6c7d8db796a0d9d0ae0c92 gaim-2.0.0_beta5.ebuild 6633
 SHA256 aa934161d3ba10715dba730fb2cde05952bcd9643bd4975c8dcf0534fcebf19c gaim-2.0.0_beta5.ebuild 6633
-MISC ChangeLog 62040 RMD160 f2c420c1ae2f7ecb64ef311d0795c1b2369aa3ee SHA1 8efe4b5dddca58e3aee5c0d1ec1270992229fb4f SHA256 1c72f2ed00bfd9f4ff9589524af99bf38f304675677ee36b40eab7e3eccb34d0
-MD5 33f995081788fb943292462a50135299 ChangeLog 62040
-RMD160 f2c420c1ae2f7ecb64ef311d0795c1b2369aa3ee ChangeLog 62040
-SHA256 1c72f2ed00bfd9f4ff9589524af99bf38f304675677ee36b40eab7e3eccb34d0 ChangeLog 62040
+MISC ChangeLog 62144 RMD160 e658bdad1d29b88765bfbb78edfdf4334e641612 SHA1 ae353a3d490a84021384d6bf6648eac7b1bd5dc7 SHA256 adeffe9cce26499f304bc652c4d04fcebb7555218cef086f2c22d2390a37f374
+MD5 f549e3b4447cdb2d7b75c6728103dce9 ChangeLog 62144
+RMD160 e658bdad1d29b88765bfbb78edfdf4334e641612 ChangeLog 62144
+SHA256 adeffe9cce26499f304bc652c4d04fcebb7555218cef086f2c22d2390a37f374 ChangeLog 62144
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
diff --git a/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild b/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild
index 7d89e5da7b48..ffcf73d9b10a 100644
--- a/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild,v 1.2 2006/12/20 05:17:24 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta5-r1.ebuild,v 1.3 2006/12/21 14:06:56 gothgirl Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app gnome2
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gaim/${MY_PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile mono nls perl silc startup-notification tcl tk xscreensaver custom-flags ssl qq msn gadu"
+IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile mono nls perl silc startup-notification tcl tk xscreensaver custom-cflags spell ssl qq msn gadu"
 IUSE="${IUSE} gtk sasl console"
 
 RDEPEND="
@@ -103,9 +103,9 @@ print_gaim_warning() {
 	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
 	ewarn
 	einfo
-	if  use custom-flags; then
+	if  use custom-cflags; then
 		einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS."
-		einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-flags"
+		einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-cflags"
 		einfo
 	else
 		einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
@@ -155,7 +155,7 @@ src_unpack() {
 
 src_compile() {
 	# Stabilize things, for your own good
-	if ! use custom-flags; then
+	if ! use custom-cflags; then
 		strip-flags
 	fi
 	replace-flags -O? -O2