Fix build failure with automake-1.13.1, bug #469208.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 22 insertions, 16 deletions

diff --git a/x11-libs/xvba-video/ChangeLog b/x11-libs/xvba-video/ChangeLog
index 98481dd47ee4..761470a7103a 100644
--- a/x11-libs/xvba-video/ChangeLog
+++ b/x11-libs/xvba-video/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xvba-video
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.16 2014/02/01 15:24:53 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.17 2014/02/10 21:35:45 chithanh Exp $
+
+  10 Feb 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xvba-video-0.8.0-r2.ebuild, xvba-video-9999.ebuild:
+  Fix build failure with automake-1.13.1, bug #469208.
 
 *xvba-video-0.8.0-r2 (01 Feb 2014)
 
diff --git a/x11-libs/xvba-video/Manifest b/x11-libs/xvba-video/Manifest
index 06d8a77e3ca4..3593c26cb0be 100644
--- a/x11-libs/xvba-video/Manifest
+++ b/x11-libs/xvba-video/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX xvba-video-fix-mesa-gl.h.patch 716 SHA256 dfca7a791d22baefeb9b0b7e6b7f8baad0d1f1785c35d1e43019b4a9c5949204 SHA512 103b424161c17c82bf02a35008603db5b17059e77937b9a7727517da6c3e6c211023cb62fe09cdd5035447209c8c10ed293879e576b1b5c7bcae303d79536adb WHIRLPOOL 590e52fd91658d7272940d0265d20e28b06c0f0e43d7c0b2f5764751855e6a31671b94c330b734505843873c7cc00a7656a07d7be285ad0c2571c649d0a30fa7
 AUX xvba-video-fix-out-of-source-builds.patch 372 SHA256 5acd2f0c1ee1a575bdfe9c0323627e74c15d75af0a88ab4e514f145a419ddc15 SHA512 a4ca2d2228a3d1f212b9c8d71c8bb2d1cddad6269802d7b969b5e6d401bb2aba64f33c4fd0a6a910c1b0d96b57b10b654304ccc10dca997130208b29e6986538 WHIRLPOOL b78ce8b5a091e299c7d4ab64cc7e932a37541b4a176b0927137b9d48ab8e8a37abb43b09e70c3f9d0a74a038515486d1fbe1c476d6829e3a0cfe21ec2331e694
 DIST xvba-driver-0.8.0.tar.bz2 80424 SHA256 bd56e64c619732956fe3e900520a704de90c1849f0b0e0ab6b8db5ff695d38a2 SHA512 1e968f6123c5563f5dfc1f01cd2b7ed9b3f6afa9cf93b50b2079b1408670f6048f8d6b6d47c1ebbad1defc3600788ddf85a93bee772d90e05a8769ff19e2425b WHIRLPOOL df19706f84c17c6141e9a3cacec230012767b8fb06117477b95ed4b511b52321e9092455d927ff4147b1a951aea234d35575758fd69ba577ade131fb27d79da1
 EBUILD xvba-video-0.8.0-r1.ebuild 1385 SHA256 8e5a99796fae10d8f4878c813c6d80508e9b6aa5cc3aa89185673cbaf391d5de SHA512 91670251bb690dad339446bc9b2289418562f76bddde687c89101fed1b3bcdf40576ca46d9e9e225841d01999d13aa1406c1296e15b95fc00f705059ae91a043 WHIRLPOOL fd808389cb003aaefb26852ee9fb9fa00cb0ad19cf56f6229886c4cee7ba129ed1eae917ab464d5513c43f021fd86215e18203a0e7f81faed0887cd2dd8cd8f0
-EBUILD xvba-video-0.8.0-r2.ebuild 1475 SHA256 5f41655ff0c35e4ba3a5e28a444922b2134f8fa3376067a5fe070c884b5c12e3 SHA512 31ac8dcc4b5215c957722c6caee3524f1a0c275009a88288e9aaf1376e6aac25b7ace04c7dbfa9f8285dca36c655f406917c516b4d7a0823c688e4c501b93ac6 WHIRLPOOL 4eb990a9c5f90976d474c683b60dda30616859ad5a9ad71cc2f90fa44a10673c129d0a6ba75d07af2237de71673dc380bea8bf901c3ff6a031068b71dc6b8731
-EBUILD xvba-video-9999.ebuild 1355 SHA256 16fe02ec0282c491879804375f4323c4d638ddd135f247d6ad6f607df57ec6d9 SHA512 10e0066cfbe41abe63a983ab79cf96a482e9b5f616e21f56394d8ce34becfb7fad9bac57933b1d8f2db7cb542d8aa00afa0e9b09bdc72bea58ca7ea1bf6b6a48 WHIRLPOOL db8e399de1f737fa417e316c801f65310edfe146857d6d1047ee83c8cfc2b05b0d9c8ecf9bea47c1064eba0989e67a24f79470db9390c5e7e755458adbad5fb2
-MISC ChangeLog 2910 SHA256 cfc6d320e395014750283dd552f5ac1ea5dd5288d835082810cfc9ee92d75873 SHA512 aa427d7883e0b40b1f184d8abdc81b0ddd13ebf154e2d5dc59cdef1782c610f4627b44437452b3296cd29246731cbf992992ae4abcc831a5f486b5c00d871d33 WHIRLPOOL fa379cda6b014de804c99ea28e35d155a690b0a809058108efe7313bc62e22bf082ae45b0ad6e498cc3de1bb2ceb73bc40553a6e7c93e3430c6c481357f3ba01
+EBUILD xvba-video-0.8.0-r2.ebuild 1614 SHA256 f4c81f576bc1a7cd369382d0db56542fdc9f9cad98cb0c72ddd047e9252be32d SHA512 72ed3bf4219e8864d539dd0d7261306cb83251c927fc8d994d468900a3398699b12aa44c2bde87d7075138b9a41f9ec3b1e89dec4ea6c1a172bc7a836968eae4 WHIRLPOOL 3aa8a5ddcbf8ba97cede0ce0789b92933a8f542b88f71c96e5e6a8f427ffb4ca7627afe385b3e172558379203cdb9a83727e518fa7e5bc0ea1a0f0aeb4d80bd2
+EBUILD xvba-video-9999.ebuild 1494 SHA256 52e6370d407568ba5ab7c0e6c1789dc6108158aa2b3825ade3d3653ee62cf470 SHA512 238709abe41a437e05630263e5034679d17ecb540c43488e60a6b8e4381af669ea43243ee76ad271ae8caa84c193badccb6685538adb02c0d81f2197941dc720 WHIRLPOOL ba5a5cd39107185704644b2859722ba16c700f12d396e113eca468d8913a6e1cd3fb849c290892875755d409fa8720314e041d1f1da784a99ebc1f0b4e867cee
+MISC ChangeLog 3094 SHA256 14862a5821162ad066ec8948fa078e94f21c645e60b9d03d17ae5c007b2bea85 SHA512 65709f6a60f1a6ae0fff653c52ffd40b0de6b358cadbaf4e7a7818e396447a602f79bc006281870eb408c8ac7207a6297cdd348a48bb7e0af1b0e0261d4782d8 WHIRLPOOL 65ef465b1f092a88bba53152bb11cfcdfa5b248921c8e8becca3e55ec4bec97da929fbb2340444b26ea63e3152a94ac7f275536fb9a18d77d46cc60294ff5570
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlLtEcUACgkQ2ugaI38ACPDyzQD/YY5dW5TzXg0oIJzReQSpnGax
-QNXahxd3xcTyR4AjYvwBAIr5sVFOq//ug2zQcK7FGsIPzW0YZ51/7CcDUpDofx+1
-=T2kK
------END PGP SIGNATURE-----
diff --git a/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild b/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild
index 9b2b9a593ee5..3f684dff37b0 100644
--- a/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild
+++ b/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild,v 1.1 2014/02/01 15:24:53 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild,v 1.2 2014/02/10 21:35:45 chithanh Exp $
 
 EAPI=5
 
@@ -42,6 +42,12 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# bug 469208
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	autotools-multilib_src_prepare
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
diff --git a/x11-libs/xvba-video/xvba-video-9999.ebuild b/x11-libs/xvba-video/xvba-video-9999.ebuild
index 9ea9417d11eb..3bc4db80f415 100644
--- a/x11-libs/xvba-video/xvba-video-9999.ebuild
+++ b/x11-libs/xvba-video/xvba-video-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-9999.ebuild,v 1.8 2014/02/01 15:24:53 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-9999.ebuild,v 1.9 2014/02/10 21:35:45 chithanh Exp $
 
 EAPI=5
 
@@ -39,6 +39,12 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# bug 469208
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	autotools-multilib_src_prepare
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)