diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2011-02-08 09:39:07 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2011-02-08 09:39:07 +0000 |
| commit | 0a16acf58d68006866143047eb8f8959540de96c (patch) | |
| tree | a7e145a3d9c2be9b17f7e4d23316d3993393a4a9 /dev-python/telepathy-python | |
| parent | Add version 0.41 (diff) | |
| download | gentoo-2-0a16acf58d68006866143047eb8f8959540de96c.tar.gz gentoo-2-0a16acf58d68006866143047eb8f8959540de96c.tar.bz2 gentoo-2-0a16acf58d68006866143047eb8f8959540de96c.zip | |
Don't install errors.py twice as it fails (bug #348386 by Jonathan Callen and patch by Reimundo Heluani).
(Portage version: 2.1.9.36/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/telepathy-python')
3 files changed, 50 insertions, 3 deletions
diff --git a/dev-python/telepathy-python/ChangeLog b/dev-python/telepathy-python/ChangeLog index 4a787f8596e1..13c53ea96e5a 100644 --- a/dev-python/telepathy-python/ChangeLog +++ b/dev-python/telepathy-python/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/telepathy-python # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/telepathy-python/ChangeLog,v 1.30 2011/02/07 19:43:20 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/telepathy-python/ChangeLog,v 1.31 2011/02/08 09:39:07 pacho Exp $ + + 08 Feb 2011; Pacho Ramos <pacho@gentoo.org> telepathy-python-0.15.19.ebuild, + +files/telepathy-python-0.15.19-install-twice.patch: + Don't install errors.py twice as it fails (bug #348386 by Jonathan Callen and + patch by Reimundo Heluani). *telepathy-python-0.15.19 (07 Feb 2011) diff --git a/dev-python/telepathy-python/files/telepathy-python-0.15.19-install-twice.patch b/dev-python/telepathy-python/files/telepathy-python-0.15.19-install-twice.patch new file mode 100644 index 000000000000..72055e92768a --- /dev/null +++ b/dev-python/telepathy-python/files/telepathy-python-0.15.19-install-twice.patch @@ -0,0 +1,34 @@ +From 0c4e6e9f41b24bbb7ea33653b8a81ff79c0ea032 Mon Sep 17 00:00:00 2001 +From: Reimundo Heluani <rheluani@gmail.com> +Date: Tue, 21 Dec 2010 12:25:22 +0000 +Subject: [PATCH] src: don't install _generated/errors.py twice + +Fixes: fd.o#32526 + +Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> +--- + NEWS | 5 +++++ + src/Makefile.am | 4 +++- + 2 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 135f2f0..ede1fc3 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -13,10 +13,12 @@ telepathy_PYTHON = \ + spec_dir = $(top_srcdir)/spec + spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml)) + ++# We leave _generated/errors.py out of here because there exists a ++# spec/errors.xml file, so that means there'll be a ++# _generated/errors.py in $(spec_files). See fd.o#32526 + BUILT_SOURCES = \ + _generated/interfaces.py \ + _generated/constants.py \ +- _generated/errors.py \ + _generated/__init__.py \ + $(spec_files) + +-- +1.7.2.3 + diff --git a/dev-python/telepathy-python/telepathy-python-0.15.19.ebuild b/dev-python/telepathy-python/telepathy-python-0.15.19.ebuild index 1c4c3b3b6ba6..1ebdc25ed523 100644 --- a/dev-python/telepathy-python/telepathy-python-0.15.19.ebuild +++ b/dev-python/telepathy-python/telepathy-python-0.15.19.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/telepathy-python/telepathy-python-0.15.19.ebuild,v 1.1 2011/02/07 19:43:20 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/telepathy-python/telepathy-python-0.15.19.ebuild,v 1.2 2011/02/08 09:39:07 pacho Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="3.*" PYTHON_EXPORT_PHASE_FUNCTIONS="1" -inherit python +inherit python eutils autotools DESCRIPTION="Telepathy Python base classes for use in connection managers, and proxy classes for use in clients." HOMEPAGE="http://telepathy.freedesktop.org/" @@ -21,6 +21,14 @@ IUSE="" DEPEND="dev-libs/libxslt" RDEPEND=">=dev-python/dbus-python-0.80" +src_prepare() { + python_src_prepare + + # Don't install _generated/errors.py twice, bug #348386 + epatch "${FILESDIR}/${P}-install-twice.patch" + eautoreconf +} + src_install() { python_src_install dodoc AUTHORS NEWS || die |