Fixed build with webm USE flag being set. (bug #427016)

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

3 files changed, 25 insertions, 17 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index adfe4b294e1e..125c71201c85 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.396 2012/07/17 11:54:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.397 2012/07/17 22:16:15 polynomial-c Exp $
+
+  17 Jul 2012; Lars Wendler <polynomial-c@gentoo.org> seamonkey-2.11.ebuild:
+  Fixed build with webm USE flag being set. (bug #427016).
 
 *seamonkey-2.11 (17 Jul 2012)
 
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index b5d71fe8fff2..127d2cb1aa63 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -123,24 +123,24 @@ DIST seamonkey-2.4.1.source.tar.bz2 87970263 SHA256 3e4f289b1d8beae6042868b899fe
 DIST seamonkey-2.7-patches-03.tar.xz 1080 SHA256 eede05439b5555871082652abe01c13b1f859640d8ac5df3001623c1084abec8 SHA512 9fb0013eec063131d4ca07be44c291c64b3af600bcd908e35cb274f04258d533feb20fd0bd7a26205463c621021c2a9aedf562963a12b005609bc878ae7014ab WHIRLPOOL 44d3e81f93f1e365846d182e44ddd62e779fbf9e62638f3fd205b9a5a684c706860de6d4b7bebcffb5ad84c7a9ac9e8b007f389e5b5761591f1cdfceba108744
 EBUILD seamonkey-2.0.14-r1.ebuild 9968 SHA256 ee9e707f0feda8e5c8d2e6ef2376511ed70ae96e0028d013bf713bd9d1279d13 SHA512 cfea09a13d2dd79d7973cf4cf7aff81695834b9837d6369e7d989dfe3c602b91a89fb7a94103d8db01690be53d170a3aff1eb5aa70a92e275a93c04d70a0d1f2 WHIRLPOOL fa59da4239b3fd15135aef05698b37e1271de056026c0aa2bdc471449c34e12189bfad2b5b4f865e627473a314ad7b1cf20c0eed826079fc961f120f433f972e
 EBUILD seamonkey-2.10.1.ebuild 9388 SHA256 14d4f9e6c5ecba13b8a98764fdb77a9da2295b5f5e124194560ac660ffd4e0bf SHA512 2d1c5c10826506f1a14681d56930f472bbc458782f0c078bd54173cdbd1dd9c9a903812b7e9ed59372d0388365213837bab14c915cbccbce5bc8c7631f8a0f1d WHIRLPOOL 472f2530e5fccbcb5f9570429112ca5011468dfc8d8319b09b7677ba3ae97e48f52eaf877538cc2c2fd618296b3b8a59bca43a4edaf1afc5cd135a433dacc70a
-EBUILD seamonkey-2.11.ebuild 9491 SHA256 1c78104cd0377843880ad17a27e8b420b58725b269e2e4b232684f621a623c3f SHA512 cfbb9c31e35a342105d83aee88fb495224caba2542630d23ca66ac81efc9a7435b8a40bee2f43c6f4d93a13a7c39de0e938d18b28997681ade31b016b816f978 WHIRLPOOL 5c443cbae794bb73bc0c9fadc62451d13f4cc613677c74d8449094c7698bc1f944f365ae8d68fb01f33b3f3ffe6908e0e1a941e4ee73108569a84a8183e18824
+EBUILD seamonkey-2.11.ebuild 9688 SHA256 1f2dfb4419b2e09619f9ae738cdcbc6f48d4a5bf9462d3744f863215df905508 SHA512 709efb748dbba6a40238af1e0d613e6c6cb56f8c04371c97ed62417b668e2baa3a071c5749d4c2b28137d677f197942cce062c48c67864745dd02c0ebb4afa67 WHIRLPOOL ca3bfd3a66eb521ee76960d4279529acd4656e2be181cf1b0ab8a208241e6f09e5cdc3baf4dfa82426cac34529755164abbec6f58049ae6850d3abaeed2cbfbd
 EBUILD seamonkey-2.4.1-r1.ebuild 9881 SHA256 35bb38e220a0a21a9e4c64beee2bae72735287e7178b8b4edec04aa2eb753d69 SHA512 d916b897e377f7e754c95d601f8627970236f786cedc342079c4f097e599203077f2274542c1e1ba750de538993da304319a8c0586f02132c22f3ed0ef44f40d WHIRLPOOL 1e48b88e585b29d604d99f071e0758188fb3eed749be91ccb04dc3e3d8931ebb80a85a8544026cda3cf9a0c88c9669aa89866ee38fb3ed893d47e4d7c9b14146
-MISC ChangeLog 54772 SHA256 674c578b70bb7aaf203956fcd73cb0a29e9fc9f44446a07955b798817abbe880 SHA512 63db820549ceccfe3bf7a5784e97c513a1a3b4b1a5ec9256e479cf497f9a6eb61db13af2aacf90c1c09fa2e449f722e0f1ef29f087806624a5e3a62efa347109 WHIRLPOOL 509684d5f1fcb04836e771c42a0a48d521054757cec61ccddf0d44d0bca161f58d6b549ea0682b7ab2c28f2aa3413144eb253145d212124b0f9664465a343044
+MISC ChangeLog 54909 SHA256 8a61132a6b1c43879d93fbdd5b2dbd456b4f4b8db2d2cfa7712080a7a4bfb6f4 SHA512 840312edd87002b9f0cf9e09e1bca77f7f8428967c50f6a4fb53e21b90d982052f85fe7261906dbc4c6f3eaa5bd4f680087a36281ba6437071ead70b4ee0c698 WHIRLPOOL 845b58732693f55cc8e2d9f4b15bd31e1bcddc53167505391cadada4e8c2dcfea59f3fc25cf6c02147499c6ea59f638132125674525aa3004fba84ba7c2ad341
 MISC metadata.xml 1203 SHA256 fb43305a3b286be0abe32304ef90b2a2611bd3f2fdc55419904b1e7b2af04178 SHA512 80820c06fa69b670927c92a422f3e4382f6e5fbf6e7e7b4afc8662106d08eff11451eacff845598055273ea06b10d6145c28b0925a164bf4711a32cf0b1a1749 WHIRLPOOL 174f9b13d0612ef65963534b7905583cc7c382b295a345e91acebff6e249b2a1bb4de78c95bc5c51f66d24729ad3b928348b06433dac8a833ac066b42413a7d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQBVKEAAoJEPiazRVxLXTF5xcQAKJ6FCjUgdescZiUNvbKiRHs
-MLBh6qxYpvRQXvGnOxqLgsIUkrhkekFQpp2Hoj0BVPULio8zdLILUUgVa0hwVslp
-lwVmnw+O7awKuTBFupufqIxGpN6s+nSUMgmga1Q8vn91GyLb3h+92X7fZJhrmf0v
-fC6ztb3fGP/Z4Np8vCwqBrXX6ByGoaEdYDXEDLANbd5n+bX5kzZYezsRGPk5A7sk
-QORSeLo2osQ3V1oeIioqy3tbeNvLDnx6kUCmdhUTVpxRmN+FOyodeX/CgZntbdTP
-3bVRM4oTpU6nSPhg8wb7I9hfLF2jNf6d3nr9tS6q+BNMqT4z7/aSlMMfiyfUcYeM
-9eVEfO9xctjqH5jNDfoJG6at5UMgCZG+xjtVVSvC6CYhXz9u0XHtxYerbtpn8oFi
-GUeUiFJm8SWwpKgGDWR8I+zS6cPCSuiTe//jQ4hR/01WNuvxbAn2I9+/nLr5CWP3
-PNm1r+wGPANh8CzC5GtoF0N1nccgkST/MDe674JaImM/ZA/Z47cvAaYqHkTpt54n
-m9dl9pCPp7LaUYaxnmzMvqLcKo4I/fEtdCiSObBdr3oWplIXhEn+uL3KmTOvDpN9
-TTii6pjIrF3GhmMmXXQMVTLLggnnFyyU0guvPTpEcTKObNrwAWxxDqzLqHMlNWQK
-qSGCguf2mnU4ONbHbfEa
-=0FXr
+iQIcBAEBCAAGBQJQBeQ1AAoJEPiazRVxLXTFEQ4P/AuAmshZYthxAF/sFi31YjR7
+Oh5yCf98IaBxvGk9TgvxsAzfRlemjVhOOiUALFDt2Hbzt45KmS4GQfZ9ZiMjzOdF
+x18WmWv8qG0FsJtSPhwWorK6dTDcFDS7ouokJ6KIjmHwEaZMWhX1ajJDC1xOz/tV
+erex73SE23OojcnnthKYwhixYW+vHgVyjgHtBuoUe4yZjiM3Wt4ShVWE2iG9C+Sa
+8e/PyrtxxSeAW3r1MpvLuFUerhanowr2daqHveYACXcp5ENTKZ9EiwVzYq9jV94d
+bhdpYDBfH7xmAF4TS9xjqdn2+r41SP+AcOOEhvyzrGM9o+hU7ftdM+khboNLk388
+I1qtOnJCXv/f2o5947hW2bZM/tj+bEuHo9ALuDU8slyMyMc2jVt7lvntkRXYBA0A
+Q3MtGS4TEN6xf4ZEbpIyiNWH0PHCjaK4lTCEGcLSNh3BSEv1+5gYMmzUy7xHXvib
+zK32v9Pc+mvX4fXZp4mz/zu1xEB9F94wjlepkioOu8emJPGbTuf9VSED47eM3KoL
+KQLGRD8gdmk66vVEHn7MsmWLsmF+IfT3PGMfoaHiSi9FBwEuDdPyOzNBIotmydbh
+oomw5jyCwW7IvJ6co2/SIPIhJ2I30l/AQ9B3nXIq5psgbhbiZU4jOV5jnkfcRgEm
+uDlmHKNJNpG+MiGxDaz3
+=cdgl
 -----END PGP SIGNATURE-----
diff --git a/www-client/seamonkey/seamonkey-2.11.ebuild b/www-client/seamonkey/seamonkey-2.11.ebuild
index 8600d2535511..0ff660e28a50 100644
--- a/www-client/seamonkey/seamonkey-2.11.ebuild
+++ b/www-client/seamonkey/seamonkey-2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.11.ebuild,v 1.1 2012/07/17 11:54:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.11.ebuild,v 1.2 2012/07/17 22:16:15 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -174,6 +174,11 @@ src_configure() {
 	mozconfig_init
 	mozconfig_config
 
+	# current mozconfig-3 eclass submits an argument to
+	# --with-system-libvpx which fails.
+	sed '/with-system-libvpx/d' -i "${S}"/.mozconfig || die
+	mozconfig_annotate '+webm' --with-system-libvpx
+
 	# It doesn't compile on alpha without this LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"