Fix tests

Package-Manager: portage-2.1.3.19

4 files changed, 45 insertions, 12 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 6fa06b7481c7..96502f775630 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gajim
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.65 2007/12/07 06:41:14 welp Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.66 2008/01/22 17:24:06 welp Exp $
+
+  22 Jan 2008; Peter Weller <welp@gentoo.org>
+  +files/gajim-0.11.4-test_fix.patch, gajim-0.11.4.ebuild:
+  Fix tests
 
 *gajim-0.11.4 (07 Dec 2007)
 
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 70722703d8c3..9f61128dcc0b 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -2,6 +2,10 @@ AUX 0.11.3-misc-fixes.patch 1401 RMD160 7bef42ecd6505b46fa4392fc72565c64ac17c0b1
 MD5 a2fca3fb9d2c4e7d431aba9b03041fa4 files/0.11.3-misc-fixes.patch 1401
 RMD160 7bef42ecd6505b46fa4392fc72565c64ac17c0b1 files/0.11.3-misc-fixes.patch 1401
 SHA256 9fdde00cd7236b2fe1074f8697d122b6783d7a8a27c3d285ee8a3ead518a2c37 files/0.11.3-misc-fixes.patch 1401
+AUX gajim-0.11.4-test_fix.patch 866 RMD160 951dfebf5983949e620479d9453d353ae00cfe6b SHA1 513cbedbac5fae49f2ebce41f6bda3a81b744185 SHA256 d3e4eb0deea89f7b9e6cf47e3ca7c919189879b4d19b518ee60c2c0728489202
+MD5 6c036814f87ca565cc48f804b59e3b33 files/gajim-0.11.4-test_fix.patch 866
+RMD160 951dfebf5983949e620479d9453d353ae00cfe6b files/gajim-0.11.4-test_fix.patch 866
+SHA256 d3e4eb0deea89f7b9e6cf47e3ca7c919189879b4d19b518ee60c2c0728489202 files/gajim-0.11.4-test_fix.patch 866
 DIST gajim-0.11.1.tar.gz 3665819 RMD160 2491d39c1beec479a32b2efbf31b2a6dc1f96b6e SHA1 5a11a26725559e0d60a17bbaaa416ef5670c42b7 SHA256 41fead82d54f5d0d91eef161a6e0fcaa673aec3430c2d3c9f04ea91917d5c8f2
 DIST gajim-0.11.2.tar.gz 3883045 RMD160 2dfd21750ccaf753066e920affa2e07016788ad6 SHA1 2869bff89df38f109a23915a4fb9a88840c59379 SHA256 e3d5ece412742b0b47311523f64f6ad739813f6e6a540c87efe15e2826e20b5a
 DIST gajim-0.11.3.tar.gz 3933538 RMD160 0cfd21e3e74d24a604fac25cffd1ce9954554dbc SHA1 05bb10476dc8d4b00f47c338e9d94097158fc236 SHA256 91e4f2ab0471885c9575163cc47fe664cc55863084e4ce12aef773b3de168dfa
@@ -26,14 +30,14 @@ EBUILD gajim-0.11.3.ebuild 2668 RMD160 5c00ad42e184394a22368a834255fb0458a814e1
 MD5 302a0e48af4791396c334c5eccb8d654 gajim-0.11.3.ebuild 2668
 RMD160 5c00ad42e184394a22368a834255fb0458a814e1 gajim-0.11.3.ebuild 2668
 SHA256 6e81d18a5914e45ce72611ed10bb28fb54b50c9ab540951d3cb992e240f0ef8f gajim-0.11.3.ebuild 2668
-EBUILD gajim-0.11.4.ebuild 2669 RMD160 ffc52424387737185170912229aa4cf8d226a768 SHA1 5d4b1ea7ec6430c52d7464bc5e9ba4cdf2992734 SHA256 b75107d2a94259274816225fdeeda9c5b6d23019535fb5b91a49d22c7a8ab36d
-MD5 04cf54c908169ff847dee0e3fdbccac1 gajim-0.11.4.ebuild 2669
-RMD160 ffc52424387737185170912229aa4cf8d226a768 gajim-0.11.4.ebuild 2669
-SHA256 b75107d2a94259274816225fdeeda9c5b6d23019535fb5b91a49d22c7a8ab36d gajim-0.11.4.ebuild 2669
-MISC ChangeLog 9119 RMD160 2cfdc1c4b926cdc423632ac0326c1ef0829a3ff7 SHA1 0b7d7fda8c70afbe623144f3a64dda4b670a3251 SHA256 f10b1da9e0f61e026f0223942fc795138a3192e7d8490534caf351372e97b9e3
-MD5 7ecde5f045618b47ea1737ee8dd55bc5 ChangeLog 9119
-RMD160 2cfdc1c4b926cdc423632ac0326c1ef0829a3ff7 ChangeLog 9119
-SHA256 f10b1da9e0f61e026f0223942fc795138a3192e7d8490534caf351372e97b9e3 ChangeLog 9119
+EBUILD gajim-0.11.4.ebuild 2755 RMD160 f42e6d0d75fce3d37e3cc5dabb1a58e9717b2cb4 SHA1 68ec418cce2211568f54e7e24ba78aa47a637216 SHA256 e9a0f83b7d25351cddc4447485dc83d9dc3de7d53a07a60861ff75911cff8c12
+MD5 3edeafb77c7c6113bd920fb0447a99af gajim-0.11.4.ebuild 2755
+RMD160 f42e6d0d75fce3d37e3cc5dabb1a58e9717b2cb4 gajim-0.11.4.ebuild 2755
+SHA256 e9a0f83b7d25351cddc4447485dc83d9dc3de7d53a07a60861ff75911cff8c12 gajim-0.11.4.ebuild 2755
+MISC ChangeLog 9237 RMD160 e299eacb519a8d3c42f937f3fb5f0242d1a3ee9d SHA1 42ac5a93f21d49683eae1145110821259d70184c SHA256 65e0311fcaaac3b84d0c3ccd1c9942c3f6c4b5aef8c792da37faafcbdd8f4c31
+MD5 207e691046f9ddb643384a6c0823a28a ChangeLog 9237
+RMD160 e299eacb519a8d3c42f937f3fb5f0242d1a3ee9d ChangeLog 9237
+SHA256 65e0311fcaaac3b84d0c3ccd1c9942c3f6c4b5aef8c792da37faafcbdd8f4c31 ChangeLog 9237
 MISC metadata.xml 369 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 SHA1 873a1e33738638929c94655538bf9d46d0df79f6 SHA256 7b181490899f19191e60d8b702571f6a642fbe355c37c25d8cd710bfe2f2fe0d
 MD5 bd9809fa23d644d4ee6cb9497f22654c metadata.xml 369
 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 metadata.xml 369
diff --git a/net-im/gajim/files/gajim-0.11.4-test_fix.patch b/net-im/gajim/files/gajim-0.11.4-test_fix.patch
new file mode 100644
index 000000000000..26abc0f63b0a
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.11.4-test_fix.patch
@@ -0,0 +1,19 @@
+diff -ur gajim-0.11.4.orig/autogen.sh gajim-0.11.4/autogen.sh
+--- gajim-0.11.4.orig/autogen.sh	2008-01-22 17:14:06.000000000 +0000
++++ gajim-0.11.4/autogen.sh	2008-01-22 17:14:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env bash
+   echo "[encoding: UTF-8]" > po/POTFILES.in \
+   && ls -1 -U data/gajim.desktop.in.in data/glade/*.glade \
+-  src/*py src/common/*py src/common/zeroconf/*.py >> \
++  src/*py src/common/*py src/common/zeroconf/*.py src/osx/*.py >> \
+   po/POTFILES.in || exit 1
+   if test -z `which pkg-config 2>/dev/null`;then
+     echo "***Error: pkg-config not found***"
+diff -ur gajim-0.11.4.orig/po/POTFILES.skip gajim-0.11.4/po/POTFILES.skip
+--- gajim-0.11.4.orig/po/POTFILES.skip	2008-01-22 17:14:06.000000000 +0000
++++ gajim-0.11.4/po/POTFILES.skip	2008-01-22 17:15:27.000000000 +0000
+@@ -1 +1,2 @@
+-
++data/gajim.desktop.in
++src/eggtrayicon.c
diff --git a/net-im/gajim/gajim-0.11.4.ebuild b/net-im/gajim/gajim-0.11.4.ebuild
index 214eaf585bb6..f7b260d1b827 100644
--- a/net-im/gajim/gajim-0.11.4.ebuild
+++ b/net-im/gajim/gajim-0.11.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11.4.ebuild,v 1.1 2007/12/07 06:41:14 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11.4.ebuild,v 1.2 2008/01/22 17:24:06 welp Exp $
 
 inherit multilib python eutils
 
@@ -65,6 +65,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-test_fix.patch"
+}
+
 src_compile() {
 	local myconf