Fix building with newer automake #467326 by Mauro Crociara.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 32 insertions, 10 deletions

diff --git a/net-libs/libqmi/ChangeLog b/net-libs/libqmi/ChangeLog
index e81352069e6f..a0834d4820f6 100644
--- a/net-libs/libqmi/ChangeLog
+++ b/net-libs/libqmi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libqmi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/ChangeLog,v 1.4 2013/01/29 00:50:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/ChangeLog,v 1.5 2013/04/27 21:06:57 vapier Exp $
+
+  27 Apr 2013; Mike Frysinger <vapier@gentoo.org> libqmi-1.0.0.ebuild,
+  libqmi-9999.ebuild:
+  Fix building with newer automake #467326 by Mauro Crociara.
 
   29 Jan 2013; Zac Medico <zmedico@gentoo.org> Manifest:
   Update Manifest with digests for a snapshot which I've manually uploaded to
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index df2908ec6684..247bf5a9ee3b 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -2,14 +2,24 @@
 Hash: SHA256
 
 DIST libqmi-1.0.0.tar.gz 2398450 SHA256 aea6b4c027bc24bdf5a624b50be8413c796c266c1e134425a8e783fb7b5ff419 SHA512 7d1a057fadd65e16e623670cc1a6292c9dc2e22630d329e820320c70acbabba519280bd76a954a5308d395cae23893ba5700b213e397457a8b7410ec6b8fc157 WHIRLPOOL 95a3341068d852f3754ba8c8bfa139a03de38e9a0ad861c84124e3cf55740576a66f8c9a1b33dac8d7c8b3f4924ac3be5a26ccf95d876c79c431949dcb19e2c3
-EBUILD libqmi-1.0.0.ebuild 968 SHA256 e57e7b7ea05eee7713574eeafec825396884ec04c59b104c8e4f64a833dc9a89 SHA512 67b31337ae8ce73cab6633c38fcb9b7d0a926b725236a6534cdafec4c24051b2e239379555c4aa3863ec019f59ffbe77164d505bceb3eca9215686dae712563b WHIRLPOOL 1c99ee719f52a49477b51f8c152e291be16d918a947d72ad86f7586de4fa19d061af8955b038d5d962252a982e7a9c3a64b4185b37b73adec797ca45b01dac28
-EBUILD libqmi-9999.ebuild 967 SHA256 955b9a41a2ae3e18f4e75aec3a07ab109bbe8102787bc3dbe5140d9a5ee2c00b SHA512 78ee4ab0353b53954532abd93c9d516959b6203c4f089698dc083423b901ed78957ac306a852e0a20e801a1686e4de22548ae85367ea4590afaf8b7f9ca1e4ee WHIRLPOOL e182dd51febbdb6c03355e9c216ae9753f2721ef6a3cb07c5db51a72438c4ae18f284e3a452af853e6e41ae87815c899f405d30d5d8cd68540adf5c17dad531f
-MISC ChangeLog 782 SHA256 cdc49ca0d3ada6fa7c6a0c57248b9ecddfc764f57a143560d8b876eaeef57906 SHA512 6aed94caaf05b5890ef4485262590312b73b635e2cf7238f58c937f241720e5d3848085e48df936c070e6aa364167b3c9c554e8231f40a0a920a1687efd0ac27 WHIRLPOOL b69cb32c86cb937d4e0763b5aea9096734ca8725ecc1f94c258a05d4302cbc494ffa35511eb42dd0a5c22da723be81ac90cf473e1fe184f565e4f5a86b06bc91
+EBUILD libqmi-1.0.0.ebuild 1193 SHA256 b1fc5b62820c4a4f9ec5efb7bead3fb6491fb2a6b21f57fd6698054190b41b9e SHA512 67bf0d7f97ba2e7d116e2818f81ccd9c53212a57bdaeba9daf77d6647f951114c8d6e2e29eb57862cdc8e8ab87d6dfa30ea5801ea7fa0e088a159790bc32dac6 WHIRLPOOL 8ba85612a007aae0b6a4e3661ebcc04a43c3cd068d8868410d12a9e36036c8bd5ef8df1e090f584ef617830ee6904b5fbf544b131c760eecc83ba49e039519af
+EBUILD libqmi-9999.ebuild 995 SHA256 f1b24734e5434b37af5b97c7c3f108170419099eb4fc2ff8387859fccf47e10f SHA512 87fa935ae84f5312a690654269562bfab20cefe4496a10d247518b77c71ef5e44873bb3b3c03f40a2951f572d5679c09e0ac7ad8288fb7c9c9f7432a5c5a8dc7 WHIRLPOOL 0b5b86de5e79b961caa15c803277cf874b2ab5c01d7ba5fd9e61dbf04ea8ff2633094eb829721c2e508cda6e198cd10dabc2328241d6813a9c07a0d6e17a2092
+MISC ChangeLog 937 SHA256 d4d9965f575ed11b9ae095dcf9c33741296f54070de74aa67c1accd413e8472b SHA512 b0d3fa1efd461a82b8c4cd38e52f5b53ed96cc030c68cc8aed9c1ae6ccaf434e13905fd99f01f45c5d7d9e1b5756afd610cb5ea1556850b2666530744ee8f663 WHIRLPOOL d80b23aa4cdcf7d5c33f49af39303b90ea0b66518de7c029ca696b5a91ecde4fbb6a797bcc53fdb6c0416f1498d730f3781c79362871d7e1432947260d942d7b
 MISC metadata.xml 248 SHA256 5e13a9b4a75ae31aefe6042eecb0f2c93a68d48b7348f466086e482f3c926db0 SHA512 ec78fbdac44b52f0daa2c799faceaeebf0f04a27413f37f80fa20e2128a50136f394a3222d98b27a6c8e79560a33d170949ca1a4eca6826b24140cbec86435c5 WHIRLPOOL 091a4a6d4e456ecae0013b5ca49d775f10cd215a4e235e41f367e43341cc1f3a1da797a7a64e9f65df871e696c94cfcce3a93c41cc6024c1ab990857ebd8214c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEHHOYACgkQ/ejvha5XGaPl+QCfSZDl/jw/LKJ8fHUQP5/v9WWp
-BIoAoL1F0PAp2B5ACj3ZqCsC4enotHLC
-=xVKT
+iQIcBAEBCAAGBQJRfD31AAoJELEHsLL7fEFWsfIQAMkqv2Sqtb/8oTkoas/7g5yJ
+Uw1XFfLtpqX9RIxk5TWhJrvq+6msEE20NkWACW+fFbNrsLpU/TdesXStO5FcyPRg
+vYK/09JeQCDffxuoRtEk7ZrsODUbXEZUftzl5RfPym0+Bktgooal4tWU14r8N7CK
+/TDgrYMioAkRvKt4yXiO8g/3hHA2cnh8ovPRgyYUpICbvGeJ/mZP0QkaPjxaUhmU
+8RmepX9FJZliL4LUpj5J0xDeIKUe3nVm7z3r1rAgw7ScuIsCT8/KPTwuBKKYJEvJ
+5hVFtYI8EIkaFsc/+d8TsHhs5wzspMnzoBv3gxmtTG5sxar+nEJaIpQf+maAOZhk
+SFmiWfbPa4IJz5yhasdoNtJGHQUr4Hq6CGwQ59N/ubUODRFyYSbZVcXB0OKUEzNB
+WBXNy+b4fJ+PI1b9tebw68hTJbMVijlWr7ScxaJTWl4bKq6NxrmaO01L71b0ScUS
+KGu0Jwtxk8Z2GvHjvED/zMW+VwNyNVvjgq7I0N2WkCVVOwtqg22VcEFsTqvgZL39
+UU+nayonv48XnliKaOornWmqV75H+blNboMf+EemPBbNJ4L0PCtRs6kpVxhwJUAL
+Mrb+PnN8UyK1HYyYdbNkjlYr8ylIq5An0Ebhs6pLVh8IXkC+Yt5n4u+JgB5a0YIr
+w6mQKqZRj9RCUmnbcPT0
+=ZFel
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libqmi/libqmi-1.0.0.ebuild b/net-libs/libqmi/libqmi-1.0.0.ebuild
index 5c0161bd0ca6..9e04cda9280d 100644
--- a/net-libs/libqmi/libqmi-1.0.0.ebuild
+++ b/net-libs/libqmi/libqmi-1.0.0.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/net-libs/libqmi/libqmi-1.0.0.ebuild,v 1.1 2013/01/28 23:21:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-1.0.0.ebuild,v 1.2 2013/04/27 21:06:57 vapier Exp $
 
 EAPI="4"
 
@@ -26,11 +26,18 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	[[ -e configure ]] || eautoreconf
+	if [[ ! -e configure ]] ; then
+		find -name Makefile.am -exec sed -i 's:^INCLUDES:AM_CPPFLAGS:' {} + || die
+		sed -i \
+			-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+			{cli/test,libqmi-glib/test}/Makefile.am || die
+		eautoreconf
+	fi
 }
 
 src_configure() {
 	econf \
+		--disable-more-warnings \
 		$(use_enable static{-libs,}) \
 		$(use_with doc{,s}) \
 		$(use_with test{,s})
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
index 4ae7f4411c1e..40f59128bf7f 100644
--- a/net-libs/libqmi/libqmi-9999.ebuild
+++ b/net-libs/libqmi/libqmi-9999.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/net-libs/libqmi/libqmi-9999.ebuild,v 1.2 2013/01/28 23:21:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-9999.ebuild,v 1.3 2013/04/27 21:06:57 vapier Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-more-warnings \
 		$(use_enable static{-libs,}) \
 		$(use_with doc{,s}) \
 		$(use_with test{,s})