Fix building with automake-1.13 by Ed Catmur (bug #467594).

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 27 insertions, 8 deletions

diff --git a/app-office/passepartout/ChangeLog b/app-office/passepartout/ChangeLog
index 40d29075c6e9..6a692a4a56b2 100644
--- a/app-office/passepartout/ChangeLog
+++ b/app-office/passepartout/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/passepartout
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/ChangeLog,v 1.20 2013/07/21 09:55:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/ChangeLog,v 1.21 2013/07/24 01:32:05 jer Exp $
+
+  24 Jul 2013; Jeroen Roovers <jer@gentoo.org>
+  +files/passepartout-0.7.0-automake-1.13.patch, passepartout-0.7.0.ebuild:
+  Fix building with automake-1.13 by Ed Catmur (bug #467594).
 
   21 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due http://gentoo.2317880.n4.nabble.com/sgml-herd-has-no-maintainers-
diff --git a/app-office/passepartout/Manifest b/app-office/passepartout/Manifest
index 2eb28687a583..3a6a22eff15e 100644
--- a/app-office/passepartout/Manifest
+++ b/app-office/passepartout/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX passepartout-0.6-extra_qual.patch 2052 SHA256 04a195e970439e7dffbb29b83ccd454d0b4939144d99417a967a2782d2be4c27 SHA512 1e8d4306297c5fbded0385e3399fb6c781ff2e7a58db202589bab4c17d795ef343b35f1cc92512c837530d7337941b39ff12c09f125b58313d4d29f3d995264e WHIRLPOOL 73b3ebaecfc33efaad8d1a40d0bba029c2af1d08e98b80fd6d2fa6c85a0ee2b69d6d381b1ae3f9901d44358759a6659e2f3580865966bd85b9d74c330baf3cec
+AUX passepartout-0.7.0-automake-1.13.patch 437 SHA256 1d6798abacea6595ce5a7d630578a1a38ab3297cbab667778317a504a11d4b3b SHA512 32773a799319c210fe582bc7a8414ba9c09086d1c083f2a0a4c1fe7c1c8bf71e29fefce9dfba3f5f3b637d9c3fd707c00cecd41c20e65ed8ed2555892c4a315f WHIRLPOOL 8fc92e1cffb7a3e36105d7fafb72b33c9d3a68cae558a5885de1b624beda49c9011e49093596c64714db73751a70d193bf0687010a5640f46a2dd8a9735a4c8b
 AUX passepartout-0.7.0-gcc42.patch 540 SHA256 0942429cdb2c933b1dc5f2f7fa2c858897fd5be0699cdb857cc2e49a09bea89e SHA512 0ac84f17a6f2d95b967d84be3f3a2cca058fb71702fee0a147415957d160222945d9ec8bc3154c18df773f0b15f12aa64a56fe88ddefa36c0347f4e7028e34bb WHIRLPOOL f4dd94a31d103a40388875b30298b3a770ca5fa1c8afbd33d7ffd7ac8ad5114c289125ea14bc7522290c3d6553e53e6439b271046682e327768e9c3a6da22dd1
 AUX passepartout-0.7.0-gcc43.patch 2046 SHA256 2b1e13940f75465ca1575219885006a7cf74a1d6472da513074914c6de759f3e SHA512 d90fce83519fa006cd52e7b594f8271c721cc01f7335ded5ba6bf9fbee429f178e059ac27b3d88423723fe8adee216ff2f6f42adf870a11c502ca2e3e05a0c15 WHIRLPOOL b446842fb5b7fa858de581b3caa7d4631554543399598500a20107ed9c7dedbd3d294ac48fc12bc8a55ff54534a2ac0aa98d595a2f24fba64ba74d746f0ca969
 AUX passepartout-0.7.0-gcc44.patch 5954 SHA256 c1ddd5a3e1788de4f2792a1185f93e36e1223b8987a833c7d78cf91263996947 SHA512 80328922b151a6a371276489080e437e2e90f31f2e8c92a76593131a31ee0d4c6289ba69d71074337ffeb12967fa2b029f9a02c0322b9cc570d1f9683e29d762 WHIRLPOOL 280a8534fc1d963d299a2cdcfde450bb9417552a2de8130bdf1200a738ff191408feb2ba1cee61f953ceb6a712df0933c0067a167dbc85c4919a3921320b5300
@@ -10,13 +11,13 @@ AUX passepartout-0.7.0-libtoolization.patch 11344 SHA256 c90451db70cb627f0182f6c
 AUX passepartout-0.7.0-libxmlpp-2.6-depend.patch 341 SHA256 b1c78a59bc6e73e3ed75a481b041cee71b5a3671953d9424cd7e7e6dc7fe671f SHA512 a2abdda16254ca27bd4fd73cf4211d9cf7a9ca5be334d1c4c3f3e4c418c3481d9c1cfeaf243890af0d1dc62f44f873b16979e12121e6a27e40fe5a70a3f04130 WHIRLPOOL 75e3c362787be0839643ca85e568eaa44401751ff1b85f62295dcee12a1de465f5fe29c864e12f102e4e2d6524fcc5e06104b711144826393f3ba8d083eff451
 AUX passepartout-0.7.0-safer.patch 506 SHA256 33a98d600b9c1c229cc4aa423e54719c256a658d0c7fd5ecbd57a1b1a4c868bf SHA512 008c8848e1bafa4a713029841eb6c5dfc0affff265f135a6b219a0dc958e97bc0fde5263cce0e0f8db9bbb85d5d0c5711d3c1e4adb8d74aef24217ed2fc543ee WHIRLPOOL 1aa8e92e19ea6e32cfab1474705dc2abf1fcc0a29d7730b214ffee53bffa9363f89d4582983eebe1535b831968de22fd2f00782f6a06c88de055acad32d42ff5
 DIST passepartout-0.7.0.tar.bz2 369232 SHA256 709890fb1530217e2678b710e996e9e3ee41c969088193711f119fc456f67d0b SHA512 41b8ed3905ee5332a89bc8512a5481bc52bdf58871254137e48150ad0d00a561aa9483d2accd41672f34bc37bea645f2a5ad40435cfd45490c3ff5542032ab8f WHIRLPOOL 2da483041be06eb2d8f268bd291d8105a0840c4e73ee61abb36fd4394310657e673979092b155718a8dc48c74b645529774e27a265f683daa73a8fa7752693ec
-EBUILD passepartout-0.7.0.ebuild 1886 SHA256 9ab1ba8f4af16aee10a0869ced8ccd0336a580ba571bd83ab47790f55a2e348f SHA512 fa0aa7d594379568e5c3e0989f029d97daf0f5d34e7342455304edb10a397f005b89e507fafb00f3036fb9bf02382a9779a4541eef26b3b002f32686f6c3e568 WHIRLPOOL 26a4e1bee4879926b20cb3f2af2f637dd3e474e70b2fc2247906b43f338e8c3aacdb1fb34392117930330e9a380eb51a584199c436855958c9ba8ba6b3afe9c1
-MISC ChangeLog 3180 SHA256 0d03f524927e4dbfaeed5e82f30fdf104159e8cdadc8c38a87aeb7df550991de SHA512 a87255f512f64161926b8135911cf6045a205db4f09459138355995be0c151cc6b0b0214799f2d2a67e3662855b89de74286f075335d489143d3eb9a5d152131 WHIRLPOOL 598e6d1c32eb5666ff9b4a6f07cf9f9ed13463aa8b72e5d8b31fc9267239ebba9297d9a99628ab738629dbd563b108f132eb286f71421616bf5e52b682cd3c5e
+EBUILD passepartout-0.7.0.ebuild 1924 SHA256 62164154ab9f06774ccbdb42a283850c10f2f69f060df60b38011560bbcc648e SHA512 99f3614bfc961aaeacb6143209a8d694caf6cd75b5c462c75c80c7d8b2e19060b7566eec4feda0be6130f92bf7491798c450f413fd8250d47e5a5488126ac024 WHIRLPOOL 0902646eb501b9c6333718ddaa6a29189ad3089876e6a0ac923efd874f521cf444715ce243f3d00fefbd2a2faa8404060dd4f2cca636ce85d75d4648f45ea855
+MISC ChangeLog 3364 SHA256 0855a744ba82b4f2b11cddf6d81df1b6300e5ae753910e1f83d8e4978dd5164b SHA512 352f4f49779736e49ac533bea79ea595251fdc43f5aa4b54484c76eff638b31c4781e4a185a60fe4d4ac1dd7ffe630525c6bfe05fe9281cfd4dab313196d602a WHIRLPOOL 6a72d31953fad89a1aab2e120158a4a9fcafd7bf0ffc8b301bab0a7d4a5552c9490d5b2292985e698e562ccb983cedad01d31600db12a29076726a672c3cfb94
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHrsC4ACgkQCaWpQKGI+9QKlgCfdoDhqDjOvbfv5U2LbG81IOd2
-BCAAn3kxNEMegEpjJAmqcPTMhhB3bTJB
-=w1pE
+iEYEAREIAAYFAlHvLpYACgkQVWmRsqeSphMmXgCfT5z8NNjU7mqqqxhUt7GPNtBh
+EegAn20mXTlPaKCUqy0k2MzkkAMUyhAY
+=DsYi
 -----END PGP SIGNATURE-----
diff --git a/app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch b/app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch
new file mode 100644
index 000000000000..4c57a85c79cd
--- /dev/null
+++ b/app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index e59f631..ca329c1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ # For automake < 1.6 you need to use this line instead:
+ #AM_INIT_AUTOMAKE(Passepartout, 0.7-PRE)
+ 
+-AM_CONFIG_HEADER(src/defines.h)
++AC_CONFIG_HEADERS([src/defines.h])
+ # AC_CONFIG_HEADER(src/defines.h)
+ 
+ # We're just a few binaries...not worth doing shared by default?
diff --git a/app-office/passepartout/passepartout-0.7.0.ebuild b/app-office/passepartout/passepartout-0.7.0.ebuild
index 95cd957b1457..0a4af53f2e39 100644
--- a/app-office/passepartout/passepartout-0.7.0.ebuild
+++ b/app-office/passepartout/passepartout-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.7.0.ebuild,v 1.8 2012/05/03 20:00:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.7.0.ebuild,v 1.9 2013/07/24 01:32:05 jer Exp $
 
 EAPI=2
 
@@ -60,6 +60,7 @@ PATCHES=(
 		"${FILESDIR}/${P}-libtoolization.patch"
 		"${FILESDIR}/${P}-safer.patch"
 		"${FILESDIR}/${P}-libxmlpp-2.6-depend.patch"
+		"${FILESDIR}/${P}-automake-1.13.patch"
 	)
 
 src_unpack() {