remove shipped config.h since it causes problems with out of tree builds, bug #475022 by Torsten Kaiser

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 15 insertions, 7 deletions

diff --git a/media-plugins/swh-plugins/ChangeLog b/media-plugins/swh-plugins/ChangeLog
index 396acb4d4693..6e19f3e09ed6 100644
--- a/media-plugins/swh-plugins/ChangeLog
+++ b/media-plugins/swh-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/swh-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/ChangeLog,v 1.50 2013/06/27 15:01:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/ChangeLog,v 1.51 2013/06/27 20:25:47 aballier Exp $
+
+  27 Jun 2013; Alexis Ballier <aballier@gentoo.org>
+  swh-plugins-0.4.15-r3.ebuild:
+  remove shipped config.h since it causes problems with out of tree builds, bug
+  #475022 by Torsten Kaiser
 
 *swh-plugins-0.4.15-r3 (27 Jun 2013)
 
diff --git a/media-plugins/swh-plugins/Manifest b/media-plugins/swh-plugins/Manifest
index 4669496dc29a..b0dc8a2200c3 100644
--- a/media-plugins/swh-plugins/Manifest
+++ b/media-plugins/swh-plugins/Manifest
@@ -10,13 +10,13 @@ AUX swh-plugins-0.4.15-system_gsm.patch 1526 SHA256 cf5648266134182d286d47534782
 AUX swh-plugins-0.4.15-x86-asm-optional.patch 1444 SHA256 93922f916e6c6dd026ed1949fbfbe99da8844ce05ad8227b7446af7e9cac5245 SHA512 d850ca895c1935ee74aef8ab8889792fefd2cfbd10416abe4e6d9b1a6c04405535c7bb0e511752205d67e8549a8a5d07e423af84d53483c49c2c53a4405ea023 WHIRLPOOL 1405f7cd6b92e2e1801d0e5af39154c86554fc199db1ecb91ee591c5bcd5bd11967eb537cb2e4e28c68a08d9b99c156318573dc46523a33c9e600bfced8e6dd9
 DIST swh-plugins-0.4.15.tar.gz 1051623 SHA256 d05ee8a4f4d92e828412bce3449a034f6ef16bb630eaf60f8fe4e15a89168640 SHA512 b26d11f3887d03d39187b86f8e4061e3808ac03fa49caf24256ae457a0156be5982fe687ed50fa4240ccbb3e6250ed920d1da8c95d57cf4313e127559491eb03 WHIRLPOOL 853af1d3c7f0593be223e722641b797e39c5e55dd09928652834cc5d48f3d1985da645f2e2ae121d9c6669ca709c363936128b5fe062889febf72ee0ed50e4a6
 EBUILD swh-plugins-0.4.15-r2.ebuild 1987 SHA256 2994e8f33044ab5ff288566b5bbf4a0669dcc2561ed89c3a186d7ea2d3980fd9 SHA512 00f7b4ab7a664b5a6457d7f1cba4b507c3cb5fa55f183948d55282e5d9075c9fa15b5c57b5597b6fdcebec63e839c6d33126d26f9c802f135e59dc5e16050d7b WHIRLPOOL de790b8284bb3e7c08201a0637ba5a241a451725ee7c1826b1c8aa533d9749c196e71641c0f4a41d0fb16e24fc436b110a806069e8b55ea601cf3b7a679f34fc
-EBUILD swh-plugins-0.4.15-r3.ebuild 2020 SHA256 15d80e5e2b2c4a254d663b5ac7c766c13d67690c9450be644e5d97d42318031a SHA512 d0070dd57173b816262ff4acea972b3ca7d78f02db76286d2ba0a8fa9774bd502b94832ef24760c837c4302dc7333b2ad3d68c4890a7bd12d485634c31f4f16c WHIRLPOOL 3887176c23f4f232dcdb17fb8c2a6c504cad3f91bb929c5ec544c23d09349887df13e391cb19cb5aa37dc4b0c50df72fe1420563f7541af8414e72afce4879ef
-MISC ChangeLog 8673 SHA256 dcbb261c9c004f179fc5211a242429044e629d1723bb3eab20f5252360565869 SHA512 79b7dcc5a9fc602c94a002fe3f99dca972e1534dc44e3e6d507c1c93036590d832abcae225d47d58e5b49fff99d122d45be3ede707b985ae25f78b605915e509 WHIRLPOOL 6e2ebe400340c134835b8651a486d524f70bf322307a893bcea3ff44a70e22095baf4d0e10fd7265af38fe4e28950bf72810657225a43a8747526a906959fdb1
+EBUILD swh-plugins-0.4.15-r3.ebuild 2090 SHA256 7de35a1523c61fcc5db7fd6f0b113c6dd3d427fe21b2938918188cacc701b632 SHA512 7d7febc395264becfda5f71325a207cb1255eeb97b32e5d8106eca9a7a8ee0e1c67f3a58c65395eb80a681a5922d453e5933c09ef46c53950a788ec6a6dcf6f8 WHIRLPOOL f6232d969fdd254f578da6985fa6d2c3fe9cc3e13a2acd46da8a9e4d594062d3282613a0d746aabb9d7b820e768bf1875522e0674d61fa6d1d360690c274f542
+MISC ChangeLog 8866 SHA256 6c2f3041a7df60a2cd6bdee5c241a19a0179bb661a5b8efeb91b5f72be8506f6 SHA512 fc15b5336031a42a5fae4ba1b16490da95f009e6dde1341b5665ed449208ab882519c5a6511f97912fd7c53ec172dba53e2434d07b3d4a39c234b9a9ae58340f WHIRLPOOL 72cefa13ca1dce8d716b849d94a18dce432c025f4c3ea1ffdd029bf76df9084ecc00b30a22cc2d931ab951152ea21453d980da276a589f1ff8144e49fd893873
 MISC metadata.xml 161 SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e SHA512 e9f8695c64d7b6aa86b9b6186490d50b5a75d593ac1c86b9698265c6345899c64fa712acdde3bdbfb2464139e44623efdae29b67b73c1c85bcbedfbd10e874fd WHIRLPOOL c01ec8b583f907a3a62da7d5bf74d09809244709021f437dc3f0064b2d52baa3dd4386369b46a9fd74020146017cf6117ad04b147e8538b1a2c7202e1b4a2dd5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHMU8wACgkQvFcC4BYPU0r3yQCgqFfnxy8akTsbz/K7BuH87xcK
-YRoAn04YF9pwrW2xmpoQbXLxVjJ+GdjG
-=CKwB
+iEYEAREIAAYFAlHMn80ACgkQvFcC4BYPU0oSuACfdnnskU+QQm3wXxzqK+gLBJYk
+9d8AnRuYfrlLa5qTSMaEbfzu6GqOyncC
+=Z+4k
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
index 7263097d2e08..f961ef96097b 100644
--- a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
+++ b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.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/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild,v 1.1 2013/06/27 15:01:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild,v 1.2 2013/06/27 20:25:47 aballier Exp $
 
 EAPI=5
 
@@ -46,6 +46,9 @@ src_prepare() {
 	# it doesn't get updated otherwise
 	rm -f missing
 
+	# old shipped version breaks multilib build #475022
+	rm -f config.h
+
 	# Fix build with automake 1.13
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die