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.

Package-Manager: portage-2.1.2.11

5 files changed, 75 insertions, 25 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/Manifest b/net-im/empathy/Manifest
index d669fb7ee204..3c4f6cb7f358 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,20 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX empathy-0.12-multilib.patch 1347 RMD160 9f13d63d98ca4baf69f4fe9082eba95d4932e97a SHA1 34aeaf407400c097dcb9f1c0d3d1ed6c3c441830 SHA256 235adc66c1b26477bb33a0fcbaee447d7a35bac3b327195bed224ebb44b7caa5
+MD5 4cb751b27e389bcad5bcc23cd1ab8283 files/empathy-0.12-multilib.patch 1347
+RMD160 9f13d63d98ca4baf69f4fe9082eba95d4932e97a files/empathy-0.12-multilib.patch 1347
+SHA256 235adc66c1b26477bb33a0fcbaee447d7a35bac3b327195bed224ebb44b7caa5 files/empathy-0.12-multilib.patch 1347
 DIST empathy-0.11.tar.bz2 904304 RMD160 49e6be69f2fdef56311e7b961943b9c4e9cebbbb SHA1 a0ab87d4fff5b8493e7cc6a80bf93b868be13a5a SHA256 d860741394a32482a6b361ceb9b9b3350a492bfa280de3a5ded6f35b1abf83b9
 DIST empathy-0.12.tar.bz2 926914 RMD160 78267f7e94e71b0f36c47575798b3a1932e0f5db SHA1 16f4e82de85df07826f8957e03b891ad33e7e6a4 SHA256 8d47953c117e9c73c25f0b3413a06962a6b85ce2e7cb6f3e973823286bf4dfd5
 EBUILD empathy-0.11.ebuild 1169 RMD160 03904c7d5d28c625553708e33e4edc3c946bb24b SHA1 12894e5244f8bedfa091de0c2c03a522462393c7 SHA256 cd41a1e9bca97cdb56a1d89f356ab2289d0078485aa78d0ca70cb27d232d73ba
 MD5 4cd2e4d23101dd04930510116d11a346 empathy-0.11.ebuild 1169
 RMD160 03904c7d5d28c625553708e33e4edc3c946bb24b empathy-0.11.ebuild 1169
 SHA256 cd41a1e9bca97cdb56a1d89f356ab2289d0078485aa78d0ca70cb27d232d73ba empathy-0.11.ebuild 1169
-EBUILD empathy-0.12.ebuild 1306 RMD160 bbe7460f85ef37460303be2c9a4327885e50a03b SHA1 fab2d1774a892af45c1a3f132f6558f840451318 SHA256 ef645f465bb3d73597e8854541d7fabb3cb9fad8dfec3a9e403f7debcfd90dc2
-MD5 b29b95e8005e8f3501ccca6ab4ddf8b6 empathy-0.12.ebuild 1306
-RMD160 bbe7460f85ef37460303be2c9a4327885e50a03b empathy-0.12.ebuild 1306
-SHA256 ef645f465bb3d73597e8854541d7fabb3cb9fad8dfec3a9e403f7debcfd90dc2 empathy-0.12.ebuild 1306
-MISC ChangeLog 585 RMD160 9349feb7c381fac697e93a60728ca69f5fd750c5 SHA1 dec3ec170c494d7d53139d7619ccbee6c84819a4 SHA256 6471aaf7934919414465f21305790b57ce5e24c25ec586abe9597ea42df64b11
-MD5 88da8fa7740db2a0b981c11f33e02158 ChangeLog 585
-RMD160 9349feb7c381fac697e93a60728ca69f5fd750c5 ChangeLog 585
-SHA256 6471aaf7934919414465f21305790b57ce5e24c25ec586abe9597ea42df64b11 ChangeLog 585
+EBUILD empathy-0.12-r1.ebuild 1420 RMD160 2d59122330721befb4e5ba983388a23a5c40beff SHA1 60039b026d6360dcd07b6895ff9ddcb5589d819c SHA256 808bb743fad0bafa9243d99461463996be9a5609d62610887cd4fcf134249ea4
+MD5 c33a8c81e4cae6930c463f2cb4f9eb1a empathy-0.12-r1.ebuild 1420
+RMD160 2d59122330721befb4e5ba983388a23a5c40beff empathy-0.12-r1.ebuild 1420
+SHA256 808bb743fad0bafa9243d99461463996be9a5609d62610887cd4fcf134249ea4 empathy-0.12-r1.ebuild 1420
+MISC ChangeLog 932 RMD160 a949ea052e0323ab6e8f89acd55b48b78c389b9b SHA1 aee7bd59566a865f426c4f734e4ffcc68225b177 SHA256 71a855bfc717d842a8e3b37b7705795bca5a35f915057cd800f0a1aee2262743
+MD5 64e1be3459f40c7ac58f9984a8a6950a ChangeLog 932
+RMD160 a949ea052e0323ab6e8f89acd55b48b78c389b9b ChangeLog 932
+SHA256 71a855bfc717d842a8e3b37b7705795bca5a35f915057cd800f0a1aee2262743 ChangeLog 932
 MISC metadata.xml 710 RMD160 f0d4a0b8ab679d77ae64e683d4eed5a2b29b66ee SHA1 cff1fc6b36545ac0afb2cf9eb82556a547209059 SHA256 b8b226d6e8553666e22e8cb840d8ac2a39049f41a908806706c688e42033c8b9
 MD5 6b1b042e3b7f71cf2ad0dc138409abf7 metadata.xml 710
 RMD160 f0d4a0b8ab679d77ae64e683d4eed5a2b29b66ee metadata.xml 710
@@ -22,13 +23,6 @@ SHA256 b8b226d6e8553666e22e8cb840d8ac2a39049f41a908806706c688e42033c8b9 metadata
 MD5 8d0dd5c213ce13ea6d1b3a984f97e86a files/digest-empathy-0.11 241
 RMD160 c1b69925cda739cca1d2fe0d230fc4871b901f5b files/digest-empathy-0.11 241
 SHA256 b9aa2e08dc8779bf65f3de781dffb700731db5bb3a88365cbf4e4df319fba63b files/digest-empathy-0.11 241
-MD5 fac2cf57113de33a7cd019254b989f9f files/digest-empathy-0.12 241
-RMD160 cb80379bd14f4a52beba16d3dfa766e2af3c7e84 files/digest-empathy-0.12 241
-SHA256 099df1a2ab24929b644901ca4385972f223dd91f39866b145c01870a25ee6d66 files/digest-empathy-0.12 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFG0dGK+IXOQtHLm/gRAh7HAJ9At3M6IJH/qd6Kgmg3FshSatA14gCfWr0d
-+xfuBIPYT7WTejqj9t2ND1s=
-=2t1Z
------END PGP SIGNATURE-----
+MD5 fac2cf57113de33a7cd019254b989f9f files/digest-empathy-0.12-r1 241
+RMD160 cb80379bd14f4a52beba16d3dfa766e2af3c7e84 files/digest-empathy-0.12-r1 241
+SHA256 099df1a2ab24929b644901ca4385972f223dd91f39866b145c01870a25ee6d66 files/digest-empathy-0.12-r1 241
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 =					\