Fix automake-1.13, thanks F. Delente, bug 467950.

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

4 files changed, 37 insertions, 20 deletions

diff --git a/sys-power/suspend/ChangeLog b/sys-power/suspend/ChangeLog
index 24d7900eb534..ac67d285ff2b 100644
--- a/sys-power/suspend/ChangeLog
+++ b/sys-power/suspend/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/suspend
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/ChangeLog,v 1.23 2012/05/22 13:26:18 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/ChangeLog,v 1.24 2013/04/30 12:49:50 xmw Exp $
+
+  30 Apr 2013; Michael Weber <xmw@gentoo.org>
+  +files/suspend-1.0-automake-1.13.patch, suspend-1.0.ebuild:
+  Fix automake-1.13, thanks F. Delente, bug 467950.
 
   22 May 2012; Michael Weber <xmw@gentoo.org> suspend-1.0.ebuild,
   +files/suspend-1.0-bzip2.patch:
@@ -104,4 +108,3 @@
   17 Sep 2007; Alon Bar-Lev <alonbl@gentoo.org> +metadata.xml,
   +suspend-0.9_pre20070917.ebuild:
   Initial add, bug#156431
-
diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest
index f20ef76af719..a4be627703b6 100644
--- a/sys-power/suspend/Manifest
+++ b/sys-power/suspend/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX suspend-1.0-bzip2.patch 971 RMD160 36a6e037b6a7bd6ccbca6725217003f26bda7319 SHA1 572a77ab74a2591426bf95a73a37b6eae15ee116 SHA256 1c04b63719043c4d8c962a87bf6b8f33f1c2a2df7302c2c0afd5e9135ec8ca3e
-AUX suspend-1.0-errno.patch 240 RMD160 2ed4a26fad8b21fd88ed9710b0d70eacc259c673 SHA1 f902e7f8394596d19c9858044fd05b42a7366767 SHA256 88eae010830c90b4fe6f115c3d638df5751f0ffa1cab4342aa33031fe14e9c03
-AUX suspend-overflow-gentoo.patch 1546 RMD160 998a9d59da92cac7410351c8f672e14e8317dfb6 SHA1 ad10780af2a772be738182f07139d57a8f4487b7 SHA256 7ca6a2c59947978cb55c2f6de115b38bed07b729c8dcfb9c191e1a43102846d9
-DIST suspend-0.8.tar.gz 414135 RMD160 cd481fdb5206c824bf8138be0061bf98c0410f76 SHA1 acc9fb8f85d35f3e12c8406be1e958fc67ece01c SHA256 a5ee1dcfeb05e9c2a63583d7518065d42dc83264144359a2456fd8b9c71e63ee
-DIST suspend-utils-1.0.tar.bz2 408451 RMD160 2eee4a2a3e987763663f98522ed142d9d1e58226 SHA1 49ac219b54780265c31e8263d00e2b7b525d0736 SHA256 0206ba6332860b6da57acc79cc0f8604150ef0835ff9633fd42d59d181a6c85d
-EBUILD suspend-0.8-r1.ebuild 1285 RMD160 94f29c2bc4ffdb35e44acf5e24ef5781a2a93518 SHA1 b0f0724f6a47ec61ad0ade8c766665e64e35ce01 SHA256 2e1a98cddac6a6580dedea5199b2ac814552fe5fb28f668e32e848f909680e42
-EBUILD suspend-1.0.ebuild 1387 RMD160 e8fdb6ab5ca554ac61a53959e67047ba72a59c2e SHA1 c0f1f803ebd87bb8d8d3b516e28204233f8abc7b SHA256 9f88b21abb6000576c068f59508a86bbf826b2a172d8e3fb844057701e95f192
-MISC ChangeLog 3943 RMD160 193a366c33875a4f1e3f935edff7103f4c5099d3 SHA1 fcbe7004496e9349cd2ff38fcdd43fef6201b73f SHA256 c43e0b4d368a904527d59cd242dc4a72a5855a74c0b0db915c8704ac3e54ba68
-MISC metadata.xml 384 RMD160 1a2eb73dd0938e4bd483e7860e01182129be4557 SHA1 8f597f3d3db39f768af9c662bf18e6624354bdd4 SHA256 7498683da95c7412252f6c9f503984a2ae6f170bb110913e79cb32ccf86dac91
+AUX suspend-1.0-automake-1.13.patch 310 SHA256 a9527d4d0b44ad7dc663f4aeeded3db1d1265a8fec8fc8b253ff3a2460eee207 SHA512 e03629c2f8ae7e1d6c031cf4e8fd18f303621b57e0266734c21cf9846434b17cefbd80a83e0d8b945780dd3bc19d3d776f9c33d222ab3f07a9846306343fc16c WHIRLPOOL bd793135e601edcccb313e2a1e3c010baeaea8bccd2f7bb7f2f4ee373e806ba45521a06575d925cc536945d8f67ed337ecb6f8e985920efcbc1ed76373b2a8f8
+AUX suspend-1.0-bzip2.patch 971 SHA256 1c04b63719043c4d8c962a87bf6b8f33f1c2a2df7302c2c0afd5e9135ec8ca3e SHA512 9b79a497b0a57eda7f03f8a952293a20fbb16fcefcb11aaabea5a68a77421dec56929022f694ed90b4c97d4f2d3a8b390fe6ccf54378c6e152696109e2394d00 WHIRLPOOL e9060fee64c59851d516fb26d1b3e936f87cfc89c059ace05a814e13ff7bd0f3972b53c011e0834492b3357ebf235994190a4c9167fb1a942759dcc76d1410b4
+AUX suspend-1.0-errno.patch 240 SHA256 88eae010830c90b4fe6f115c3d638df5751f0ffa1cab4342aa33031fe14e9c03 SHA512 8bfcf94cc63e108de81e1838f9f5e833ecf17ef08c4dd0cc6e30163d547609f761104b48c1aa4a776cec181e54438d771b6f2135d56d4c05b387a027168192bd WHIRLPOOL 524cf627ec1f726e3339f206d6b9a8c442fcd4d79d6535a4b87172e9b7a09af3bc8e6ad4689bc2d443e18d6a73dd7db742f79cf7960237a65400f46468695cbc
+AUX suspend-overflow-gentoo.patch 1546 SHA256 7ca6a2c59947978cb55c2f6de115b38bed07b729c8dcfb9c191e1a43102846d9 SHA512 7f5754469affb2b84125310a3d17205373c2c0db8c58a266687e6d4ceb8468cf9a10ee2d3a7f06fbbd781c5b366dc03a426e81568ff7fa5503ba9268eeee02ad WHIRLPOOL 9096b26ffafa4adfbbf8bb70aaa0804a0d5a9515a561f92bca67db3a16b02a9142ff2823623451f4d06250ff5680c8649596bd560f5b9b102177fb3521f9acd7
+DIST suspend-0.8.tar.gz 414135 SHA256 a5ee1dcfeb05e9c2a63583d7518065d42dc83264144359a2456fd8b9c71e63ee
+DIST suspend-utils-1.0.tar.bz2 408451 SHA256 0206ba6332860b6da57acc79cc0f8604150ef0835ff9633fd42d59d181a6c85d SHA512 481f7ab6e6d43b963cf7abf4d16a9911035dbce13d96e11eeadd50bbd2b9671c597eab0e3060536dcb0d6d848e30ac0e7ff534275fc2d66d2064b75066a4adb8 WHIRLPOOL 4321dcaeda4b5b7d822a1cade82b88094d8706d0daaa06b72d3c053a4bac14ed85b55a4681e0a52f116a63e3b8f4255c57e55fb43961f77149faf1b8aa918d58
+EBUILD suspend-0.8-r1.ebuild 1285 SHA256 2e1a98cddac6a6580dedea5199b2ac814552fe5fb28f668e32e848f909680e42 SHA512 b776f4db2db0c329f0dbf259927cb4a16488335dcf099a4802a7886235a3c87cc55f8c42ae0d9058148276479e8acc40e95307fc5c4b0d7ac8113d8d8dfaa991 WHIRLPOOL a0c17e386862a9942f33ce110a209284040562b89434eebecef7522bc91e04d8515d1eb0c26402dcfe9c02ce6d9c50ca4a3ee7a02407b9fd798adb53a61fb2dc
+EBUILD suspend-1.0.ebuild 1430 SHA256 e798cb2e8973749418004adb897aab95d192c88bd5be344f3f3f4320576e5967 SHA512 977b14cc5a219a00ba12879fd326d8f6712691328e43dc171bf716b6c958d3c8abb7c8bffd20f13a7f8c8a6a7a6de97b3caee69bfa6de9684dbc4c103951049c WHIRLPOOL eff5389d72432e269d5a552e2fe5d97352e5ca22c724f78609f5cd7f5a358f137aae9a814ae47d2533b67a4e6910024c967a3fc93dad7887ac1e27b384bfd14f
+MISC ChangeLog 4103 SHA256 f261805bc35c17dbe3ad6fbbe7b7e4433d4d6ab5327e093c16152570a61f5479 SHA512 497929912ed2f53ffcd5fc2f197fb327901e88813c8673b6e685baab2f1ee436e2f5257f23bbc90229f2040e475a7b0e98caba527566576741bb401bba5cc25a WHIRLPOOL e9fb76dd9ae04d3d6a46015ba49757a6ccc056617a1ab4782bff29ad94473d0e1c772abbbd1d8c422415efb4c9fe9a5bc62596de31a568e0b3c61099711af677
+MISC metadata.xml 384 SHA256 7498683da95c7412252f6c9f503984a2ae6f170bb110913e79cb32ccf86dac91 SHA512 e8a010c977479557490afa8eb0618028a68d6371a258f850f3a6fe7c907d3df01ae85eb82e55ec28ee9b8f135d3320d48f4e3e095286291a6fb5692c144109a2 WHIRLPOOL 42c5fb39ad46ad62285bcaafd7cb14fa1bfc357fa9568db9cdab19ce06b8d1b72fee07cbc3f30f02cd76a1101f0c6713dc8ad0cb510f14a6e3ada2412cf6448e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF0EAREIAAYFAk+7k/AACgkQknrdDGLu8JD3GQD/e4v43pEytcC6Uw09JWGG30y/
-oh8LK4dfktSaVn0DE2cA+IezNg54/zbHvm+a/DcZwZk7J9uCwB12+rJ1iUXbVgs=
-=hELR
+iF4EAREIAAYFAlF/vfAACgkQknrdDGLu8JA7XwD8DbjTrM5P7qEK2d+GZSV6lXEl
+KZvU/7XLCwR+2FqscSQA/RXD2bYzPXRUYTwKyUUS/8QzhUzhFKKQtYEJIsPcbgKq
+=IoSG
 -----END PGP SIGNATURE-----
diff --git a/sys-power/suspend/files/suspend-1.0-automake-1.13.patch b/sys-power/suspend/files/suspend-1.0-automake-1.13.patch
new file mode 100644
index 000000000000..8aacea520b32
--- /dev/null
+++ b/sys-power/suspend/files/suspend-1.0-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- suspend-utils-1.0/configure.ac
++++ suspend-utils-1.0/configure.ac
+@@ -9,7 +9,7 @@
+ AC_PREREQ([2.59])
+ AC_INIT([suspend-utils], [1.0])
+ AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_SRCDIR([suspend.c])
+ 
+ AC_CANONICAL_HOST
diff --git a/sys-power/suspend/suspend-1.0.ebuild b/sys-power/suspend/suspend-1.0.ebuild
index 86f90f967746..96846e5cbb87 100644
--- a/sys-power/suspend/suspend-1.0.ebuild
+++ b/sys-power/suspend/suspend-1.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/sys-power/suspend/suspend-1.0.ebuild,v 1.4 2012/05/22 13:26:18 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/suspend-1.0.ebuild,v 1.5 2013/04/30 12:49:50 xmw Exp $
 
 EAPI=4
 
@@ -33,8 +33,10 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${P/-/-utils-}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-errno.patch
-	epatch "${FILESDIR}"/${P}-bzip2.patch
+	epatch \
+		"${FILESDIR}"/${P}-errno.patch \
+		"${FILESDIR}"/${P}-bzip2.patch \
+		"${FILESDIR}"/${P}-automake-1.13.patch
 	eautoreconf
 }