Fix for automake-1.13, bug #468070

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 35 insertions, 17 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index 2cc01920e7c0..37d7a3147d35 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/varnish
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.61 2013/06/18 01:01:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.62 2013/06/21 12:51:35 blueness Exp $
+
+  21 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+  +files/varnish-3.0.4-fix-automake-1.13.patch, varnish-3.0.4.ebuild:
+  Fix for automake-1.13, bug #468070
 
   18 Jun 2013; Anthony G. Basile <blueness@gentoo.org> files/varnishd.confd:
   Be more explicit in varnishd.confd, bug #461624
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 37b09829a427..9efb14b2f7df 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -5,6 +5,7 @@ AUX varnish-3.0.2-automagic.patch 1653 SHA256 de03979318fbde390e56106ed77fc32451
 AUX varnish-3.0.3-automagic.patch 3809 SHA256 f5707e08120b78f092e49b4ea4428a5a9bd25386429677a6af286fb081404c14 SHA512 4d3ab3b19c49bb51a7be26d4dd1937164ea5cb86d43992aef3e4cf162bd2c90141b0d908cc7c1b9b9799fbe7a5e262fe5a86f98a677d9f71702d9be2a2431433 WHIRLPOOL c300c98d130f281d9c405e8cf02a37ef2c563f26812d2e3b24eedec7d31e1aa54ce201150899998136f4dbff063a7a8efb84bf33462b0d48d4a1bbb896e68e5d
 AUX varnish-3.0.3-pthread-uclibc.patch 1348 SHA256 3e39323ff4d741a9a0337e84eee7ce9f8b5419722a3b905f09ccf2486a9ff24f SHA512 c06cd005ba04725ec69a9b5cb138fe2487bbd0b0e0aa4c6a39314b6473b160874d0c8452fca466e4efa907a998752e65940288a65a33b88cc4f206f1180b68d8 WHIRLPOOL 467f0e6c04b7c2fd12e4f55e670f73cc2042ae2312f3d5a3dd785ff0f94e62285acb1a5aea40694ee1dad2433e32c69933b6835e05c42b34ee83e50157a343d7
 AUX varnish-3.0.4-automagic.patch 2837 SHA256 b7dbb426522349bdd7c7c825f3dd0bd116bfdf15514546d7f526cc8e006310e2 SHA512 5fd631c3e02ab7f39873acc91881e72a3cecc45d60b6d160dae3c6b6cd3d4ee5ef0b64dd8953d09761fc5f2cd30549047b8af5ddcccceea08f64af9094c92d53 WHIRLPOOL a6ce7a97df0d256fcb8459a816a13e97cade34bb6b616bf1c919f659fc07e59733d61cbc2a45de9d00db69212414a2a1993361e6e0bb8861c7f451d4587a2665
+AUX varnish-3.0.4-fix-automake-1.13.patch 586 SHA256 d4bc6d5832c8ea22026da3a892bf04cc1c7787c2e99a7f641dcda36b81082f39 SHA512 1e158c49397be49dc47ea7d442f5e7208507675ed0ce07773a4867b5cf787075dd0f45f6bc54d86bb1550a1ac28d2b151c45c155538f2090e439f66826f15ba4 WHIRLPOOL f1746a4bf02a85dabe24d0deb89de2e05bcfd470b71fca72b52912b0679d9b4dd4ff51385380a44dcf9a8e4d422ca8c195b189d84bd6cd321323152b976062d1
 AUX varnishd.confd 617 SHA256 2d84c001637cd7b063cbd75c0de7868301e00083d7bc74e737c15427828bf214 SHA512 3bbb90724114ba0ad83d630a40bec813e2369aa3f20bec11f6ad12db673bbcc27d7bc39318ab395b22a7611e214ce543302d01428276b148c18d1c9d078a959a WHIRLPOOL 40b5447223f31bd08f188eeb6bcebd7dc80e7a711bbdb99fea67900985d397e151279dd2e2e830e794f5b6510258740f933ec22342be39df4b93383324d0917e
 AUX varnishd.initd 989 SHA256 269c359025843051676972e505d0cc232cee54cbc6fed71ad72538ac2fce387f SHA512 4f0ae674354c3a682aa45b645cfdd475f7f5cad229d50234c9eebd916a046386370ec1adf210857e0e456003e93be18193653146b9950994361bb1e3c53d780c WHIRLPOOL c0621ef18e874505e96e368b8b6bb33c8dcec679af5f63dd4d621835382458224e238b49fe7f8469324d393d8655bf81cc744a2cb413da38d7a607e25015b539
 AUX varnishd.logrotate 115 SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e SHA512 8fb1cba86ede5eff28a494f6b1da1a651d66383cdeb63922104407f28903dea0c643155b6d7ac8353b8c63d480a6c5b43a70c7252bc51ee73317c33a1844c52c WHIRLPOOL 87f82d58df67980478471468e87686edf349c4dc5e91d43f0b40f7e4ebc895e7a159e6f41336cbe5bf4dcf3c9646e106138a980f5ba5b9856f9a1628f136e79a
@@ -13,23 +14,23 @@ DIST varnish-3.0.3.tar.gz 2070020 SHA256 2d37d18d952f58b208ac3a0706d4d3e4c0de304
 DIST varnish-3.0.4.tar.gz 2081361 SHA256 4e044ccb5c76222bddf89c808f13ea8f66977972675aecb48a920f6800ad0f79 SHA512 d6fa8d320050f659f341af20b24c4401609ffd77207a7889b98e5378c507db04eda310e2b953b5144d748a0b3c08884e87d5c36962f0a38f03014708ff7c78d0 WHIRLPOOL 9fa9c685ad54cc014b2369d7bc1ea67f6a9e2bcfce46c4a7d8451a6080e56d27d7d6dcc6de02ac3e986c5c4c7511a1fb33b848d68505a821b5d9116079e6a1f6
 EBUILD varnish-3.0.2-r1.ebuild 1590 SHA256 ae9f08eb8d8a0ddcc5bd806fd807efc91614b4bd69f48b9b6cbf34a90cc545c9 SHA512 efc1d3144248540a971bfee88e71587a565b1effe2ef4813d40a49415460aa1289e7868dc0c1985b92bf3098ce2ca62d9c066a5977af76ebac2a87eba76fcadf WHIRLPOOL bc70951ba5f16fbad710bf96bf8ed0b9ad904147c83272a1700a751f5584132e14532e7825f7f85dbc88a447a22a094f9039e6636d43405442a102e75b4defbb
 EBUILD varnish-3.0.3-r1.ebuild 1849 SHA256 45942cff0dfcb92f929d7d215d0d6dc914b452d61c9d17878a3772de6b03ce9b SHA512 8644fd477e73ace9b479a0b92b5a055c7146f6ee0fcbfcdc3ca31aa531e6c9535105721da0ad1f3ee490af4ea24b5cdcedde3e8192a9f56a2c0c71c2ec78f5f1 WHIRLPOOL 7534254259d54749da8ca29d551ecf08c9ada90812fb8caf943dd692a24061b067973448fc84253f724681bc6356dfe682f45a73b63f2286a2f09faf649cbc5c
-EBUILD varnish-3.0.4.ebuild 1925 SHA256 fa8aa8a00be55cca2ac19140c721de6c99c5c844b8354306a078e0e2dd643aed SHA512 c3cd90f03ab79069e83eb71281ae1ce515a4b4a9827a468bc59e75af3ee45b425bbc60a6f7cd1f72bd3a5249fa67baa912eacb1641c7f87bf07be6e4887bffb3 WHIRLPOOL c397bc803d0cb32c49f0d036c342f22d57af6e0ac0897565e35b102b7f7d461ed411da823eadf4d350406193514a24a1f7e44ba29f3ec80169612a9e2f440d6b
-MISC ChangeLog 9351 SHA256 dde9522cb8b9264bbd7b05fed981aac32979e76e2651cc473f57e189c40bdb4c SHA512 fb0ac54594c27f6b181f3e4f6391e4ac87bb8f0aecd31622f2c663096452d675e61e9add5637a0df418cca48abfdd614bb994070fb626077ec440e7f2dedcc1c WHIRLPOOL 6a48e9c7f60581a0cb42594e23acf62d865f590f081b2ea6a01ffe75581148564c1c5a29419f3d97619215d3c34e8828836796fb1742d464ef9d4fe372668e44
+EBUILD varnish-3.0.4.ebuild 1976 SHA256 a5b11c13b8e8fc3731dab13f74ae24b938ac134267269dce16549c4d7a57c8a5 SHA512 de10123bcfe27aa57f09c7a4e229385136a03e5056850743d707df116da208a5fa70d866eff5352487535f24bfa7cb74e02301b96429d59e6e953248a3291272 WHIRLPOOL 901d9b6eab31ff14b18709df6edc14ceaae2fad321d778d352e1d1c3c428cfdc79182a44a0f7bef3894d20942dd231a54465ce6c70713df77860b98a35e45c4a
+MISC ChangeLog 9514 SHA256 371a7e54bb34b25fbb5bc8f4af11ff909cd8a3746aca79715f46b80f7355cba8 SHA512 1b643de0b6deee95775d5493700e0647e2d8917c98a6fa7ed370dac6df071e4933d9c20d327033ca4432e75fffe8d3e2a0f423385d180db1be8ad00b373ff596 WHIRLPOOL 29317d1d1cbe1d3b68f26a3e84ee3d3b0ce26c1f90e89935d331e477af1933dfcdefefdc8c11548048052c902c5c20af0bbf8b27f98d205b825655b8c3316102
 MISC metadata.xml 1233 SHA256 090efc54afbb430a517196775dbee9ea43526b1155602d36fa5c6a78253a378d SHA512 df155931660201fa2e392cb10ecc150b2782520528e6534ee9ce538f9feb37c78fca9a33d0bdedc8c97831389b5d9313327b5564d7684749423da7c5856e12f6 WHIRLPOOL b2376a4917199bf8c235dd5a27567e8c7c6f23d41626e6ff873bf41ad9c4712bcec75eb64e08cad06b012020b56c1e6b52f51abb1093827d17fa35b938c9e656
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRv7GUAAoJEJOE+m71LUu62VUP/2I/28TWpO+W0J1/v4TEtOS6
-gEKAVIboPD6rArEoyCGz6e/ZmJPfO3UzOqn/mBVoZVf+9GzKgES3Dfn02d1E1i+s
-DRyey6OmbG/ZyxuLybqXmaQdPeiIuCgPByHRC6dOW6Fx6ZVVvvaJFzjHaAlp1ndI
-E9j3X9GljZISWcuft8MRSeunpcyWykCVzJrP7c4qZNRlO3beGMYX2h8IWuWl6RYU
-lu9bpxJp3iWxo9xxz+g2eBHSqa8oWk3BfGCjoClFXwduc8acv0cUmPJ4XfPceqrK
-yrGehUPIr2rO/zirDJvsifVUMuMEsVgtZ+wj1rbIqH8jxGDi/PsBpb3sOdnhBtIP
-ynXwDDTA6fkrrX9hPsRLzxF5cHvak8qh7Q4btRDkwetOj87XIWipDRwA4yyZ6BNO
-oXtJXF4uKCoFnhrn9WaWAX+VS0o3EuCMl3QnEXQlRWBUgULt49JwywBRbvDQjTfP
-IoQPuW4JeFXjnoUAoKZ5a7BqRvCaUBRDA/2V/kImVJM2BeY8hR8odgHItSK3o55k
-gzeF/kg5YyGRob4pt5BnIu29h9vCGkFWePnj01WfLhKUxlFB40aSQLC7fd5BMTYR
-iDde7x/kFIBFIVQKLaL8/2QVE6Bk/jp8yvlY8zDFgZ5/N/fJm2BJjCDPfbAo//tU
-9kcggZ2xnlQXrWaZ4G8E
-=q1lO
+iQIcBAEBCAAGBQJRxEynAAoJEJOE+m71LUu6Kv8QALZ9rVB3QrbEwvm1Rxhu8rl3
+Xd4UwADJPbObTG4Ngy4qLyUU/v2LNKkd0/y+HvQvyQkoAyeqj6SQC4rVsLGL44VR
+f1sssZXzvkHFg1xfe+LvlWBndZ3ICea6glTLm8KUmBbpIt31t4yfqcYPL7c9U+Sg
+ON34zGbcO4zO1LxezcLUj/6lk5h3M+/KT59Eu2Ayd+4c1wWfNznBdZ9bZKmqyNnM
+57H6zXeO+J9s7e4G8lU2NdqLa7Lx2zp2VhVMfaToSGih/YJd4s4HOqbft/vyv4bA
+BxjEXOdZXjRjHBczXPnmJl7b2fHHuNngWqahXVRQSj/18GkRwEgqVcJJPl7TjfOP
+YAchRWqhRw8vgRtFteol4DGoWST3jEKagtEF/2OhXZsRLHsreFnqXUTmPhvgEv9v
+axNYP8nsptSB1ntc1m3vz2c4+7MlDYG9dBfVnk1F0y0DGUAN7qxy/n90T9k6dXT3
+EUmksFqVaXemP/hVgjd+zRMYZpepns02w8TehKW0Ouy4qd5+s9tRk0Fq86Q+KU4Z
+8mZUWpaRK6xcaEoPMb+4+Lwxk/uoAOfC/ZRZm9/lNr3qJ0MXBLeivN6+Odpa9VIC
+Lmkh+TBGwNj7/iFQuQU6JHFXRPgrKrtZcba+bbdYUR9Z5Keh0T8t3r5bmtGQG1SZ
+qJS0yAmBYmXjU/PB69dZ
+=f+w1
 -----END PGP SIGNATURE-----
diff --git a/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch b/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch
new file mode 100644
index 000000000000..0034c8071393
--- /dev/null
+++ b/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch
@@ -0,0 +1,12 @@
+diff -Naur varnish-3.0.4.orig/configure.ac varnish-3.0.4/configure.ac
+--- varnish-3.0.4.orig/configure.ac	2013-06-14 04:39:32.000000000 -0400
++++ varnish-3.0.4/configure.ac	2013-06-21 08:48:32.000000000 -0400
+@@ -4,7 +4,7 @@
+ AC_REVISION([$Id: varnish-3.0.4-fix-automake-1.13.patch,v 1.1 2013/06/21 12:51:35 blueness Exp $])
+ AC_INIT([Varnish], [3.0.4], [varnish-dev@varnish-cache.org])
+ AC_CONFIG_SRCDIR(include/varnishapi.h)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ # save command line CFLAGS for use in VCC_CC (to pass through things like -m64)
+ OCFLAGS="$CFLAGS"
diff --git a/www-servers/varnish/varnish-3.0.4.ebuild b/www-servers/varnish/varnish-3.0.4.ebuild
index ae0b772736d1..51588347230d 100644
--- a/www-servers/varnish/varnish-3.0.4.ebuild
+++ b/www-servers/varnish/varnish-3.0.4.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/www-servers/varnish/varnish-3.0.4.ebuild,v 1.2 2013/06/16 13:10:09 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.4.ebuild,v 1.3 2013/06/21 12:51:35 blueness Exp $
 
 EAPI="5"
 
@@ -35,6 +35,7 @@ RESTRICT="test" #315725
 DOCS=( README doc/changes.rst )
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.4-fix-automake-1.13.patch
 	"${FILESDIR}"/${PN}-3.0.4-automagic.patch
 	"${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
 )