summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSantiago M. Mola <coldwind@gentoo.org>2007-08-28 20:33:17 +0000
committerSantiago M. Mola <coldwind@gentoo.org>2007-08-28 20:33:17 +0000
commitdbc469e331211d5e8aa09767861661b23619a252 (patch)
tree5bf7b35c35b9c47170a022ce18449cb5e33e3dab /net-im/empathy/files
parentAdding ~ppc (diff)
downloadgentoo-2-dbc469e331211d5e8aa09767861661b23619a252.tar.gz
gentoo-2-dbc469e331211d5e8aa09767861661b23619a252.tar.bz2
gentoo-2-dbc469e331211d5e8aa09767861661b23619a252.zip
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)
Diffstat (limited to 'net-im/empathy/files')
-rw-r--r--net-im/empathy/files/digest-empathy-0.12-r13
-rw-r--r--net-im/empathy/files/empathy-0.12-multilib.patch38
2 files changed, 41 insertions, 0 deletions
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 = \