Fix Python installation path. bug #190465 thanks to Daniel Gryniewicz <dang@gentoo.org> for the patch and Olivier Crete <tester@gentoo.org> for getting it upstream.

(Portage version: 2.1.2.11)

4 files changed, 60 insertions, 4 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 7ab02ad949b5..31f5fb7bdee5 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.3 2007/08/26 19:12:30 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.4 2007/08/28 20:33:16 coldwind Exp $
+
+*empathy-0.12-r1 (28 Aug 2007)
+
+  28 Aug 2007; Santiago M. Mola <coldwind@gentoo.org>
+  +files/empathy-0.12-multilib.patch, -empathy-0.12.ebuild,
+  +empathy-0.12-r1.ebuild:
+  Fix Python installation path. bug #190465 thanks to Daniel Gryniewicz
+  <dang@gentoo.org> for the patch and Olivier Crete <tester@gentoo.org> for
+  getting it upstream.
 
 *empathy-0.12 (26 Aug 2007)
 
diff --git a/net-im/empathy/empathy-0.12.ebuild b/net-im/empathy/empathy-0.12-r1.ebuild
index d7beafe09d3d..de6377419f43 100644
--- a/net-im/empathy/empathy-0.12.ebuild
+++ b/net-im/empathy/empathy-0.12-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-0.12.ebuild,v 1.1 2007/08/26 19:12:30 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-0.12-r1.ebuild,v 1.1 2007/08/28 20:33:16 coldwind Exp $
 
-inherit gnome2
+inherit gnome2 eutils autotools
 
 DESCRIPTION="Empathy Telepathy client"
 HOMEPAGE="http://live.gnome.org/Empathy"
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="spell python"
+IUSE="python spell"
 
 RDEPEND=">=dev-libs/dbus-glib-0.51
 	>=dev-libs/glib-2.12
@@ -35,6 +35,12 @@ pkg_setup() {
 	G2CONF="$(use_enable spell aspell) $(use_enable python)"
 }
 
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}/${P}-multilib.patch"
+	eautoreconf
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 	echo
diff --git a/net-im/empathy/files/digest-empathy-0.12-r1 b/net-im/empathy/files/digest-empathy-0.12-r1
new file mode 100644
index 000000000000..14087d18722e
--- /dev/null
+++ b/net-im/empathy/files/digest-empathy-0.12-r1
@@ -0,0 +1,3 @@
+MD5 bd573be24ca435accb9313f41301a656 empathy-0.12.tar.bz2 926914
+RMD160 78267f7e94e71b0f36c47575798b3a1932e0f5db empathy-0.12.tar.bz2 926914
+SHA256 8d47953c117e9c73c25f0b3413a06962a6b85ce2e7cb6f3e973823286bf4dfd5 empathy-0.12.tar.bz2 926914
diff --git a/net-im/empathy/files/empathy-0.12-multilib.patch b/net-im/empathy/files/empathy-0.12-multilib.patch
new file mode 100644
index 000000000000..c8d4480c3a52
--- /dev/null
+++ b/net-im/empathy/files/empathy-0.12-multilib.patch
@@ -0,0 +1,38 @@
+--- empathy-0.12.orig/configure.ac	2007-08-24 17:49:42.000000000 -0400
++++ empathy-0.12/configure.ac	2007-08-27 17:14:19.000000000 -0400
+@@ -177,7 +177,12 @@ if test "x$have_python" = "xno"; then
+ 	enable_python="no (missing dependencies)"
+ else
+ 	if test "x$enable_python" != "xno"; then
+-		enable_python="yes"
++		AM_PATH_PYTHON
++		if test -z "$PYTHON" ; then
++			enable_python="no"
++		else
++			enable_python="yes"
++		fi
+ 	else
+ 		enable_python="no (disabled)"
+ 	fi
+--- empathy-0.12.orig/python/pyempathy/Makefile.am	2007-08-24 17:29:46.000000000 -0400
++++ empathy-0.12/python/pyempathy/Makefile.am	2007-08-27 17:15:07.000000000 -0400
+@@ -12,7 +12,7 @@ AM_CPPFLAGS =                           
+ BUILT_SOURCES = 					\
+ 	pyempathy.c					
+ 
+-pyempathydir = $(prefix)/lib/`pyversions -d`/site-packages
++pyempathydir = $(pyexecdir)
+ pyempathy_LTLIBRARIES = empathy.la
+ 
+ empathy_la_SOURCES =					\
+--- empathy-0.12.orig/python/pyempathygtk/Makefile.am	2007-08-24 17:29:46.000000000 -0400
++++ empathy-0.12/python/pyempathygtk/Makefile.am	2007-08-27 17:15:43.000000000 -0400
+@@ -11,7 +11,7 @@ AM_CPPFLAGS =                           
+ BUILT_SOURCES = 					\
+ 	pyempathygtk.c					
+ 
+-pyempathygtkdir = $(prefix)/lib/`pyversions -d`/site-packages
++pyempathygtkdir = $(pyexecdir)
+ pyempathygtk_LTLIBRARIES = empathygtk.la
+ 
+ empathygtk_la_SOURCES =					\