Fix patch for 0.8.8f by Tomasz Chilinski (bug #555964).

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

4 files changed, 24 insertions, 8 deletions

diff --git a/net-analyzer/cacti-spine/ChangeLog b/net-analyzer/cacti-spine/ChangeLog
index 5d591844b736..6a4ef6c34c9e 100644
--- a/net-analyzer/cacti-spine/ChangeLog
+++ b/net-analyzer/cacti-spine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/cacti-spine
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.51 2015/07/25 08:28:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.52 2015/07/27 04:07:59 jer Exp $
+
+  27 Jul 2015; Jeroen Roovers <jer@gentoo.org> cacti-spine-0.8.8f.ebuild,
+  +files/cacti-spine-0.8.8f-fix-ac-macro.patch:
+  Fix patch for 0.8.8f by Tomasz Chilinski (bug #555964).
 
 *cacti-spine-0.8.8f (25 Jul 2015)
 
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index b0b6310212bf..8111cc910dd5 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -6,16 +6,17 @@ AUX cacti-spine-0.8.8d-ping.patch 235 SHA256 be4b619c9a476759cd06f243641d6043a25
 AUX cacti-spine-0.8.8d-snmp_spine_close.patch 511 SHA256 47edea95aaa7d6018ae0f64aeb894b42607cccdfe062495afad1b358afcc76d1 SHA512 13e885421658e28ffe94530f0feccfa24020d1a2cef4115ab2d4390fcf557cd5224f89395ddeb24797d9556c4cd8a55a90c8ddf65341eeb642569498478c0ea9 WHIRLPOOL 5fc6cd5503b0b27f2a1d6d957740e5a93ae9cba33bddbaae85e236f3d3749bc3159313149064cab928878797455bd118653e395cd62fd1b54dd7cba0c1bc155c
 AUX cacti-spine-0.8.8e-fix-ac-macro.patch 217 SHA256 1465202e4fb7cb68863da4bd93c9df39b1199d97a39481f3b7a7ef31cf2e010a SHA512 caed6d2fa5f02cc769462cc2b7c0d5918e1912cc4962c4958dcee03c58270afb9ad8aa74204a498b305bbbea9870c0c5e337265a9230d47aa3b9a9424935d0a6 WHIRLPOOL b45d4e0864aebccdc4c4457f4b86f6f4dcb76d66742455262c645b07a36881ede204dcdc2dd271221f6f0764180ae8dac274e0fc49bbd58e8fed3650bff0aea2
 AUX cacti-spine-0.8.8e-net-snmp.patch 572 SHA256 7ed0d70a33e5932c2e0e4ca91cd813e7fc345cdd88d01c82a53fe4490881b6d3 SHA512 c2cd85aae8ec925837f6aeb4b1e29b3b0a9c62aee53554c69a2caf6d964b27897c9dff0aaebfcdd68e64fed3a93315318943636a289e016f34c50b5248843f98 WHIRLPOOL ee593c1c73ac191242902a3e893085f1b8ffc24e4acf23c1c0f3316c24eb03e799ba8249a1b6e1f866ecf3ada0c8e04daf445e211aadaab18cfa6bbffe670ad2
+AUX cacti-spine-0.8.8f-fix-ac-macro.patch 217 SHA256 79c283d99c6bfe7528fdf6e6fd830a75e21abd991b3ea0b44471f7d368927e0a SHA512 6680aebe945af984380f7bc42a40c7520f94d659a595b249db9f3d3d340e9883b142f5f0f53b790fd68cde99aaeea9cdeed3a5d0f0e976e4aae67ff7d2405d65 WHIRLPOOL 403ff98e5a1389ccef92e045df7c249e5f2e5218a2f3af6be8fd9ba73f80273b80f8af498f93e7e02ffe81955460247fbc3f7926a2efb3ae1b75ab3c01db6fb2
 DIST cacti-spine-0.8.8e.tar.gz 757042 SHA256 e014488acffd4dd3a88306c3809e93a89c8538a050c2a58a9666e4c04c004b92 SHA512 165e93d4cce3378e911aec41fcd68fb541d82d849ebf3e2e28e0ddb65027ff2eb77d488acbaa133244091cd02adb58d8f74ea5abc36abed07af9ea72bc104f40 WHIRLPOOL 59442f54fbb8956a945404f374eba848bc21b60d53dacb025132a91dc077115aa65ee30959ba81fb521beb9732c1c5944adb1c555a36ad6ea72898172404970c
 DIST cacti-spine-0.8.8f.tar.gz 757078 SHA256 d0599239187f2f5a29f82b809e6941447f18bb7b170cd42e67455633b195e3c7 SHA512 8c5e1713bb1d41227cef6047e5348ef33b90b5591976cf24390abbf1e5c68de6714f785d9517ca9aed21b42b6b8772512af176b9f62bf18d6d74d949a6359a22 WHIRLPOOL 70545057f80d5cc5940059179bc3b72eabf48ff61c5eed5b0b344e995eb1411e3a89359e8c0b6bc3850b029233597d581ece59a99c6653ac7cfd028ef2e24232
 EBUILD cacti-spine-0.8.8e.ebuild 1131 SHA256 7a69624fc90684e97026bfff3eba872d4c9e541e03fdc4ee5809e36b1414d561 SHA512 915f10da5d55faa2ae91c741bd00f02e08f79027d400777f5b73f5ba5889ea4ed4f79f72c90c403864c5753593ab69f24eedc471b37f8221bcb8f5c0b7ba22a7 WHIRLPOOL 661e68605ce0740e29d00db7c6479689b7b75137ac6d59151a63d89ddb7f3047d684174bba463301df30d526221421d925cd0021cac8f5764e0e0ffc9c1334dc
-EBUILD cacti-spine-0.8.8f.ebuild 1135 SHA256 07c04acfc5e9b67232cf695affa72337d57d7d450efe3c0fc91f356c9505d8ba SHA512 52facaef6ee9b3733382ae2d1ee3532e52f5977f7935de235cf556ada180c18c262af1b2c8e0b9ec4f747dd4eed3f159c594e8937a7bbecc27f90235d5ee1564 WHIRLPOOL f1213aec06b85a66e24fd26d465c988f4e0358b38221a05a971606d66a5638e49cddef2eee614638fa71554e6661da3e9597d960ce1ae4d87337b0f105af981c
-MISC ChangeLog 7471 SHA256 09a53039c952b23473382b6efe329be716a4cce6c5aedddbdcfbc7c7021c58a0 SHA512 6c0b1cab5c5fd06d3188baf26ace092575c91e4d8edfbe23e3b208454caa54455fcad8ec331310fe99629f83645ac169bf11675c468e81805373db95c91dfd14 WHIRLPOOL 8cc680e5734f0239d44f70f10c6c88b659abc9ea9554bce32fa8cdedbaf8ca735c9448224a1f9dd9c2cef40566091b68bb46735643243684ac85fea4812de9b4
+EBUILD cacti-spine-0.8.8f.ebuild 1135 SHA256 ced2fcb9618117840d0209afe659092c034ce2b539120a89e644acc645da51eb SHA512 3396cac307ee1a42d1c30646a004a7e49d9ade8c366bd8e1e97635b43b91220ce681201cf186a90412318e259f361eabe5bb5f8d615e2f07b8a9fccf4804ebfb WHIRLPOOL 7a2a361b75b975d2c735463e735cfed8aed28cb20f9aad97d51ed6c6f42ec17a0acf50215616d76195896bb7e58777bea453b7b9fcd3eea931a1589eefd5fc65
+MISC ChangeLog 7652 SHA256 c66b026913004af1b3c3f9222527b2b6256a198df5a1846ce70562c33e08c837 SHA512 4867bbe6054bb287d4b6142b1a03f5709eab730764f40ad56e434edaa6c45f83e817d1118042a4fa6b28b881481f4b8911dbcb35aad0414459d9e0d82c2e888c WHIRLPOOL 3a0530ff8febf7c22f78a7e3a9e2cd98268bbfaadf218acafe223c1e2f10b15266c6a5a8ae3539b0f8460934a8569a222c9fce53adbefd55006941dda3e98306
 MISC metadata.xml 609 SHA256 6ce745a690546641ddd769949d48fb9b30124f542b7efcd2ab6b4faea0064410 SHA512 9e949dde99ebbc17b1ba2e877e5cbffa4fae0f192d84cdce62992ee9065d4c91e20b4c173bc3a51e4c42695728bca0805c7835f10956f544a8b1a2695ee9e329 WHIRLPOOL 4eb83a74fc24080746118a5f319eeeea6bf5e2f9cfdb4ffacf2f3f485cec953c46f166f216cbd6e234559bcd9e5f9c8b0f0a28d5a80aeb9726b4eb678439cc38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWzSJ4ACgkQVWmRsqeSphPCLgCfbeguM1Ss+tthZODyAlpGnukL
-QgQAoIBdlJ5JYCI4SL4ic3A8faTlIRhd
-=Zdpi
+iEYEAREIAAYFAlW1rqEACgkQVWmRsqeSphP9lACfbBgk/X7UX3kTgvBUhpZAMO0f
+yzsAn1oXsqCs2VFaygnwCuRM9cr2fv8E
+=4hq/
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild
index e3ef02a2064c..1749b8257634 100644
--- a/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild,v 1.1 2015/07/25 08:28:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild,v 1.2 2015/07/27 04:07:59 jer Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -27,7 +27,7 @@ RDEPEND="
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-0.8.8e-fix-ac-macro.patch \
+		"${FILESDIR}"/${PN}-0.8.8f-fix-ac-macro.patch \
 		"${FILESDIR}"/${PN}-0.8.8e-net-snmp.patch \
 		"${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
 		"${FILESDIR}"/${PN}-0.8.8d-ping.patch \
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8f-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8f-fix-ac-macro.patch
new file mode 100644
index 000000000000..a879d5e0bf96
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8f-fix-ac-macro.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,7 +10,7 @@
+ AC_LANG(C)
+ 
+ AM_INIT_AUTOMAKE(spine, 0.8.8f)
+-AM_CONFIG_HEADER(config/config.h)
++AC_CONFIG_HEADERS(config/config.h)
+ 
+ # static libraries
+ AC_ARG_WITH(static,