mail-mta/nullmailer: Fix incompatibilities with some automake versions, #478312

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 28 insertions, 22 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index 1c01649d7f6f..c8e619c6847c 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/nullmailer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.74 2013/09/25 10:16:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.75 2013/09/25 10:21:20 jlec Exp $
+
+  25 Sep 2013; Justin Lecher <jlec@gentoo.org> nullmailer-1.11-r2.ebuild,
+  nullmailer-1.11-r3.ebuild, nullmailer-1.13-r2.ebuild:
+  Fix incompatibilities with some automake versions, #478312
 
 *nullmailer-1.13-r2 (25 Sep 2013)
 
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 7a3ad434dd15..da19acf90550 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -11,25 +11,25 @@ AUX remotes.sample-1.13 970 SHA256 56b9adc7762cfac88769ee6a87fa5057a42599a3d50a3
 DIST nullmailer-1.11.tar.gz 203239 SHA256 bf61c839b5f0927e0998c6183f229fa644f97165d3d5402adc59369b2bdaf25e SHA512 419798e6910e554e7d679a18e900555b52e061d3e085c0e958cc1e6b0c132840c285b669ad890baa3bd6191a371b88cec1e10aeaa49cd1c6cde33d881812fbeb WHIRLPOOL d05b0a1969135c8b83ee45494d96e3d13d431d55310b3f04d2fb6c71cffc0490a9fcbfa61ff4040f366e2d0372da35c5d2b331e520eadeb918bf557951daa494
 DIST nullmailer-1.13.tar.gz 205431 SHA256 3f8861ebb1b46cea0a1caf1e6236e1e0d2a5a91def19551b7cad12eab676277d SHA512 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7 WHIRLPOOL b041f7cc33a257fad11c5f4c9bf74f8d849d9c45f0dc19be28268462b9d029c07e1d5802698e647a4208d5f66cac2177a1d12e49a03caac51e0244c3f9a0599c
 DIST nullmailer_1.11-1.debian.tar.gz 33187 SHA256 86d64b37220c4e92680509152b20d08c2702ad313350b8e65dd1d754bd1b76c9 SHA512 67bdb686bc62ff924c2d4b1aac2f528d51e4d7b0d72df438b3197d7a8b3fd6a875be7eb681e092c024ed3d47ba5ed5e5b0bca4f4d07200ca4bbbdbe8fea4c2c9 WHIRLPOOL c2661a17fcf6686825079063d55500a4095b6bc6938729247fc1ef78c2476e352ee9101d56f8d082d537d2e8cab99e5e12eee6195d5c1c891f41f327fde79121
-EBUILD nullmailer-1.11-r2.ebuild 4348 SHA256 f9b831b63a3d33bcb1b9c354aa802a1e4cfea205b2bd5ab5cedecaa4ad9ac213 SHA512 c98ed5344fb97e1a0b4c899855c9463c54d285ed93487b03385d13fd2791fa94fd2d9a469cd6626db1078f91cad5f241178bd9fb6a965290213a922a2e09f73c WHIRLPOOL 0377c9d2cb29dc3bdc28d9a4ba19701753f3ab4362067a562fbfcf9c93276225196c63f1869c2caacd7053c72fccbb6b75c61e1e69fcb164fd69d4cffdf130d0
-EBUILD nullmailer-1.11-r3.ebuild 4407 SHA256 6475568ed64613d0ae92f9944a054f687a99075e98c311b9008eb19771add64c SHA512 d06b983341c502ddd5b10065805e2df84f2819629eb081e96c76074a0097227f249106739781e69269556ddf4ddef42c9960502d5389393c9243d1a6ca33c725 WHIRLPOOL 76e76b8d7201dd71b1708ec53e9a787ac2da5887a413b13969315a7b3197fb105d8ed12a18067bce803799bd545afd942031461d5a7797e74094cbab96dc3635
-EBUILD nullmailer-1.13-r2.ebuild 4524 SHA256 d9774618fd5f44e1e53d21c906e7ff9b8333cd723074f49ce9187c597e35e246 SHA512 47ff7185dcfc41b378438f385b50a941f1fa65c2b75c379beeb85f865d072e22f8b63694a89dff533462689dfde1790d9bccc309a947ebb5c09a6b32562ff568 WHIRLPOOL 83b20d802431471e6bea45f0a172806faa3d62245d11ea2602e0b7c4bff2b1e6066fd8f69bf2be1f381f932939b0a6d2e5f21ac83a51fde64afe5caa656f90ef
-MISC ChangeLog 13979 SHA256 4485cc52a9ba81d2a758c618346a4a4d8b9d3aedb3b15835d39653c2f9b97270 SHA512 bab0f07f32beea10a0aeb211a2c44c718a703dd742cff254ff9f9b5e6eb6f4a642f83af2090882d5d51d0d08c0859e5e5afb2ce32fddb3ad73b2ae40ec99f942 WHIRLPOOL 99b6fed6a4aaebbb4fddd797437c7ba05590d288b38946c770a370b26303c724ff3ec8a97ba18afdf7bf6bef97c831fae973d8839ca27aed0a21739f8f4bde88
+EBUILD nullmailer-1.11-r2.ebuild 4419 SHA256 7807417202aec8b21cae46cd3f932fd49e06a3e89e6c44931b2fa55761748556 SHA512 12a2a5cd5390f71266ade98244df430bfe6903dd266c3553f2f357a9af06d4e0ad5682bb471590f3f1504137aa4fbfad381278fec0a61cd8fb30a414a1d7870a WHIRLPOOL a68188ad71d92b5e9e62ce3706dbc668934add90387b25afb417c0a009a9a790201ccd1c93a206d73ac36abb8fd4b5788a7e49e9bf3365b5bb2313783f4ace04
+EBUILD nullmailer-1.11-r3.ebuild 4477 SHA256 6a650d68dd9c8df40c58d568f9125b24790278c3feb62885c3c3dae8e265c274 SHA512 088d59096e92c8c6edb240eeee2568906fc4f1eae4247c259281d29e3efaf3eedb307037437174e2734cb355c0c4631aa3ae4e16feada8f9ab40b6fdcf8efe43 WHIRLPOOL 43c21e0f41e235c35eaa5f731366b6629eae1a27ea73e03bd3c80ce72aaaa8bc07b7684695aa646b6390bae88217815b9fdd6cd8b1348d6d33c9f1fd0c4c6298
+EBUILD nullmailer-1.13-r2.ebuild 4595 SHA256 a444afa74854d3f2227381291b5ec6cfd6b4599635692569d1ea9b93ffd09294 SHA512 e2e5921a4b1cf62f0f69cb51dc7ce055b87179efbdde0febd6e9159f5567bb8d11b1e260666a6f05d668ec26cce8a6dffd44e967129c6f5d0c984ff22a659454 WHIRLPOOL 7be5a3cc084c35e26b0b93f040397b42a59b7bc8e022ede6e57ac80520a08d52e2f1a9d6a76408b9be409a2b08f1eed0c1696f9e0f468338ed0256996ab1676b
+MISC ChangeLog 14171 SHA256 6cc2089e0c09ed0e02084d374d8a026f0ceaaad052a8c9343a63574eeb3edecc SHA512 e86a1c5badf1d201a93b4ad18a3471c5c38a005e3c98f210e836ae74837f1d58bf8b7e66ef7bee34e126ea15d8df03813991ba304d1ee62ac647d4e1e5db7b67 WHIRLPOOL bd46fc331968eb0dde376386f7818ded6c4e5d3016127ad83502f0524e6110972f025538dbf357bd89258bef7ce6e334889ee84bed5ae6c0cc7e6eae7c1de74a
 MISC metadata.xml 363 SHA256 838fae6a4f4cabb0217b0d1ebbd63acf840e802b3852e7360a4b9ae12a10459e SHA512 18675ce1eba12e093f0d73ac35ca6e456d2d7c0b1f3eee41d9b5bb466391778e3aed877d06028e7fa28c121dfff20fd6729451e5c5706a5ebc33a4f3c10c6f85 WHIRLPOOL d8911b227b42c2f4e47d68cb72f65c1e3349df2e34659aa4a597522138e9f8b055913829e504e11492db81081fbeb51e4b62512aeffde65d105e1120fbd572a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSQrgDAAoJELnU8jG9FVir7MQP/0U47PiGcU871qiM+CC395rF
-t+EnwCENfoUZodBnkEw1su29Vm3JFWWoaCOakWNoMnOnuYy44e+tkmumFgUiuTyB
-7agZnB3cUONEUZQBFHnnRBHlrAABHNcxRdNkrBNJCCVnwSu3Tz3c+Ggo1Po0lE6X
-/LL3T1fMFjCWoygFKmfE3sjSL3uhvgbHRyKMdcfK3zRQxXUzWM4vZYItPIsPMgUi
-/2l4LrZK0k5JvVU7VlUEK7RYQeBY3aVLus6l4aGhQ22LzhD5sbmxJbDuQManUV12
-V3aDT17aeNpM4qW6fgxHQoEp9NhaR8ZXIDy5xnDnvKo3Dh8OfFVoqGFDwyx/Y0M0
-/iMkPRr0pKug6BW/KR4tLNSvuUwqZHkwAgz8/xCv50lj7xtn12ubd9Zv88NzUjno
-SFLPPZCM6DixrY0vUZOL8yO0vI830S8oN/dAiiLAw5gmm1wLu9HTAIlwZPiyelfh
-Oc3IPS88XWqP/Ldz/FIzu7rZG1WPRf0bPPwgp6YqbE04ji+6go1zPXcteSG2ZO5G
-Sn5p3Dkcp1B1VSu+KpyAOku5cRpvw2fuvYekl3FJxzDq0rbn8rHU6drjijWUku5z
-UbJYdgvJby+p+gOSW/VZwNIwCjEXYzJ3eA7Hg68AnXu0XgJoWGLQjmHY3sNLdBp8
-+wPYUSVjHkEw9+CF/UEV
-=ry8E
+iQIcBAEBCgAGBQJSQrkJAAoJELnU8jG9FVirJF8P/RlOh19zLK02oX0UR5iXtbbM
++bO4Ho8vWB172+XUsqRb1vrbZ5hxeq0zmjz/BoMj301L3hvXiCtxuvYCmlAvDd5w
+k2tFac8mNcOI8bB6Tm73FKntb+Er9msP45S/3LiaS9R/cbOjmpnIrSiybYFb/0i0
+DNsDey7PH5ddyopMo7a9+m2xyaOSahZDC7xRBaEBScNCD8HrvWflk+f26ofUHA4W
+HF8F4vaKroGVxLKGKvq26xpIzvkMFIpZqBSJgpdrruKTJG+UYbZ+1+XdH21DRt6q
+fqjhh7tNaOwCcKJzBnhz+FY991MXe7gKMcnL/0e0jGu/llAstK288qxKQ1e/4QZQ
+Ekz7qTkxhSvx5TVyTJEIl3voyQ0AT7n6A4zacekLKZsHzc81qo6O6sqxinC/NeUc
+YFi10SKQGmZi+9tNmJXyF67qG2Ev0ZeHde/Y5p8gutW1nqOE7GWsHq1KQX2GFelZ
+PiXpaalEfnW3YmeCdem0vIVysWU/0ClOtZ0PnMnS6vkxe5EcrBh/qRs0CRQMeigb
+/CxIQXu2pRH5kMdcI4XSIbw0R7ukRNTEDaJuy2xgEj+HE7xH/h4vor7UaaUMtyzJ
+ZdwSfqS6KzZVVU+F09SD6mq6/cLtFjZLh4Hc24BOi+0Gwq6FIe3pc14GmMUBaOSK
+J1rOjFxok0+VM+7G1z4h
+=qJav
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild b/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild
index 60e4a1eebf8e..4ba3bbadb2e7 100644
--- a/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild,v 1.5 2013/09/25 10:16:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild,v 1.6 2013/09/25 10:21:20 jlec Exp $
 
 EAPI=4
 WANT_AUTOMAKE="1.10.3"
@@ -56,6 +56,7 @@ src_prepare() {
 	sed \
 		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
 		-i configure.in || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
 	eautoreconf
 }
 
diff --git a/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild b/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild
index 8fad494ff650..0e109bd05bff 100644
--- a/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild,v 1.2 2013/09/25 10:16:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild,v 1.3 2013/09/25 10:21:20 jlec Exp $
 
 EAPI=4
 
@@ -64,7 +64,7 @@ src_prepare() {
 	sed \
 		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
 		-i configure.in || die
-
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
 	eautoreconf
 }
 
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild
index fef08af7079c..2fefde57e987 100644
--- a/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild,v 1.1 2013/09/25 10:16:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild,v 1.2 2013/09/25 10:21:20 jlec Exp $
 
 EAPI=5
 
@@ -68,6 +68,7 @@ src_prepare() {
 	sed \
 		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
 		-i configure.in || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
 	eautoreconf
 }