fixed for new linguas, keyword amd64-linux, x86-linux

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

3 files changed, 32 insertions, 20 deletions

diff --git a/sci-astronomy/stellarium/ChangeLog b/sci-astronomy/stellarium/ChangeLog
index 1f21363feb10..ea2cd6445e4b 100644
--- a/sci-astronomy/stellarium/ChangeLog
+++ b/sci-astronomy/stellarium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/stellarium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.99 2012/08/03 07:46:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.100 2012/08/05 19:56:26 bicatali Exp $
+
+  05 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  stellarium-0.11.3.ebuild:
+  fixed for new linguas, keyword amd64-linux, x86-linux
 
   03 Aug 2012; Michael Sterrett <mr_bones_@gentoo.org>
   +files/stellarium-0.11.3-desktop.patch, stellarium-0.11.3.ebuild:
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index adba0a16c66e..d1c885a8b4b0 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
-  <maintainer>
-    <email>mr_bones_@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="stars">Install extra star catalogs</flag>
-  </use>
+<herd>sci-astronomy</herd>
+<maintainer>
+  <email>mr_bones_@gentoo.org</email>
+</maintainer>
+<longdescription lang='en'>
+  Stellarium is a free open source planetarium for your computer. It
+  shows a realistic sky in 3D, just like what you see with the naked
+  eye, binoculars or a telescope. It is being used in planetarium
+  projectors.
+</longdescription>
+<use>
+  <flag name="stars">Install extra star catalogs</flag>
+</use>
 </pkgmetadata>
diff --git a/sci-astronomy/stellarium/stellarium-0.11.3.ebuild b/sci-astronomy/stellarium/stellarium-0.11.3.ebuild
index 8ec7f0d9e59c..b7cb7deebd33 100644
--- a/sci-astronomy/stellarium/stellarium-0.11.3.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.11.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.11.3.ebuild,v 1.6 2012/08/03 07:46:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.11.3.ebuild,v 1.7 2012/08/05 19:56:26 bicatali Exp $
 
 EAPI=4
 CMAKE_MIN_VERSION="2.4.7"
 
 inherit cmake-utils eutils flag-o-matic
 
-DESCRIPTION="Stellarium renders 3D photo-realistic skies in real time."
+DESCRIPTION="Stellarium renders 3D photo-realistic skies in real time"
 HOMEPAGE="http://www.stellarium.org/"
 SRC_URI="mirror://sourceforge/stellarium/${P}.tar.gz
 	stars? (
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/stellarium/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls stars"
 RESTRICT="test"
 
@@ -40,23 +40,25 @@ DEPEND="${RDEPEND}
 	x11-libs/libXt"
 DOCS=( AUTHORS ChangeLog README )
 
-LANGS=( af ar az be bg bn bs ca cs cy da de el en en_CA en_GB eo es et eu
-fa fil fi fr ga gl gu he hi hr hu hy ia id is it ja ka kn ko lt lv mk ml
-mr ms mt nan nb nl nn pl pt_BR pt ro ru se si sk sl sq sr sv te th tl tr uk vi
-zh_CN zh_HK zh_TW )
+LANGS=( aa ab ae af ak am an ar as ast av az ba be bg bh bi bn bo br bs
+ca ce cs cv cy da de dv el en en_AU en_CA en_GB en_US eo es et eu fa fi
+fil fj fr fy ga gd gl gn gu gv haw he hi hr hrx ht hu hy ia id is it ja
+ka kg kk kn ko ky la lb lo lt lv mi mk ml mn mo mr ms mt nan nb nl nn oc
+os pa pl pt pt_BR ro ru sco se si sk sl sm sq sr su sv sw ta te tg th tl
+tr tt uk uz vi zh_CN zh_HK zh_TW zu )
 for X in "${LANGS[@]}" ; do
 	IUSE="${IUSE} linguas_${X}"
 done
 
 src_prepare() {
-	sed -e "/af ar az/d" -e "/GETTEXT_CREATE_TRANSLATIONS/a \ ${LINGUAS}" \
+	sed -e '/aa ab ae/d' -e "/GETTEXT_CREATE_TRANSLATIONS/a \ ${LINGUAS}" \
 		-i po/stellarium{,-skycultures}/CMakeLists.txt || die #403647
 	epatch "${FILESDIR}"/${P}-desktop.patch
 	use debug || append-cppflags -DQT_NO_DEBUG #415769
 }
 
 src_configure() {
-	mycmakeargs=( $(cmake-utils_use_enable nls NLS) )
+	local mycmakeargs=( $(cmake-utils_use_enable nls NLS) )
 	CMAKE_IN_SOURCE_BUILD=1 cmake-utils_src_configure
 }
 
@@ -64,9 +66,9 @@ src_install() {
 	default
 
 	# use the more up-to-date system fonts
-	rm -f "${D}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
 
 	if use stars ; then
 		insinto /usr/share/${PN}/stars/default