make gajim multilib-capable

Package-Manager: portage-2.0.51.19

4 files changed, 41 insertions, 17 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index c081a27c2079..ee11e916df1f 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.2 2005/06/06 14:29:56 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.3 2005/06/25 11:41:38 blubb Exp $
+
+  25 Jun 2005; Simon Stelling <blubb@gentoo.org>
+  +files/gajim-0.7.1-multilib.patch, gajim-0.7.1.ebuild:
+  make gajim multilib-capable
 
   06 Jun 2005; Sergey Kuleshov <svyatogor@gentoo.org> gajim-0.7.1.ebuild:
   Added nls and spell USE flags.
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 78e96fa99210..ea8dc6cf6acd 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1886c8f93b967ebc061ac254dd9b9d99 gajim-0.7.1.ebuild 822
-MD5 3f4e830986815582b1a669dcefb99e21 ChangeLog 470
+MD5 cf68911bcbbfd928bf63ef38e2bebaf3 ChangeLog 606
+MD5 ff1a00b007397ff26f7ebd4d0f532236 gajim-0.7.1.ebuild 938
 MD5 aeded6d40742a2f4f21777446c628a75 metadata.xml 256
 MD5 6f1aa51ef02f0ae0d5408a8efa7e49dd files/digest-gajim-0.7.1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCqD49I1lqEGTUzyQRAnToAKC+nD3f4g4+OYtRwRnfnoxebQ26WACeO9Ni
-CJCguGYcmrZG3njx40JolZE=
-=untB
------END PGP SIGNATURE-----
+MD5 5a8c6770554dbd5a01ddb6cba24c301b files/gajim-0.7.1-multilib.patch 836
diff --git a/net-im/gajim/files/gajim-0.7.1-multilib.patch b/net-im/gajim/files/gajim-0.7.1-multilib.patch
new file mode 100644
index 000000000000..d451637a97ba
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.7.1-multilib.patch
@@ -0,0 +1,22 @@
+--- gajim-0.7.1/Makefile	2005-06-05 12:56:42.000000000 +0200
++++ gajim-0.7.1/Makefile	2005-06-25 13:05:42.000000000 +0200
+@@ -3,6 +3,7 @@
+ MODULES		= src src/common po
+ PREFIX		= /usr
+ DESTDIR		= /
++LIBDIR		= lib
+ 
+ FIND		= find . \( -name '*.glade' -o -name '*.py' -o -name '*.xpm' -o -name '*.gif' -o -name '*.png' -o -name '*.mo' -o -name '*.wav' \)
+ 
+@@ -67,9 +68,9 @@
+ 	cp gajim.desktop "$(DESTDIR)$(PREFIX)/share/applications/";
+ 	mkdir -p "$(DESTDIR)$(PREFIX)/share/man/man1";
+ 	cp gajim.1 "$(DESTDIR)$(PREFIX)/share/man/man1";
+-	mkdir -p "$(DESTDIR)$(PREFIX)/lib/gajim";
++	mkdir -p "$(DESTDIR)$(PREFIX)/$(LIBDIR)/gajim";
+ 	for f in $(FILES_LIB) ; do \
+-		cp "$$f" "$(DESTDIR)$(PREFIX)/lib/gajim/"; \
++		cp "$$f" "$(DESTDIR)$(PREFIX)/$(LIBDIR)/gajim/"; \
+ 	done
+ 	mkdir -p "$(DESTDIR)$(PREFIX)/bin";
+ 	for s in $(SCRIPTS) ; do \
diff --git a/net-im/gajim/gajim-0.7.1.ebuild b/net-im/gajim/gajim-0.7.1.ebuild
index 7dd52a2851cd..39bbd735afd0 100644
--- a/net-im/gajim/gajim-0.7.1.ebuild
+++ b/net-im/gajim/gajim-0.7.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.7.1.ebuild,v 1.3 2005/06/09 13:03:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.7.1.ebuild,v 1.4 2005/06/25 11:41:38 blubb Exp $
 
-inherit virtualx
+inherit virtualx multilib eutils
 
 DESCRIPTION="Jabber client written in PyGTK."
 HOMEPAGE="http://www.gajim.org/"
@@ -18,14 +18,21 @@ DEPEND=">=dev-python/pygtk-2.4.0
 	>=x11-libs/gtk+-2.4
 	spell? ( >=app-text/gtkspell-2.0.4 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-multilib.patch
+}
+
 src_compile() {
 	targets="idle trayicon"
 	`use nls` && targets="${targets} translation"
 	`use spell` && targets="${targets} gtkspell"
 
-	Xemake ${targets} || die "Xmake failed"
+		Xemake ${targets} || die "Xmake failed"
 }
 src_install() {
-	Xemake DESTDIR=${D} install || die
+	Xemake DESTDIR=${D} LIBDIR=$(get_libdir) install || die
 	dodoc README AUTHORS COPYING
 }