Fix prev. commit and fix ChangeLog entry accordingly.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 19 insertions, 17 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 3aa50648e3d0..332b5dce3917 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.916 2014/07/21 15:23:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.917 2014/07/21 15:44:05 ssuominen Exp $
 
   21 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   mplayer-1.2_pre20130729.ebuild, mplayer-9999.ebuild:
-  Fix building with LINGUAS="zh" by replacing it with LINGUAS="zh_CN" which is
-  the only "zh" language supported by mplayer wrt #482968 by "Hamlet"
+  Fix building by moving replacing of LINGUAS="zh" to LINGUAS="zh_CN" from
+  src_compile() to src_configure() wrt #482968 by "Hamlet"
+  However, should port strip-linguas() from eutils.eclass to mplayer's ebuild
+  because LINGUAS="zh zh_CN" works but LINGUAS="zh_CN zh" ends up as
+  LINGUAS="zh_CN_CN zh" which isn't fatal but will prevent installation
+  of documentation.
 
   21 Jul 2014; Rick Farina <zerochaos@gentoo.org>
   mplayer-1.2_pre20130729.ebuild, mplayer-9999.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 1b86c993ed70..82d920be176e 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -19,19 +19,19 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
 DIST mplayer-1.2_pre20130729.tar.xz 5358436 SHA256 9928cd6d0d765eb38f2824c501b94e5b6e0a2ec6e39a0c788654c5508c9eb9ab SHA512 e76ae7a1aeca9e853edf5403f3e3ae60dace980076a12160c501e18d019184af08256829f8e657b9fdbf549126bf518cf5dbe2860eda906e6fcd3ccc44a5f5a5 WHIRLPOOL b4007e4a00fd8b0b2d75a6d375f3b334b3251ea8dd677a5c1d562e4997fbbee81981bbbde9a88a61dc83bfc2d3e5dac6f93e7ff882088ba8b0c3df7c2cd9a6bd
 EBUILD mplayer-1.1.1-r1.ebuild 18338 SHA256 334e0a92e89cf04cb13d73770b5686bdaca4602b25754090d154249698992dd6 SHA512 6c11078e63b27330d0f9fc01334802f06f26ade99a5bbf8043f4c91a6de7118fda93edb10b57df1bd48f85b0da8f03d1effb033490963dceb9d0e9867c5ead38 WHIRLPOOL a74657aa23de4d12c6182e6b3d7fc025b96973cfc815107fdd53a1f2f53084c98677fb55ee6e8f993af4f6a89290142bf835f2d38e2d4a3a8b80b859a08ad109
-EBUILD mplayer-1.2_pre20130729.ebuild 17425 SHA256 749a07b179f96ffd3c30d5b235dd7fe42c010eac8873752544a9d13127aef7ef SHA512 40bc8b8eebf483665d59aaf140513a0e7ba66daecc48f406297ce7dce7b868952fcb03190dc493b10184fe4caf972b3946d4d6de1e1b81dfe6a65217c30211d6 WHIRLPOOL 69157d0c2460abe75f722910b223ea3ccbdfef8ee5b657783e84d1e273f054e8ee048f3a415cd0d48170482e6828af449bfe8e5ce44d8b628d4b6ee21bfff6d7
-EBUILD mplayer-9999.ebuild 17348 SHA256 b0e05dabe6215ccab60df3ee99deca66cac86000b72f3c86539ab531e1f81f70 SHA512 d07d16a8f09d640658732ea5054a1e740b626761d95f9853994d3c0dc7f56d4059e722a4aed6f9ea4ef7416e5ca8f9a7e7b0bd36d97cc4a6e2752011e27bfab6 WHIRLPOOL 4e79ef0554d46d1ce10d7e85939fa97485f7be8f7810a6af4461d94a6fcad0756db70946efef6429768104646779f6336a64eef5d02fc13ff36b5cd7b26a68e9
-MISC ChangeLog 51757 SHA256 273ee90aeb29f877bc49d610a97f56f2c1f2715a93ff64c209fd2c8a959b0751 SHA512 dc9403431e44e808b9e83daf660dec0a2ca6908fbdbc27ea0fc1ac3ae67a3e6ed6929996549e72aec73e2ac3da04c31316a2946cd361882ddb4ce11dd15d552e WHIRLPOOL 2e4ad31da4c80a99b85c5eff5a04062fcf0f6af201c5a5b09a3edcd6e040730dbb98432addcfd3372ba180b518169736824f5f67958d82dbe4819e3977d030bf
+EBUILD mplayer-1.2_pre20130729.ebuild 17395 SHA256 224d822b2db87d0c24ad97e1ab79ff1880d9b81f41c3949c7ed9928526d81a67 SHA512 fa10e52cc4ee2953f440c95dcc56c8992ecc8621985feb7b2fa3d67195e06217da2a282ac18f6b23d521d8dbb6961af079c3ae49f54af2678715f5a50e29a0e6 WHIRLPOOL 4460b68fa5babd8659ac8fe96670e2119a7f5b83232386aa6ca410778b6496952446db1e59f54d6b6569522694e51f1fad2bc694532f43a8dc76fac41ca00bed
+EBUILD mplayer-9999.ebuild 17318 SHA256 baae6c557dd120c0a88c45dd6cd7e6daa5fc4ade4bf6ae5e264fd2b8bdd6c6c7 SHA512 44b91cba3b7a2711bdef6d8161a818864859bbf2656c4c031859ab8c537c9edc9d4b712fe834ee8b201f1cd013380dae1bb37037ad0d74fa48d3a281ec1ae1a5 WHIRLPOOL 688e164b0510ad941c77b1db75a7d42ccc52b696a44a1ccf1404726fb5b3b7721ab43665b845594519835a1baafe040dbbec0733a287bf1c5a109f818366b75a
+MISC ChangeLog 51981 SHA256 ca49b66d215c95026053e54df61db9954c2f79038ea341ef4c722a31f69e7669 SHA512 1a4bd645336e7281dbb310c5c96853fa644ff7a4bb16e6fb7da5b0b48c7706a3a7dc3a61b71fc508591734833a4df77232165f32eb6f9226efa3d14d8f99bf07 WHIRLPOOL bcd1ad582e0d07d4fe1ee7c5b790318c7f928c7872ef41990e99c3643b13b40265387232c6c4f2b59c6637742cf6b50d6425fa871b78525cf5f78f1d77be2bec
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
 MISC metadata.xml 2882 SHA256 58a6c42a63be40a3f361b898ac6905b609afad6396fabea0e6387f59e5d3d1fc SHA512 a6826ed3528e053e00f1af527630ba270e902fafb5964126c3806903a9d7e3e9658d5feb0d00a26038f69d9182193acb14d6a74272637523a78a601b738f2ed3 WHIRLPOOL 4c6d302c41e88aeec59d7add811e53cdd737284d437258771be5de85bc83bf58c49bc9238a5dfc7a1a7553dc34fef4e6c4b5bdb235940f983809a4984f5c43d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTzS9WAAoJEEdUh39IaPFNJLwH/3Da9QJrcT70pqNHF1ZnaJRP
-WfP6mSPQxS3XQOuOxcjLo7mGSWbrNRqYujr4GIhc0WoFIQaa9GZ8hDAAGBPt6Og3
-d9LWcQprDvRzirmxE+BWCHSAln+kxHzc2AB9/1zT4cQpCBD8tATT7LWCnITjC03X
-ZgoMBTXQFz947S/PgbsmeFa1R+eBZu/rIuBsdo/vd8xeDb8b9ZQhnHTCfLOspY10
-Rk5G14AMkK9xktZVfx8G+KhHfIQNPXybPSZLffD+cmfTX3gegPNSMeRy8hHXGs9T
-OKjkofScmxGYM6iJxiN4qf/KFw8fyfM1cmrmO4p8S+0bXVuLZECl3xZ0hwZjlaM=
-=B2w0
+iQEcBAEBCAAGBQJTzTQkAAoJEEdUh39IaPFNCWsH/RPUH7gzh1uUzP0hehWDua5+
+i5osEF1/lSRMKMCdp7vF4Fh3x1Ydz6ODVZBlYeH96m26XI7HvlJG0N6qcZAMt8r0
+dy6+hXrZALusFsCXq7FlogjX+UzsDDpaHgH9cxi/GT3UwIIk72bx1gg0jb7VerOd
+swhNXHmlpXU19wBPNHcKzD1AfXfq8EkzfEZHBVd/a6cLgdeCiLit34AvhWcENglh
+hxSnJnAJF/ha3+ueo7Zkv2NNSD/aFStOUaa8Je0wGO76VcWGkRFrRVdOtv7p1ndQ
+lrXFKFpMynLNceIXcZjeALmZJVu2jMxUBukCWhX+h+EHgqmIyzT65N01Fmt17+o=
+=5vIf
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
index 9f6dfa427aeb..d0b6b24c4bf6 100644
--- a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20130729.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/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.7 2014/07/21 15:20:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.8 2014/07/21 15:44:05 ssuominen Exp $
 
 EAPI=5
 
@@ -531,7 +531,6 @@ src_compile() {
 	# Build only user-requested docs if they're available.
 	if use doc ; then
 		# select available languages from $LINGUAS
-		LINGUAS=${LINGUAS/zh/zh_CN}
 		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
 		local BUILT_DOCS=""
 		for i in ${LINGUAS} ; do
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index bba8c827a067..53493e0f78a1 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-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/media-video/mplayer/mplayer-9999.ebuild,v 1.158 2014/07/21 15:23:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.159 2014/07/21 15:44:05 ssuominen Exp $
 
 EAPI=5
 
@@ -529,7 +529,6 @@ src_compile() {
 	# Build only user-requested docs if they're available.
 	if use doc ; then
 		# select available languages from $LINGUAS
-		LINGUAS=${LINGUAS/zh/zh_CN}
 		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
 		local BUILT_DOCS=""
 		for i in ${LINGUAS} ; do