fix build with automake-1.13

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 38 insertions, 7 deletions

diff --git a/x11-misc/wbar/ChangeLog b/x11-misc/wbar/ChangeLog
index 4431cc6dc059..45e7e17498a3 100644
--- a/x11-misc/wbar/ChangeLog
+++ b/x11-misc/wbar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/wbar
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.29 2012/11/21 10:15:34 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.30 2013/04/27 14:44:21 hasufell Exp $
+
+  27 Apr 2013; Julian Ospald <hasufell@gentoo.org> wbar-2.3.4-r1.ebuild,
+  +files/wbar-2.3.4-automake-1.13.patch:
+  fix build with automake-1.13
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> wbar-2.3.4-r1.ebuild:
   Stable for x86, wrt bug #439780
diff --git a/x11-misc/wbar/Manifest b/x11-misc/wbar/Manifest
index 468b0e1f593a..c985d46fb54c 100644
--- a/x11-misc/wbar/Manifest
+++ b/x11-misc/wbar/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX wbar-1.3.3-Makefile.patch 1508 SHA256 58ca7d843ed96a0fccfb49af0a9f052f3182eadad6383ff9315dfa96d4aeaf1d SHA512 212784d14800e5d5ae312800d524e221019840eb7c99c6ac58e0923f22f183d102230e5f52c5f1b5f29b3886c77a9baadca27a00f9b707a53951078df05baf06 WHIRLPOOL 6cf7c416ddd97124b3be1d13fb03654ab9e4747cdd9b78fa103b044c31705e169b522ba190ee5f6895ba49d7ff01920f31e2a976ec13713494c4fa20b16e48fb
 AUX wbar-1.3.3-gcc43.patch 615 SHA256 5ad3425e4ba870166f1b410499b912daa1e0120e0a88fbd6f5a7f23f96c5d5cf SHA512 5de45076c56153e667c7ee408402349191324fe587b048ea27d8cae36034ba0d77be0d88b9e928be9d380564daa2a49e4e85ca3506f0b0ea6a5d8039075e23c1 WHIRLPOOL 7463abee472ad35307f08f431d4066ea32f73379610d6382ace07ce769a29ed2c7f650e4897c4849dcadfe482c6321a1ce47f61382a2562c79ec97d66f6ae912
 AUX wbar-2.3.0-cfg.patch 350 SHA256 679edc4a4ff5070f84a1ec44b966a70f1835041b6d5256142c6695f4b5de332e SHA512 b8dd48b08c3e91065abc8d3cac1c6c951217a37cb9a4243bfe56ac01985d8d0fa004f27b142ffedf3c908ca42b6d94a050c41dbfe1c322b98bd9da856b4d771e WHIRLPOOL f765fb0fe9380a65dd760875f034c6a608542c44d4a7544dbe790a86d7bbae23c5fdc5affc5b46ea552122335c00db2321f924d8e72e887e7f98ad7af9f84f97
@@ -8,6 +11,7 @@ AUX wbar-2.3.3-cfg.patch 287 SHA256 270f799815a2f91b33ca267bbe1a3c8fe8070ee8b163
 AUX wbar-2.3.3-desktopfile.patch 2416 SHA256 5d1f1eccca5c85b815ea07ae470e81ed2dfb88db287bb3fe84f137b9742b1b85 SHA512 12a1ffc38196fe6bfe32320e42781f1db1ef742cc58474d784033fb9678da91bf00e0c7efbcfe9acedef511c51ca70a2be5746ba7824a652e4b68f731dadde03 WHIRLPOOL 70fb582069cf5c415e167c13271edf0d5e5728c998afbd39e9e129d9703d0e108caa724f6e1c3783d266404fee7011e34a4c76758ea34505b1a62b234c57900c
 AUX wbar-2.3.3-nowerror.patch 278 SHA256 cebe7738a85c4471cf82d12696482196fdcab020855dd3cbb1bc8c4619a809ac SHA512 613a80918b5bc650f28c5a3e5b8e83aa9cf5ad209f8556f8b290620cf57428eccb7147af3bc189045b372d6ccb1faeead857b9fbe39b951212a379604ee24364 WHIRLPOOL 6972ad2d8b35209f33a4d5cbd9260c75217a0e6c909b30879fd6c217214056f1ee68b7278c39fdc404e7383f7d20ee1858c3059a5b5ad9bb3c24553cade6f5bf
 AUX wbar-2.3.3-test.patch 243 SHA256 ebd6e53bbf1abb45691a0112d56a36978b34a6e04ed8b67615bbe0e1f509e488 SHA512 9ca4116095e1f5a037ff810feb54ddb9bad769e9e19cc45936586b7fbacd2f48dfcb12b1d5423e6bd5fa4b6db801cf8e6296e6c833b946b9581c3bd069e2a8db WHIRLPOOL 301d6d393d98570a53a3d971601db70659b337473ce3cc1bce81564917ded48154d327f527106c478b3fdc5ec13f84d135074f6bfa943e79692f6cb954b765ad
+AUX wbar-2.3.4-automake-1.13.patch 256 SHA256 e2d974e837a4b19d251849e5a359950335735db90e19ed51b2dc47127773972d SHA512 8f8cf62cd364e0ce211ca4820e1cf1f011cd1530f65b04d37236e8e65564e59e4a9ed0e741d4cd71f66307bf6416f1f91eaee0188b825d894a5cecd25ffe5444 WHIRLPOOL 68a9959893b3b159a81989c451e1f851cb459268f3c42a30223ef89c6cf965fa8891172e8da301a9a16c456060ad96d1fe0e25000791c5284c9f4f31a58520d6
 DIST wbar-1.3.3.tbz2 429098 SHA256 431c5f7a8b6b065e2fe32a6482476a5ecefdf838aee550cae381ba64cb79eb4b
 DIST wbar-2.2.2.tar.gz 369592 SHA256 0d7ae78d02d52cdb046a47286341ad6ff42dd9aff667f7d389b4f352046d4db0
 DIST wbar-2.3.1.orig.tgz 70646 SHA256 da227e4bc0c37ba34be73080dbd49f4687eb088927518c27178e9c188b676b8d SHA512 ba808e593f4812447289b1dbba3ddeb9fc663be83294897c4363a982a241d6a0b5b2b08f40218fa91edb2c154147728fe2e3c295822280907b75b6748042d539 WHIRLPOOL 7a18b45c482e3c33f4f91382190d99d2bd55f6f06b44ddb8673393df13ffc4c753ee26a94132987d6b7ff7b7f3bf531353d28518884b5d6200123c1e57fa65bc
@@ -19,6 +23,17 @@ EBUILD wbar-2.2.2.ebuild 1029 SHA256 d14ab007228fcd684da6e97a50e4585521e075fa1da
 EBUILD wbar-2.3.0.ebuild 862 SHA256 0a65a21aa8dad5269cacf34e0de71f975350f5d5723c3cbcf1883da97dc2023a SHA512 c1d6fb8b1bf8e819256de6c2018198ddf78cd518a6a3319f6271c690d67c3a4df381bc0e7b79c42b52fc288c9f4417854032541e5d2c4d236ec712495f7e1c56 WHIRLPOOL 3bde3450758ff09f9430a56cba2d20424b0e79aa4bba8811645401e8ebe1f96c0e49c523a845abb3bfaaf269cbefe6d6d8d50aa4a02414ae36dcfb46fec00232
 EBUILD wbar-2.3.1.ebuild 910 SHA256 d6ff132f33434c91a8737a5d96108ba8f2a31ebb992764fcda4a9860da4dc646 SHA512 bf343dafea1a510b056769ebcb7a39a9a7f392f1119bba542465b975752fa3a0fe3effb17bcc410ef4b0920545ea883886f11fcf4a9a2a4ca1f4db739f09b295 WHIRLPOOL 2243003bead437f4e3d1b4159630da2972aac7fdf7777a2688847fa5d905c3d6682e24d2ec6ec885c84b7ed11ba0a897a9e0c90e40750d001b423e35f846a602
 EBUILD wbar-2.3.3.ebuild 895 SHA256 1b0d4fa6bc6d32647dec933e48b0db82e4875c2d068ef1eda28e6352503717d3 SHA512 56a5abe1a15906c87bbe50788688954ce5d505c4968205568f0fd919509a3affeb429c3d3c194f98e629aa40fe62be80c309e81264bb91a99c8e849c0bb93980 WHIRLPOOL 85ab22d7325fb774d29437ad5488fea0699f0e1dead64eab750d13228e916db79beb471e4af44eb547823cb278f2c3d9cc9b23c4b9f18343ee5730149fd8e91f
-EBUILD wbar-2.3.4-r1.ebuild 1219 SHA256 d519117224e528ca5bfa030267b4ac5f75b7c8abec831a88f13704d61858c0e0 SHA512 c7d20eab13ad458c20298bb02f003b736c2251c5b180e90bbcd6f458ceddaf8a1a6265c5c0c3a179e9feef6660b96a0d102354e23ad73d01d3585c2200452f0b WHIRLPOOL b27fbba9ec0adf9ad8c5c11e154948936b036ca025ea55e5bd423649b37b2c7339d66449614ec6fdb2d11b11603a9d39b58a1c947d41c97b482479be8a96083a
-MISC ChangeLog 4726 SHA256 5bacb32237ee730ce3731cb2b7ca3bc73a4cc02ec1882e5b0561f083ac0f4462 SHA512 32a4aad9437be852f50c7527b6c1726c5148111aa90944625361d5394203e0ba0f4ac3b5c9dd6f7b961ac195373f3b6a250fa6a94da70c261b8b794f26baddd0 WHIRLPOOL fe18f91417d438baa3b7729c62a5142b271d8e9e234c19d293a4161ad9809deff2066a0cdea8af44ba2fec007a07429bad6c4c55cd38e0a02bd848b216e12a03
+EBUILD wbar-2.3.4-r1.ebuild 1267 SHA256 6f102126ee4d8a99068ba1cce4bb44c0373802f3b744ce0ce3be43b8b0c57bbe SHA512 5f6d2d0c79da4004352fcbeb1efb81e517bf974af40803f59bf8cc9848b76546d1a66da7d2aed709a5ac15a16ac0de0d764ed5cf2cf814c26105f758edf8f7ae WHIRLPOOL 640ab62592063445373873cedba1b514df0dbc4933a135c5da24ae05b7ca4d1a40ffb032d46d02aa2489cd86a8ac2548f146b5daa7fc004166177eda006f534e
+MISC ChangeLog 4877 SHA256 504c69ea6413a2e86c1092d9ae7eb9b74ee2c74f7d1b41f3dac34e159dcdde99 SHA512 8a178701fefecf6f64c1e84e4f3b151d6fbca9917cdbfd114ae1aa27c24e095d10e434e089fa8a704a2acc510fbcfa018cb5147454f6ca0c3d08aecb15c7a6e9 WHIRLPOOL 3475daddaeae8785638d5f46cbcb047884f4dc95b9a4bb58dd1fa51ce7e6716bb05d5b3bd54986b388cb40c2d59c311901b1dc06d48da3b777a5a9842b01ae1f
 MISC metadata.xml 414 SHA256 76488e3434ec332ff752665dba1bc307f7f6173de12b3018be80dfa2045c7334 SHA512 8226e176da44146e35315530fa95bd5c5c7e989cd836ecf21c08729a036290b5c1ff9bd40288e3b13744c8e28e94163c118cd4b3245b9ecc8a802e9ae114b91f WHIRLPOOL ad96e6bcb89e9c429515698281f2f52801002ce2fee3c0bf5cd8a98539c91b85d518f82d1bcac5ba0bb36f5a41b570349c82167eb14edbfb52281aadc032e136
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRe+RGAAoJEFpvPKfnPDWzhSQH/3dIRpnLbifbnXCzd5d7azwg
+7ONNjC2uuRxVqV/Gdkqn6ZtURdRLIgP6Sttg5MkyVBFBtiMkey0ioRfHBDI7pT/W
+ygTEtuNf6a1roTINcR6atEboBIUO1bOOa2Fx9G5bRY7ds1WwXp7GfO3kWg28k1uX
+FzBGJXXpRd39c/spz438SI7MEO8Ap+B4usDv1UI2ANRhBrGwQL0blkQxnG7CNLbo
+y+2YnwvADzBopcEHw/EhMJ8EHOYcNStmYzdRIzPbh4Eb+Ob/IsfS0Recr85QssbX
+TtEYJxrGInR3YdsszOfMtVOduZNvdm7XPh0xVCWhfMsz453gFPS+mTo8GVfRiXc=
+=xYbP
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch b/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch
new file mode 100644
index 000000000000..ef3ee648a7e7
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- wbar-2.3.4/configure.ac
++++ wbar-2.3.4/configure.ac
+@@ -3,7 +3,7 @@
+ AC_INIT([wbar], [2.3.4])
+ AM_INIT_AUTOMAKE([ filename-length-max=256 tar-ustar ])
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+ AC_PROG_CXX
diff --git a/x11-misc/wbar/wbar-2.3.4-r1.ebuild b/x11-misc/wbar/wbar-2.3.4-r1.ebuild
index e56e752a49b0..5003cf1eae1a 100644
--- a/x11-misc/wbar/wbar-2.3.4-r1.ebuild
+++ b/x11-misc/wbar/wbar-2.3.4-r1.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/x11-misc/wbar/wbar-2.3.4-r1.ebuild,v 1.3 2012/11/21 10:15:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.3.4-r1.ebuild,v 1.4 2013/04/27 14:44:21 hasufell Exp $
 
 EAPI=4
 
@@ -29,7 +29,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch
-	epatch "${FILESDIR}"/${PN}-2.3.3-{desktopfile,nowerror,test}.patch
+	epatch "${FILESDIR}"/${PN}-2.3.3-{desktopfile,nowerror,test}.patch \
+		"${FILESDIR}"/${P}-automake-1.13.patch
 
 	sed -i \
 		-e '/bashcompletiondir/s#=.*$#= /usr/share/bash-completion#' \