summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-04-01 02:42:19 +0000
committerTravis Tilley <lv@gentoo.org>2004-04-01 02:42:19 +0000
commit3b9d7f7b6aa54cbcfdc44b3fdd6c2d805de45f3f (patch)
tree356548d368d91f676e32f901ba3ee8d0445348db /net-im
parent[`use`] -> use (diff)
downloadhistorical-3b9d7f7b6aa54cbcfdc44b3fdd6c2d805de45f3f.tar.gz
historical-3b9d7f7b6aa54cbcfdc44b3fdd6c2d805de45f3f.tar.bz2
historical-3b9d7f7b6aa54cbcfdc44b3fdd6c2d805de45f3f.zip
gettext workaround for amd64
Diffstat (limited to 'net-im')
-rw-r--r--net-im/gaim/ChangeLog6
-rw-r--r--net-im/gaim/Manifest22
-rw-r--r--net-im/gaim/gaim-0.75-r11.ebuild15
3 files changed, 29 insertions, 14 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 6a57834db8e4..a7cdedb4cac5 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,10 @@
# 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.150 2004/03/24 22:56:10 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.151 2004/04/01 02:42:19 lv Exp $
+
+ 31 Mar 2004; Travis Tilley <lv@gentoo.org> gaim-0.75-r11.ebuild:
+ nls disabled on amd64 since the version of gettext that works is masked -amd64
+ - see bug #46253 for more information
*gaim-0.75-r11 (24 Mar 2004)
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 9d5a3fba81ef..71e37d1b5ffa 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,16 +1,16 @@
-MD5 ee0b180e93b566627f974caa3f218b17 gaim-0.75-r11.ebuild 4435
+MD5 ee2fad831455ce24444391cc8362a8f4 ChangeLog 25296
MD5 4142d141ee10c2855798920736b8decb gaim-0.75-r10.ebuild 3672
-MD5 82f30e5288aa059be77d6ec84e85904b ChangeLog 25110
-MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
+MD5 79031f549dec17c9d4b103410bfbfbbd gaim-0.75-r11.ebuild 4705
MD5 ff7da91fdc2d63cb9ade430cbedeac98 gaim-0.75-r8.ebuild 3498
-MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710
-MD5 a714a5babbb4387f5a5516f75548528a files/gaim-0.76cvs-yahoo-misc-fixes-1.diff 3105
-MD5 68525b8389e356a5d05d531b84fb1ada files/gaim-0.74-gnome-url-handler.patch 1854
+MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
+MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r10 63
+MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r11 63
MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r8 63
-MD5 a4f3b00a7aa80e7fbc1e315b8c9306c8 files/gaim-0.76cvs-signals-varargs.diff 1753
-MD5 93491cd4f8542689ab3d699e74279ad6 files/gaim-gentoo-branding.patch 1944
+MD5 68525b8389e356a5d05d531b84fb1ada files/gaim-0.74-gnome-url-handler.patch 1854
MD5 53302cc68bb7bef9803723e977010339 files/gaim-0.74_cjk_gtkconv.patch 1128
-MD5 e58ee6f06747da85a60cb9c13b91f805 files/gaim-0.76cvs-yahoo-login-fix.diff 4618
+MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710
MD5 e16439188287325963107a14ccddf668 files/gaim-0.75-yahoo-security.diff 3863
-MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r10 63
-MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r11 63
+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 93491cd4f8542689ab3d699e74279ad6 files/gaim-gentoo-branding.patch 1944
diff --git a/net-im/gaim/gaim-0.75-r11.ebuild b/net-im/gaim/gaim-0.75-r11.ebuild
index 14c908407fea..d7fb1b0957b9 100644
--- a/net-im/gaim/gaim-0.75-r11.ebuild
+++ b/net-im/gaim/gaim-0.75-r11.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.75-r11.ebuild,v 1.2 2004/03/26 14:33:36 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r11.ebuild,v 1.3 2004/04/01 02:42:19 lv Exp $
inherit flag-o-matic eutils gcc
use debug && inherit debug
@@ -75,7 +75,18 @@ src_compile() {
local myconf
use perl || myconf="${myconf} --disable-perl"
use spell || myconf="${myconf} --disable-gtkspell"
- use nls || myconf="${myconf} --disable-nls"
+
+ # starting with gaim 0.75-r11, nls support depends on a version of
+ # gettext that isn't amd64-friendly
+ if [ `use amd64` ]
+ then
+ einfo "WARNING - nls support in gaim is disabled on amd64, see bug #46253"
+ myconf="${myconf} --disable-nls"
+ else
+ use_enable nls
+ fi
+ #use nls || myconf="${myconf} --disable-nls"
+
use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
NSS_LIB=/usr/lib