diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-07-21 15:44:05 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-07-21 15:44:05 +0000 |
| commit | f43bbfe496dacc0539786225c4899fed75c6da6b (patch) | |
| tree | dbd94796e4af2e3576e9000261f447079bfe302e /media-video/mplayer | |
| parent | Add newline. (diff) | |
| download | gentoo-2-f43bbfe496dacc0539786225c4899fed75c6da6b.tar.gz gentoo-2-f43bbfe496dacc0539786225c4899fed75c6da6b.tar.bz2 gentoo-2-f43bbfe496dacc0539786225c4899fed75c6da6b.zip | |
Fix prev. commit and fix ChangeLog entry accordingly.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 10 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.2_pre20130729.ebuild | 3 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 3 |
3 files changed, 9 insertions, 7 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/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 |