Don't rely on LINGUAS being set

Package-Manager: portage-2.1.3_rc5

3 files changed, 31 insertions, 33 deletions

diff --git a/games-strategy/glest/ChangeLog b/games-strategy/glest/ChangeLog
index 57780bcb611d..8ccee324bf5b 100644
--- a/games-strategy/glest/ChangeLog
+++ b/games-strategy/glest/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/glest
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/ChangeLog,v 1.14 2006/11/17 08:45:32 nyhm Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/ChangeLog,v 1.15 2007/06/27 18:04:35 nyhm Exp $
+
+  27 Jun 2007; Tristan Heaven <nyhm@gentoo.org> glest-2.0.0-r1.ebuild:
+  Don't rely on LINGUAS being set
 
   17 Nov 2006; Tristan Heaven <nyhm@gentoo.org> glest-2.0.0-r1.ebuild:
   Add linguas_de support and font-adobe-utopia-75dpi to RDEPEND
diff --git a/games-strategy/glest/Manifest b/games-strategy/glest/Manifest
index e85f8fa3eb67..e271ae9c063c 100644
--- a/games-strategy/glest/Manifest
+++ b/games-strategy/glest/Manifest
@@ -16,14 +16,14 @@ DIST glest_source_2.0.0.zip 503892 RMD160 face82a3e35c788eb11629f4dcc9556836992b
 DIST italiano_2.0.0.zip 1802 RMD160 5f5ed7b2ff0c7636e9f902fdd815c1457b118941 SHA1 2bf832ba931a27d15bf54f7e0a2a4a5a7608995c SHA256 6ee6aef72013879248d9b4c2fd028ae95b71a7c65b745de6b1fcbabb704ea322
 DIST portugues_2.0.0.zip 1863 RMD160 b1886ecad5e2330d3d1a0deabb8e734d573f9951 SHA1 f16ee03ceacbf5873a07001e7f7953bf1aa78694 SHA256 0ee3fedcef6ce0725825a7fa6674ad1bde55276d1f3e704a7d74fb1950e3d8cf
 DIST slovak_2.0.0.zip 1721 RMD160 7b6c23e2c10ccfaa84a457b65f4a3cb0d87a8103 SHA1 91b0f3c3fb43d5ee43c155f88ecf1e36d1da237a SHA256 34a7e7f456d3daed3788bbd2df96389c51cf4cd4dda8348f350d451cdcd0b016
-EBUILD glest-2.0.0-r1.ebuild 2817 RMD160 b34720c1bdfcf4a042e0ab146ee06b73f28c44a9 SHA1 78445f916ed287860085d1afb5c8e8db6e8240ed SHA256 cb8731c99bd9e18fe031581a81e96a58c9931d38299ea8dea8f840ead9335f29
-MD5 33fd409b6e82b7423c724664711a85a1 glest-2.0.0-r1.ebuild 2817
-RMD160 b34720c1bdfcf4a042e0ab146ee06b73f28c44a9 glest-2.0.0-r1.ebuild 2817
-SHA256 cb8731c99bd9e18fe031581a81e96a58c9931d38299ea8dea8f840ead9335f29 glest-2.0.0-r1.ebuild 2817
-MISC ChangeLog 2396 RMD160 7d44e640158c224bfe5775d3296d2f3087771c32 SHA1 dbbf725f42101ec81b0f4d6b4c76b8834849986c SHA256 a7cf497141e871a9eb32b5b680a03e1af0bc31813d862431b98f8aaf299fa7e6
-MD5 6352b23c4d79f46bbf09b2cb2291097a ChangeLog 2396
-RMD160 7d44e640158c224bfe5775d3296d2f3087771c32 ChangeLog 2396
-SHA256 a7cf497141e871a9eb32b5b680a03e1af0bc31813d862431b98f8aaf299fa7e6 ChangeLog 2396
+EBUILD glest-2.0.0-r1.ebuild 2773 RMD160 a8d087e9fe842c059a836f2a1cb4628a38f19402 SHA1 5fb6a75200a71b2d727f35c9f738215e2cd89caa SHA256 427ddfc31f6a44bc39d52a195001f05cd0574ba6bea39a54f97d3ec5e3f3d0bf
+MD5 dc790446f360c9e8484c53f08b034e4d glest-2.0.0-r1.ebuild 2773
+RMD160 a8d087e9fe842c059a836f2a1cb4628a38f19402 glest-2.0.0-r1.ebuild 2773
+SHA256 427ddfc31f6a44bc39d52a195001f05cd0574ba6bea39a54f97d3ec5e3f3d0bf glest-2.0.0-r1.ebuild 2773
+MISC ChangeLog 2502 RMD160 fabbc15117c2731255eb42bcb50dfffa8c7386d0 SHA1 f5bcd26832b72b41026b903f6981f66ec6a9699d SHA256 ea4fce3afd8ce5aee7f5d053cbc0f442ac9d347e592fe13682b0156328f35ccb
+MD5 7ef770bb3d471113d8a95965f14b1f60 ChangeLog 2502
+RMD160 fabbc15117c2731255eb42bcb50dfffa8c7386d0 ChangeLog 2502
+SHA256 ea4fce3afd8ce5aee7f5d053cbc0f442ac9d347e592fe13682b0156328f35ccb ChangeLog 2502
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -32,9 +32,9 @@ MD5 e2c1c0a7cdfaf344c0bd34e341031653 files/digest-glest-2.0.0-r1 1633
 RMD160 783f9484dc222559a2959d0c98b7ecfee5e2a73d files/digest-glest-2.0.0-r1 1633
 SHA256 c04ddb55f70b5ae0c20cf07476dfdc50d8b8bf9237c78af08d97c69c88f4c97c files/digest-glest-2.0.0-r1 1633
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFXXgkdz7hIScOURERAge6AJ0cEXo6qJNCt9EoxlvNvUsNkHTjzQCdEHsX
-WfwIKWuBiB71wD2KuERHw1s=
-=bE/0
+iD8DBQFGgqa/dz7hIScOURERApK4AJ9uXSDDTHsq0aFRRAytvnEWPLc+1QCg5b2B
+0YYdd/kMq6ri85h8BRhTDUI=
+=G5k0
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/glest/glest-2.0.0-r1.ebuild b/games-strategy/glest/glest-2.0.0-r1.ebuild
index 2ad022c10d1f..ba57a73795e8 100644
--- a/games-strategy/glest/glest-2.0.0-r1.ebuild
+++ b/games-strategy/glest/glest-2.0.0-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/glest-2.0.0-r1.ebuild,v 1.5 2006/11/17 08:51:08 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/glest-2.0.0-r1.ebuild,v 1.6 2007/06/27 18:04:35 nyhm Exp $
 
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
 inherit autotools eutils games
 
 L_URI="http://www.glest.org/files/contrib/translations"
@@ -22,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 -ppc ~x86" # ppc: bug #145478
 IUSE="linguas_de linguas_fr linguas_it linguas_pt_BR linguas_sk"
 
-RDEPEND=">=media-libs/libsdl-1.2.5
+RDEPEND="media-libs/libsdl
 	media-libs/libogg
 	media-libs/libvorbis
 	media-libs/openal
@@ -62,7 +60,7 @@ src_unpack() {
 	# sometimes they package configure, sometimes they don't
 	if [[ ! -f configure ]] ; then
 		chmod a+x autogen.sh
-		./autogen.sh || die "autogen failed"
+		./autogen.sh || die "autogen failed" # FIXME: use autotools.eclass
 	fi
 
 	sed -i 's:-O3 -g3::' Jamrules || die "sed Jamrules failed"
@@ -93,19 +91,16 @@ src_install() {
 	newicon techs/magitech/factions/magic/units/archmage/images/archmage.bmp \
 		${PN}.bmp
 
-	insinto "${GAMES_DATADIR}"/${PN}/data/lang
-	local lang
-	for lang in ${LINGUAS} ; do
-		case ${lang} in
-			de) lang=deutsch_2.0.0.lng ;;
-			fr) lang=francais.lng ;;
-			it) lang=italiano2_0_0.lng ;;
-			pt_BR) lang=tradu_pt-br.lng ;;
-			sk) lang=slovak.lng ;;
-			*) continue ;;
-		esac
-		doins "${WORKDIR}"/${lang} || die "doins ${lang} failed"
-	done
+	dolang() {
+		insinto "${GAMES_DATADIR}"/${PN}/data/lang
+		doins "${WORKDIR}"/${1} || die "doins ${1} failed"
+	}
+
+	use linguas_de && dolang deutsch_2.0.0.lng
+	use linguas_fr && dolang francais.lng
+	use linguas_it && dolang italiano2_0_0.lng
+	use linguas_pt_BR && dolang tradu_pt-br.lng
+	use linguas_sk && dolang slovak.lng
 
 	prepgamesdirs
 }