LINGUAS support updated, see bug #143782

(Portage version: 2.1.2_pre1)

4 files changed, 35 insertions, 195 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 49b07f972294..e1d216f1ace6 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.412 2006/09/21 02:28:14 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.413 2006/09/22 01:10:25 lu_zero Exp $
+
+  22 Sep 2006; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre8.ebuild,
+  mplayer-1.0_pre8-r1.ebuild, mplayer-1.0_pre20060810.ebuild:
+  LINGUAS support updated, thanks to Damien THEBAULT
+  <damien.thebault@laposte.net> for providing the initial patch in bug #143782
 
   21 Sep 2006; Patrick McLean <chutzpah@gentoo.org> mplayer-1.0_pre8.ebuild,
   mplayer-1.0_pre8-r1.ebuild, mplayer-1.0_pre20060810.ebuild:
diff --git a/media-video/mplayer/mplayer-1.0_pre20060810.ebuild b/media-video/mplayer/mplayer-1.0_pre20060810.ebuild
index 265f28c3f021..1b307f54c90a 100644
--- a/media-video/mplayer/mplayer-1.0_pre20060810.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre20060810.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre20060810.ebuild,v 1.6 2006/09/21 02:28:14 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre20060810.ebuild,v 1.7 2006/09/22 01:10:25 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,6 +13,13 @@ vorbis opengl openal oss png real rtc samba sdl speex sse sse2 svga tga
 theora truetype v4l v4l2 win32codecs X x264 xanim xinerama xmms xv xvid
 xvmc"
 
+LANGS="bg cs de da el en es fr hu ja ko mk nl no pl pt_BR ro ru sk tr uk zh_CN
+zh_TW"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
 BLUV=1.6
 SVGV=1.9.17
 
@@ -44,7 +51,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	openal? ( media-libs/openal )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
-	dga? ( || ( x11-libs/libXxf86dga virtual/x11 ) )
+	dga? ( x11-libs/libXxf86dga )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
 	dvb? ( media-tv/linuxtv-dvb-headers )
@@ -172,72 +179,10 @@ src_unpack() {
 
 }
 
-linguas_warn() {
-	ewarn "Language ${LANG[0]} or ${LANG_CC} not avaliable"
-	ewarn "Language set to English"
-	ewarn "If this is a mistake, please set the"
-	ewarn "First LINGUAS language to one of the following"
-	ewarn
-	ewarn "bg - Bulgarian"
-	ewarn "cs - Czech"
-	ewarn "de - German"
-	ewarn "dk - Danish"
-	ewarn "el - Greek"
-	ewarn "en - English"
-	ewarn "es - Spanish"
-	ewarn "fr - French"
-	ewarn "hu - Hungarian"
-	ewarn "ja - Japanese"
-	ewarn "ko - Korean"
-	ewarn "mk - FYRO Macedonian"
-	ewarn "nl - Dutch"
-	ewarn "no - Norwegian"
-	ewarn "pl - Polish"
-	ewarn "pt_BR - Portuguese - Brazil"
-	ewarn "ro - Romanian"
-	ewarn "ru - Russian"
-	ewarn "sk - Slovak"
-	ewarn "tr - Turkish"
-	ewarn "uk - Ukranian"
-	ewarn "zh_CN - Chinese - China"
-	ewarn "zh_TW - Chinese - Taiwan"
-	export LINGUAS="en ${LINGUAS}"
-}
-
 src_compile() {
 
 	# have fun with LINGUAS variable
-	if [[ -n $LINGUAS ]]
-	then
-		# LINGUAS has stuff in it, start the logic
-		LANG=( $LINGUAS )
-		if [ -e ${S}/help/help_mp-${LANG[0]}.h ]
-		then
-			einfo "Setting MPlayer messages to language: ${LANG[0]}"
-		else
-			LANG_CC=${LANG[0]}
-			if [ ${#LANG_CC} -ge 2 ]
-			then
-				LANG_CC=${LANG_CC:0:2}
-				if [ -e ${S}/help/help_mp-${LANG_CC}.h ]
-				then
-					einfo "Setting MPlayer messages to language ${LANG_CC}"
-					export LINGUAS="${LANG_CC} ${LINGUAS}"
-				else
-					linguas_warn
-				fi
-			else
-				linguas_warn
-			fi
-		fi
-	else
-		# sending blank LINGUAS, make it default to en
-		einfo "No LINGUAS given, defaulting to English"
-		export LINGUAS="en ${LINGUAS}"
-	fi
-
-
-
+	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS//da/dk}
 
 	local myconf=" --disable-tv-bsdbt848"
 	myconf="${myconf} --disable-vidix-external"
diff --git a/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild
index c1d6edb4ef1b..0317c7455e7f 100644
--- a/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild,v 1.10 2006/09/21 02:28:14 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild,v 1.11 2006/09/22 01:10:25 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,6 +13,13 @@ vorbis opengl openal oss png real rtc samba sdl speex sse sse2 svga tga
 theora truetype v4l v4l2 win32codecs X x264 xanim xinerama xmms xv xvid
 xvmc"
 
+LANGS="bg cs de da el en es fr hu ja ko mk nl no pl pt_BR ro ru sk tr uk zh_CN
+zh_TW"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
 BLUV=1.6
 SVGV=1.9.17
 
@@ -45,7 +52,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 	openal? ( media-libs/openal )
 	bidi? ( dev-libs/fribidi )
 	cdparanoia? ( media-sound/cdparanoia )
-	dga? ( || ( x11-libs/libXxf86dga virtual/x11 ) )
+	dga? ( x11-libs/libXxf86dga )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdts )
 	dvb? ( media-tv/linuxtv-dvb-headers )
@@ -173,72 +180,10 @@ src_unpack() {
 
 }
 
-linguas_warn() {
-	ewarn "Language ${LANG[0]} or ${LANG_CC} not avaliable"
-	ewarn "Language set to English"
-	ewarn "If this is a mistake, please set the"
-	ewarn "First LINGUAS language to one of the following"
-	ewarn
-	ewarn "bg - Bulgarian"
-	ewarn "cs - Czech"
-	ewarn "de - German"
-	ewarn "dk - Danish"
-	ewarn "el - Greek"
-	ewarn "en - English"
-	ewarn "es - Spanish"
-	ewarn "fr - French"
-	ewarn "hu - Hungarian"
-	ewarn "ja - Japanese"
-	ewarn "ko - Korean"
-	ewarn "mk - FYRO Macedonian"
-	ewarn "nl - Dutch"
-	ewarn "no - Norwegian"
-	ewarn "pl - Polish"
-	ewarn "pt_BR - Portuguese - Brazil"
-	ewarn "ro - Romanian"
-	ewarn "ru - Russian"
-	ewarn "sk - Slovak"
-	ewarn "tr - Turkish"
-	ewarn "uk - Ukranian"
-	ewarn "zh_CN - Chinese - China"
-	ewarn "zh_TW - Chinese - Taiwan"
-	export LINGUAS="en ${LINGUAS}"
-}
-
 src_compile() {
 
 	# have fun with LINGUAS variable
-	if [[ -n $LINGUAS ]]
-	then
-		# LINGUAS has stuff in it, start the logic
-		LANG=( $LINGUAS )
-		if [ -e ${S}/help/help_mp-${LANG[0]}.h ]
-		then
-			einfo "Setting MPlayer messages to language: ${LANG[0]}"
-		else
-			LANG_CC=${LANG[0]}
-			if [ ${#LANG_CC} -ge 2 ]
-			then
-				LANG_CC=${LANG_CC:0:2}
-				if [ -e ${S}/help/help_mp-${LANG_CC}.h ]
-				then
-					einfo "Setting MPlayer messages to language ${LANG_CC}"
-					export LINGUAS="${LANG_CC} ${LINGUAS}"
-				else
-					linguas_warn
-				fi
-			else
-				linguas_warn
-			fi
-		fi
-	else
-		# sending blank LINGUAS, make it default to en
-		einfo "No LINGUAS given, defaulting to English"
-		export LINGUAS="en ${LINGUAS}"
-	fi
-
-
-
+	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS//da/dk}
 
 	local myconf="--disable-external-faad --disable-tv-bsdbt848"
 	myconf="${myconf} --disable-external-vidix"
diff --git a/media-video/mplayer/mplayer-1.0_pre8.ebuild b/media-video/mplayer/mplayer-1.0_pre8.ebuild
index 55b4b985e23e..d84bb66c6fe5 100644
--- a/media-video/mplayer/mplayer-1.0_pre8.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8.ebuild,v 1.21 2006/09/21 02:28:14 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8.ebuild,v 1.22 2006/09/22 01:10:25 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,6 +12,13 @@ lirc live livecd lzo mad matrox mmx mmxext musepack nas nvidia unicode vorbis
 opengl openal oss png real rtc samba sdl speex sse sse2 svga tga theora
 truetype v4l v4l2 win32codecs X x264 xanim xinerama xmms xv xvid xvmc"
 
+LANGS="bg cs de da el en es fr hu ja ko mk nl no pl pt_BR ro ru sk tr uk zh_CN
+zh_TW"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
 BLUV=1.6
 SVGV=1.9.17
 
@@ -180,72 +187,10 @@ src_unpack() {
 
 }
 
-linguas_warn() {
-	ewarn "Language ${LANG[0]} or ${LANG_CC} not avaliable"
-	ewarn "Language set to English"
-	ewarn "If this is a mistake, please set the"
-	ewarn "First LINGUAS language to one of the following"
-	ewarn
-	ewarn "bg - Bulgarian"
-	ewarn "cs - Czech"
-	ewarn "de - German"
-	ewarn "dk - Danish"
-	ewarn "el - Greek"
-	ewarn "en - English"
-	ewarn "es - Spanish"
-	ewarn "fr - French"
-	ewarn "hu - Hungarian"
-	ewarn "ja - Japanese"
-	ewarn "ko - Korean"
-	ewarn "mk - FYRO Macedonian"
-	ewarn "nl - Dutch"
-	ewarn "no - Norwegian"
-	ewarn "pl - Polish"
-	ewarn "pt_BR - Portuguese - Brazil"
-	ewarn "ro - Romanian"
-	ewarn "ru - Russian"
-	ewarn "sk - Slovak"
-	ewarn "tr - Turkish"
-	ewarn "uk - Ukranian"
-	ewarn "zh_CN - Chinese - China"
-	ewarn "zh_TW - Chinese - Taiwan"
-	export LINGUAS="en ${LINGUAS}"
-}
-
 src_compile() {
 
 	# have fun with LINGUAS variable
-	if [[ -n $LINGUAS ]]
-	then
-		# LINGUAS has stuff in it, start the logic
-		LANG=( $LINGUAS )
-		if [ -e ${S}/help/help_mp-${LANG[0]}.h ]
-		then
-			einfo "Setting MPlayer messages to language: ${LANG[0]}"
-		else
-			LANG_CC=${LANG[0]}
-			if [ ${#LANG_CC} -ge 2 ]
-			then
-				LANG_CC=${LANG_CC:0:2}
-				if [ -e ${S}/help/help_mp-${LANG_CC}.h ]
-				then
-					einfo "Setting MPlayer messages to language ${LANG_CC}"
-					export LINGUAS="${LANG_CC} ${LINGUAS}"
-				else
-					linguas_warn
-				fi
-			else
-				linguas_warn
-			fi
-		fi
-	else
-		# sending blank LINGUAS, make it default to en
-		einfo "No LINGUAS given, defaulting to English"
-		export LINGUAS="en ${LINGUAS}"
-	fi
-
-
-
+	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS//da/dk}
 
 	local myconf="--disable-external-faad --disable-tv-bsdbt848"
 	myconf="${myconf} --disable-external-vidix"