diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-06-25 01:19:08 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-06-25 01:19:08 +0000 |
| commit | ab999b0a7c6167b3a47a17ddff2d59daeac43ac9 (patch) | |
| tree | 0d02ebfcb3a9a0753187ff524f64997208a57086 /dev-python | |
| parent | Update HOMEPAGE (diff) | |
| download | gentoo-2-ab999b0a7c6167b3a47a17ddff2d59daeac43ac9.tar.gz gentoo-2-ab999b0a7c6167b3a47a17ddff2d59daeac43ac9.tar.bz2 gentoo-2-ab999b0a7c6167b3a47a17ddff2d59daeac43ac9.zip | |
Fix building with automake-1.12.x (bug #423249, thanks to Diego Elio Pettenò for reporting).
(Portage version: 2.2.0_alpha112/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
3 files changed, 42 insertions, 4 deletions
diff --git a/dev-python/telepathy-python/ChangeLog b/dev-python/telepathy-python/ChangeLog index 827385532630..fcf90ae538fe 100644 --- a/dev-python/telepathy-python/ChangeLog +++ b/dev-python/telepathy-python/ChangeLog @@ -1,6 +1,12 @@ # 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.36 2011/03/22 20:07:03 ranger Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/telepathy-python/ChangeLog,v 1.37 2012/06/25 01:19:08 tetromino Exp $ + + 25 Jun 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + telepathy-python-0.15.19.ebuild, + +files/telepathy-python-0.15.19-mkdir_p.patch: + Fix building with automake-1.12.x (bug #423249, thanks to Diego Elio Pettenò + for reporting). 22 Mar 2011; Brent Baude <ranger@gentoo.org> telepathy-python-0.15.19.ebuild: diff --git a/dev-python/telepathy-python/files/telepathy-python-0.15.19-mkdir_p.patch b/dev-python/telepathy-python/files/telepathy-python-0.15.19-mkdir_p.patch new file mode 100644 index 000000000000..be4d9bfa7141 --- /dev/null +++ b/dev-python/telepathy-python/files/telepathy-python-0.15.19-mkdir_p.patch @@ -0,0 +1,30 @@ +From 95f5183700cad0c713bc4f5757555b45ce173ed8 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Sun, 24 Jun 2012 21:02:04 -0400 +Subject: [PATCH] Stop using obsolete $(mkdir_p) for automake-1.12 + compatibility + +$(mkdir_p) was declared obsolete in automake-1.10, deprecated in 1.12, +and removed in 1.13. + +https://bugs.freedesktop.org/show_bug.cgi?id=51392 +--- + src/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index ede1fc3..154c56e 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -57,7 +57,7 @@ _generated/errors.py: $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec + $(spec_dir)/all.xml + + _generated/__init__.py: +- $(AM_V_GEN)$(mkdir_p) $(dir $@) ++ $(AM_V_GEN)$(MKDIR_P) $(dir $@) + @echo "# Placeholder for package" > $@ + + _generated/%.py: $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml +-- +1.7.8.6 + 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 d47739a01ed4..4019d0770255 100644 --- a/dev-python/telepathy-python/telepathy-python-0.15.19.ebuild +++ b/dev-python/telepathy-python/telepathy-python-0.15.19.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.7 2011/03/22 20:07:03 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/telepathy-python/telepathy-python-0.15.19.ebuild,v 1.8 2012/06/25 01:19:08 tetromino Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -24,6 +24,8 @@ RDEPEND=">=dev-python/dbus-python-0.80" src_prepare() { # Don't install _generated/errors.py twice, bug #348386 epatch "${FILESDIR}/${P}-install-twice.patch" + # automake-1.12 compat, bug #423249, https://bugs.freedesktop.org/show_bug.cgi?id=51392 + epatch "${FILESDIR}/${P}-mkdir_p.patch" eautoreconf python_src_prepare |