summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/mplayer/ChangeLog7
-rw-r--r--media-video/mplayer/Manifest4
-rw-r--r--media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild11
3 files changed, 8 insertions, 14 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 8fcf780e6378..e309b42edaa7 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,10 +1,11 @@
# ChangeLog for media-video/mplayer
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.658 2009/08/01 09:09:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.659 2009/08/02 13:15:55 ssuominen Exp $
- 01 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+ 02 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
mplayer-1.0_rc2_p20090731.ebuild:
- Fix myconf_linguas sed by Emil Karlson.
+ Can't pass --language opts to ./configure because it will _die_ on false
+ ones. Instead, use the system LINGUAS variable like before.
01 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
mplayer-1.0_rc2_p20090731.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index f928ab4003cf..99aa90f11184 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -14,7 +14,7 @@ DIST mplayer-1.0_rc2_p20090731.tar.bz2 8240152 RMD160 365036583cd4e37f6f77a3e56d
DIST svgalib_helper-1.9.17-mplayer.tar.bz2 597 RMD160 f1c7816b5b9eea9ebc16c7f2b760e8a59b0e5eda SHA1 589bce8dc44884cda94aedcaaf8971ece4082b70 SHA256 4aa61c5869dcc9a3f19fb84b28490ba8361692dc8836ba89fa906b646003a1e6
EBUILD mplayer-1.0_rc2_p20090322.ebuild 19353 RMD160 ae92efe3b47ddb3259dbbe48241f15b440aa699e SHA1 7885a0f8821c47cb1903252aa21bca0181e1869e SHA256 18a8d0bc8a73fc4091a717dfd9d069f80da75fabbc96883e37b3dcaf1ce829fd
EBUILD mplayer-1.0_rc2_p20090530.ebuild 19319 RMD160 8113c653392e37e7cb39224986d0ab26e3c06cf9 SHA1 0bdae382f90f0f4e512562e230709984cfa09fa7 SHA256 556bf34e47dd8305f3be020da7b10112a76fd723d3f8636e78fce9344568588c
-EBUILD mplayer-1.0_rc2_p20090731.ebuild 19096 RMD160 ad02a2b5ad05447b6777dc731e3ee23a43a16417 SHA1 c996113bc5e5590be9205a9d6253b7f85be4c4d4 SHA256 e8305fd9ae43ee4159c05d25229f2600bb3c6302ed6c3ab23088c8b4b8461995
+EBUILD mplayer-1.0_rc2_p20090731.ebuild 18852 RMD160 04dae2dc9a558dd57f8e82d5fdf2ee4a53198411 SHA1 f3884ae844645da96f0fa53136c9b58fce5334c4 SHA256 0baf32ca1eba7cc525a13a776c0311fd4e1c53e2c7dfa8d5e2c664ce62ed1abf
EBUILD mplayer-9999.ebuild 20066 RMD160 3dcf8d75ca982da520d21d80782208fee2e78168 SHA1 595731d1191b39f11785de64da1703d3da9ca336 SHA256 f9e5c37ebeee8cd7360a5c9c90ad494164155aa3bd26db07de6b589514ddfaa8
-MISC ChangeLog 116931 RMD160 5ded426ff8182bcc2725983fd79aec6d6e987242 SHA1 de4f9018359db58b18f47af7390fa6eb6ec76095 SHA256 7916af2a3ae159cec020189e6889b98b9aa43204802519aef916b2b310b9f4a2
+MISC ChangeLog 117026 RMD160 4388c6982e5e1ab80ebee8175fb3899edb386814 SHA1 d182a25d4feb60dda4aae925c98ee103456fc9a2 SHA256 e8f1792e6db884a2240d9bb037c4172b0b4e766db244b3e8ae43e60fc2af669a
MISC metadata.xml 3718 RMD160 7869757d1092b1617d66093317124e1557017bb2 SHA1 91b505fac335ed7d1fe67e17a0cea75d57507a85 SHA256 ac51a29eb7775137f71ca5b7350febd48bba0cfd5ce0d69de20cf6a2cfdc613c
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild
index 74c115dc82e2..a292a99b2ddf 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild,v 1.4 2009/08/01 12:34:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild,v 1.5 2009/08/02 13:15:55 ssuominen Exp $
EAPI="2"
@@ -226,19 +226,12 @@ src_prepare() {
}
src_configure() {
-
local myconf=""
# MPlayer reads in the LINGUAS variable from make.conf, and sets
# the languages accordingly. Some will have to be altered to match
# upstream's naming scheme.
- if [[ -n $LINGUAS ]]; then
- LINGUAS="${LINGUAS/da/dk}"
- available_linguas=$(echo $LINGUAS | awk '{ print $1 }')
- myconf_linguas=$(echo $LINGUAS | sed s/\ /,/g)
- myconf="${myconf} --language=${available_linguas} \
- --language-doc=${myconf_linguas} --language-man=${myconf_linguas}"
- fi
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
# compilation in almost every situation. The reason for this is