Fix building with automake-1.12.x (bug #423249, thanks to Diego Elio Pettenò for reporting).

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

4 files changed, 59 insertions, 6 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/Manifest b/dev-python/telepathy-python/Manifest
index 6217a6f0b7b5..c46e1f53f5f8 100644
--- a/dev-python/telepathy-python/Manifest
+++ b/dev-python/telepathy-python/Manifest
@@ -1,7 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX telepathy-python-0.15.19-install-twice.patch 1026 RMD160 bc0932e24dbc0ff39a6b7817e4c55291918645e4 SHA1 0a92fdd2a3a6293b72bbff17778e1217e179f4eb SHA256 7a000aa2353b12db2825b56f2bd97f9527e8a9b8cd3d7efbcd51e3b1fa52217d
+AUX telepathy-python-0.15.19-mkdir_p.patch 932 RMD160 b78968505c1ab32ff2d04969c075d8bf51cd57ab SHA1 5928f2e827e7e9fdb0abfc6a4bd7b855c847b691 SHA256 7506dcf178fdbdbdcdb2bc41a470ec0b95e3cd736e79c6d4cf2ab3f38cf48497
 DIST telepathy-python-0.15.17.tar.gz 304948 RMD160 b3916eeaf1f008ff69dc595429d5fb87883288b4 SHA1 3650640fded7337d43f80d7747e9d56208d3e893 SHA256 2e74bfd088e82d5858d1dbd7204ab3a4735935e2fcc87de1798761bc59c50c7b
 DIST telepathy-python-0.15.19.tar.gz 402594 RMD160 8a54c861b4eaa2d3660c5be062566cd6fbd2ba46 SHA1 a0cc066088f2fc25849c1d005baaea2b7c6409fd SHA256 244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376
 EBUILD telepathy-python-0.15.17.ebuild 731 RMD160 ed956ad3bf97ddaee8a6c69bdd25cb0f6349d641 SHA1 e6d209e71c9d4af24167420b4dce8366c3fe7334 SHA256 49fc5d610271ad7a6bbdad4f6fe4790e55e30561dfd97fcdd64e113ee96b9eee
-EBUILD telepathy-python-0.15.19.ebuild 1074 RMD160 9a27c87aef4efa42e289196eb5614e62b2924cda SHA1 f51989eacbd19979bae0d30037f42a1a86705d37 SHA256 ae1332c577f1f9cb9ac86efd190fb36640b9cfe4473b6ecb5794327b1b5da971
-MISC ChangeLog 6225 RMD160 5cc5ad2762d215526792ceb5c6b28984af7d02fb SHA1 95cfad8a1cd5db26b3f8f4eb5e1f90d5fb36998a SHA256 b370c4c0d5a47cff91383fa40a5194e76ea4cbf1a6b83b8f89ba4df95eabbdb5
+EBUILD telepathy-python-0.15.19.ebuild 1207 RMD160 55ace40ac998a4d7afa27fc9ccb8283efb301ac2 SHA1 82adc654d50c33f15f816a9c66cb0a2c9aa6eddd SHA256 55b80776eb9752a5508b18fba845a7fcd1ec93d31d73b0e8ae31ddc5cbe2c9b4
+MISC ChangeLog 6470 RMD160 7ba06090add4c118e32c6cd4624e7ba3164b11f2 SHA1 805ca4cc6f390f13275bbe4786db924f4661126f SHA256 fd84ce10dc41d8c85aab69705eda6919c1d5026b27b47fc0ffcc4ea308bda3a9
 MISC metadata.xml 325 RMD160 7ca27b1de1278db5577b3bb57acf485db6725166 SHA1 21607b21a4d9bb781ec50cf44efc2c125febc807 SHA256 ff2e73c08bb9d36afaab8b340aec6d62b22a1f2470953444c2ca101d652380c0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP57yRAAoJEJ0WA1zPCt1h2l4H/jSThyQUybu3/Z/luSwa9cqa
+FdZUU+0WDnsZAzadCepffPoZj9cOT2EkRpBzvadPD4YLcYVaekA4VRrI57KLRAY/
+hfnpJcqct5+0xGvGPPjjDuJMHX4qq446JRqmNBzZRgm9ghRW+VzL/oaI5lUHIpHV
+CIXXchc0FVSbh6jRUXLR1KDERnogqWLXHcc7echySU4z3OAIxDFT4PI4zlj4ikQI
+QkgdgTxXq3NIle6llLeCcNdgFXQpcN18ue2fHb6TTCmOy/+7laPIRlKk7I+lD2pa
+J8kyLIG6p9diMmVfmkH+xdagiUMJFfVGZec7DErCNXgtpAakQnofkS6Lbg1em1g=
+=3tG9
+-----END PGP SIGNATURE-----
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