Found a work-around, besides only mips needs excluding now.

3 files changed, 36 insertions, 29 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index d5599d4117bc..338bccbcb75a 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.184 2004/06/03 23:47:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.185 2004/06/09 14:09:34 rizzo Exp $
+
+  09 Jun 2004; <dseiler@gentoo.org> gaim-0.78-r1.ebuild:
+  Found a work-around, besides only mips needs excluding now.
 
   03 Jun 2004; Aron Griffis <agriffis@gentoo.org> gaim-0.77.ebuild:
   stable on ia64
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 9371242f7ede..68eeaf50d044 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,28 +1,28 @@
-MD5 ab6945712695861755b82b5f2d8f2e73 ChangeLog 29832
-MD5 7714781d616cb8875df7278910898f6a gaim-0.77.ebuild 4041
-MD5 e25d1566554b7b5886dd36409d7d6e20 gaim-0.78.ebuild 3979
-MD5 c8052a3d70c72181e38106123d82e99f gaim-0.77-r2.ebuild 4495
-MD5 d4740a91d8112a70ba7b1e36d528d47e gaim-0.78-r1.ebuild 4161
+MD5 3dc3d48a5de5e94f1035360050840544 ChangeLog 29948
+MD5 bce07b7547c62d6265e31c5ab2deffa2 gaim-0.75-r10.ebuild 3677
+MD5 aaf702eeecde61ded02fc0cc492365f9 gaim-0.77-r2.ebuild 4494
+MD5 965d2993a30aeb3ce3e38c843658f3d3 gaim-0.77.ebuild 4040
+MD5 70296094d5e7719da4ae76b25e0483bb gaim-0.78-r1.ebuild 4218
+MD5 8d0a26def7ddc78794155683a897931b gaim-0.78.ebuild 3978
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
-MD5 1b332d24ed4e517a3b587f840c551acc gaim-0.75-r10.ebuild 3678
+MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r10 63
 MD5 4bc83ad48d260db208fcae372c2bb291 files/digest-gaim-0.77 63
-MD5 3a5e6167d13c4a44a8618c12629d777e files/gaim-0.77-c99.patch 4790
-MD5 a8234ce30b90015d2798a6f576982857 files/gaim-0.78cvs-novelltweaks5.patch 715
-MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
-MD5 f07855631a1ef3f986568b772f335865 files/digest-gaim-0.78 63
 MD5 4bc83ad48d260db208fcae372c2bb291 files/digest-gaim-0.77-r2 63
+MD5 f07855631a1ef3f986568b772f335865 files/digest-gaim-0.78 63
+MD5 f07855631a1ef3f986568b772f335865 files/digest-gaim-0.78-r1 63
+MD5 68525b8389e356a5d05d531b84fb1ada files/gaim-0.74-gnome-url-handler.patch 1854
+MD5 53302cc68bb7bef9803723e977010339 files/gaim-0.74_cjk_gtkconv.patch 1128
+MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710
+MD5 e16439188287325963107a14ccddf668 files/gaim-0.75-yahoo-security.diff 3863
+MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
+MD5 a4f3b00a7aa80e7fbc1e315b8c9306c8 files/gaim-0.76cvs-signals-varargs.diff 1753
+MD5 e58ee6f06747da85a60cb9c13b91f805 files/gaim-0.76cvs-yahoo-login-fix.diff 4618
+MD5 a714a5babbb4387f5a5516f75548528a files/gaim-0.76cvs-yahoo-misc-fixes-1.diff 3105
 MD5 6590ac50c358f619973c6226219a5422 files/gaim-0.77-64bit_goodness.patch 4544
+MD5 3a5e6167d13c4a44a8618c12629d777e files/gaim-0.77-c99.patch 4790
 MD5 2658aec832adc8a4050b12ed17f5136f files/gaim-0.77-irc-reconnect.patch 718
 MD5 d2266e07284f788c6a45da386e2a5c8f files/gaim-0.77-msn_chat_leave.patch 421
 MD5 76d3a02120c18747eb5c3335dc17b16d files/gaim-0.77-plugin-prefs.patch 3926
 MD5 9e9a4483300e2e60e50e9f74655a5335 files/gaim-0.77-smileys_dialogs.patch 804
-MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710
-MD5 e16439188287325963107a14ccddf668 files/gaim-0.75-yahoo-security.diff 3863
-MD5 a4f3b00a7aa80e7fbc1e315b8c9306c8 files/gaim-0.76cvs-signals-varargs.diff 1753
-MD5 e58ee6f06747da85a60cb9c13b91f805 files/gaim-0.76cvs-yahoo-login-fix.diff 4618
-MD5 53302cc68bb7bef9803723e977010339 files/gaim-0.74_cjk_gtkconv.patch 1128
 MD5 80bc3fac4370b3cddf46ab8002541481 files/gaim-0.77-ucs2-copypaste.patch 1501
-MD5 a714a5babbb4387f5a5516f75548528a files/gaim-0.76cvs-yahoo-misc-fixes-1.diff 3105
-MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r10 63
-MD5 68525b8389e356a5d05d531b84fb1ada files/gaim-0.74-gnome-url-handler.patch 1854
-MD5 f07855631a1ef3f986568b772f335865 files/digest-gaim-0.78-r1 63
+MD5 a8234ce30b90015d2798a6f576982857 files/gaim-0.78cvs-novelltweaks5.patch 715
diff --git a/net-im/gaim/gaim-0.78-r1.ebuild b/net-im/gaim/gaim-0.78-r1.ebuild
index 6ed630334499..5001a988d524 100644
--- a/net-im/gaim/gaim-0.78-r1.ebuild
+++ b/net-im/gaim/gaim-0.78-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.78-r1.ebuild,v 1.1 2004/06/02 20:29:21 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.78-r1.ebuild,v 1.2 2004/06/09 14:09:34 rizzo Exp $
 
 inherit flag-o-matic eutils gcc
 use debug && inherit debug
@@ -26,7 +26,7 @@ DEPEND=">=x11-libs/gtk+-2.0
 	spell? ( >=app-text/gtkspell-2.0.2 )
 	dev-libs/nss
 	gnutls? ( net-libs/gnutls )
-	silc? ( >=net-im/silc-toolkit-0.9.12 )"
+	!mips? ( silc? ( >=net-im/silc-toolkit-0.9.12 ) )"
 PDEPEND="crypt? ( >=net-im/gaim-encryption-2.26 )"
 
 pkg_setup() {
@@ -72,15 +72,19 @@ src_compile() {
 	use nls  || myconf="${myconf} --disable-nls"
 	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
 
-	use gnutls && {
+	if use gnutls ; then
 		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
 		myconf="${myconf} --with-gnutls-libs=/usr/lib"
-	} || myconf="${myconf} --enable-gnutls=no"
-
-	use silc && {
-		myconf="${myconf} --with-silc-includes=/usr/include/silc-toolkit"
-		myconf="${myconf} --with-silc-libs=/usr/lib"
-	}
+	else
+		myconf="${myconf} --enable-gnutls=no"
+	fi
+
+	if ! use mips ; then
+		if use silc ; then
+			myconf="${myconf} --with-silc-includes=/usr/include/silc-toolkit"
+			myconf="${myconf} --with-silc-libs=/usr/lib"
+		fi
+	fi
 
 	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
 	myconf="${myconf} --with-nss-includes=/usr/include/nss"