added makefile patch

Package-Manager: portage-2.1.1_pre2-r4

4 files changed, 42 insertions, 22 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 9974da6b9d7a..27bb7f6d6f9d 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.17 2006/07/07 05:46:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.18 2006/07/08 01:00:04 humpback Exp $
+
+  08 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/gajim-10.1-Makefile.patch, gajim-0.10.1.ebuild:
+  Fixed problem with Makefile (thanks to Dimitur Kirov in bug #139446) and
+  removed psyco reference as gajim nolonger makes use of it.
 
   07 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org> gajim-0.10.1.ebuild:
   fix dep typo
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 5b325477a246..bf9045c555df 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,24 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gajim-10.1-Makefile.patch 475 RMD160 7bad6b10f48a3bc8a5bcd53c7e96f444a7f9c941 SHA1 67bb9cbb179bf62f1c4a6d3c6f4a9fee1c3c26c5 SHA256 df756da82d1bfa05f5df0658ff24e6f5401aeb302025b5f98c6f35f4392b4dc1
+MD5 df0bdfb4e54c040e2b5e9e4c8c473517 files/gajim-10.1-Makefile.patch 475
+RMD160 7bad6b10f48a3bc8a5bcd53c7e96f444a7f9c941 files/gajim-10.1-Makefile.patch 475
+SHA256 df756da82d1bfa05f5df0658ff24e6f5401aeb302025b5f98c6f35f4392b4dc1 files/gajim-10.1-Makefile.patch 475
 AUX gajim_0.9_muc_disconnect.patch 829 RMD160 9cdd92b5851b884b201525cae35a92198c34d998 SHA1 2302981bf12a8fa025dd3a6e39f68614aea2ea42 SHA256 c78a602738e0c50e680ee1c5913726116e6c5df18080f28c326fcfab1179d380
 MD5 f42b7288b78fd2243ed72e2b256c0218 files/gajim_0.9_muc_disconnect.patch 829
 RMD160 9cdd92b5851b884b201525cae35a92198c34d998 files/gajim_0.9_muc_disconnect.patch 829
 SHA256 c78a602738e0c50e680ee1c5913726116e6c5df18080f28c326fcfab1179d380 files/gajim_0.9_muc_disconnect.patch 829
 DIST gajim-0.10.1.tar.bz2 2066396 RMD160 405b813db9b7e4aa4c690a77108948886c61fc62 SHA1 909f197594f1d9f0ca678bd6b0b8edbb45d357af SHA256 b167a3405d8a5e9a3913fe711562a9cb8bb8dbfc78240dbb5b3c9c51a1610174
 DIST gajim-0.8.2.tar.bz2 775069 RMD160 d712614d9e9985de0ce0dc624465255376b67ffd SHA1 6ff83ebfcb86095485843e70810f78d3594be4b0 SHA256 069225ebd1aca9799fcfba4243e666105523ce7846c35476bd1e2670fe437653
-EBUILD gajim-0.10.1.ebuild 2098 RMD160 7708dbaccd0bc4f55b8f21b616ed89e1b6e89af0 SHA1 04808a1b6717db5f6eddfe422930d7d49fdf73a3 SHA256 8ad0db918405f7829ede6d3b8d238385cb9c3a73f68dbbd504b8be48f65bead6
-MD5 3608e55420f5b9ee85a9648d2e3778db gajim-0.10.1.ebuild 2098
-RMD160 7708dbaccd0bc4f55b8f21b616ed89e1b6e89af0 gajim-0.10.1.ebuild 2098
-SHA256 8ad0db918405f7829ede6d3b8d238385cb9c3a73f68dbbd504b8be48f65bead6 gajim-0.10.1.ebuild 2098
+EBUILD gajim-0.10.1.ebuild 1987 RMD160 0572aebf83f0232141e5712a8338be9fd7e85d32 SHA1 eed035964673fbe8fe04ee5161bbb6cc8c9da316 SHA256 f893e5726636b35d010c1d25c198a5232a03aae0b834a975c493716bc8295906
+MD5 c9a096ccb1741b2e6d0905cb20d714ae gajim-0.10.1.ebuild 1987
+RMD160 0572aebf83f0232141e5712a8338be9fd7e85d32 gajim-0.10.1.ebuild 1987
+SHA256 f893e5726636b35d010c1d25c198a5232a03aae0b834a975c493716bc8295906 gajim-0.10.1.ebuild 1987
 EBUILD gajim-0.8.2.ebuild 1190 RMD160 81610feba58eaa4127333336cb1a73f6d767f079 SHA1 9221883cd141194faca6ff687ba3d3711b8cd5b2 SHA256 017d9d24ea9443f83da9bcfcd78a28d89a55c4ef8de358fddef50b30b6a62742
 MD5 3550a55fbbb772a7e346e810966eeb14 gajim-0.8.2.ebuild 1190
 RMD160 81610feba58eaa4127333336cb1a73f6d767f079 gajim-0.8.2.ebuild 1190
 SHA256 017d9d24ea9443f83da9bcfcd78a28d89a55c4ef8de358fddef50b30b6a62742 gajim-0.8.2.ebuild 1190
-MISC ChangeLog 2815 RMD160 4a7e0210a014914d78d3d06f8cc000e5cdd5ad44 SHA1 f1e0b37479855c6a9e9179ca6d16e646b10fc896 SHA256 67c722642acdd10b0d23cd224c1395e0ea2065804139e78b5d5515d312a17eda
-MD5 bfe4342cda54c17387b47b0db49163b4 ChangeLog 2815
-RMD160 4a7e0210a014914d78d3d06f8cc000e5cdd5ad44 ChangeLog 2815
-SHA256 67c722642acdd10b0d23cd224c1395e0ea2065804139e78b5d5515d312a17eda ChangeLog 2815
+MISC ChangeLog 3065 RMD160 007ab2c2d8c3e7f0f8fc751505a0cc4d06bdbab2 SHA1 d9086af68fe67ea4d45af8ab17b63bd4f24667a5 SHA256 94a37aab9eb1b86fc91d75ad9b7ff8d1641289300f8df9b837ff66d18160a96d
+MD5 23313364294aef52c9b0423a09b00ae9 ChangeLog 3065
+RMD160 007ab2c2d8c3e7f0f8fc751505a0cc4d06bdbab2 ChangeLog 3065
+SHA256 94a37aab9eb1b86fc91d75ad9b7ff8d1641289300f8df9b837ff66d18160a96d ChangeLog 3065
 MISC metadata.xml 159 RMD160 3e0df024f9705f0cd1798f45cd4b0698e183ee87 SHA1 08e27d5a696205dc5c9992d4f3b647cd609ec139 SHA256 bb3130d2515d5b2e4ff19aff2199bb00ac7c350bf78b34bbec55268bf1013908
 MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
 RMD160 3e0df024f9705f0cd1798f45cd4b0698e183ee87 metadata.xml 159
@@ -30,9 +34,9 @@ MD5 5e6f8fe30acd8c347a23f1608670c913 files/digest-gajim-0.8.2 238
 RMD160 f72be370e668b69b9c511afca9ba7877b5f0dd50 files/digest-gajim-0.8.2 238
 SHA256 d5a0167a843111864ef4a3c51028e77406ce74c396a45fb71012d5f9c7c6e78c files/digest-gajim-0.8.2 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFErfVX9AbAhSK0CiwRAgkrAJ0Y5q4K21IUj1z2kFUTVwpTlrq5bwCeL+UR
-Fj4oxeZG5I1wH2k0ddjJSBk=
-=ql5A
+iD8DBQFErwPO8zY1VwezZiERAj/YAJ90TNG2AtQsnKgjQVqmf2a1QbNo9ACgjtTO
+xAz5K2OYz/vIcFXA6ld9OBk=
+=XkGg
 -----END PGP SIGNATURE-----
diff --git a/net-im/gajim/files/gajim-10.1-Makefile.patch b/net-im/gajim/files/gajim-10.1-Makefile.patch
new file mode 100644
index 000000000000..9fa724efe8b0
--- /dev/null
+++ b/net-im/gajim/files/gajim-10.1-Makefile.patch
@@ -0,0 +1,13 @@
+--- Makefile.orig	2006-07-07 12:35:52.000000000 +0300
++++ Makefile	2006-07-07 13:00:35.000000000 +0300
+@@ -87,7 +87,9 @@
+ 			mkdir -p "$(DESTDIR)$(PREFIX)/share/locale/$$d"; \
+ 		fi; \
+ 	done
+-	${MAKE} -C po install PREFIX=$(PREFIX)
++	if [[  -n $$(find po -name *.mo) ]]; then \
++		${MAKE} -C po install PREFIX=$(PREFIX) ; \
++	fi
+ 	cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/";
+ 	cp THANKS "$(DESTDIR)$(PREFIX)/share/gajim/";
+ 	mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps";
diff --git a/net-im/gajim/gajim-0.10.1.ebuild b/net-im/gajim/gajim-0.10.1.ebuild
index 46fc4f9edf11..83e3a5b31260 100644
--- a/net-im/gajim/gajim-0.10.1.ebuild
+++ b/net-im/gajim/gajim-0.10.1.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/gajim/gajim-0.10.1.ebuild,v 1.4 2006/07/07 05:46:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.10.1.ebuild,v 1.5 2006/07/08 01:00:04 humpback Exp $
 
 inherit virtualx multilib eutils
 
@@ -37,6 +37,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gajim-10.1-Makefile.patch
+}
+
 src_compile() {
 	targets="idle gajim.desktop"
 	! use gnome && targets="${targets} trayicon"
@@ -51,13 +57,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use x86; then
-		einfo "If you want to make Gajim run faster,"
-		einfo "emerge dev-python/psyco, an extension"
-		einfo "module which can speed up the execution"
-		einfo "of Python code."
-	fi
-
 	if use amd64; then
 		ewarn
 		ewarn "Because of an unresolved segmentation fault,"
@@ -70,5 +69,4 @@ pkg_postinst() {
 		ewarn "Please see bug #109298."
 		ewarn
 	fi
-
 }