Force depend on lua < 5.2 (bug #407093, thanks Nils Larsson)

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

4 files changed, 30 insertions, 27 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 859d76fe60be..88f55fa91f63 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/celestia
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.85 2012/06/03 15:37:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.86 2012/08/05 14:56:28 bicatali Exp $
+
+  05 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> celestia-1.6.1.ebuild,
+  metadata.xml:
+  Force depend on lua < 5.2 (bug #407093, thanks Nils Larsson)
 
   03 Jun 2012; Justin Lecher <jlec@gentoo.org> celestia-1.6.1.ebuild,
   +files/celestia-1.6.1-gcc47.patch:
@@ -512,5 +516,3 @@
   13 Apr 2002; Bruce A. Locke <blocke@shivan.org> celestia-1.2.2.ebuild:
 
   Celestia added to Gentoo
-
-
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index a0218e0d987d..61d424c6435c 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX celestia-1.5.0-desktop.patch 1594 RMD160 04ef01761f3aee6448ee60e06bb6ea508c0920e6 SHA1 5b739ac3b53bf5d8d3d74188b8ad650c6fdc165c SHA256 2f989391f775e3435f0e0e570f747e0d8f38b310ea8ad92ba75099c59203171d
-AUX celestia-1.6.0-cfg.patch 461 RMD160 220506c67e763c9ec579f305f4636af28579d445 SHA1 aff0b44001849448da62dc83615b7235132af1e8 SHA256 868bbbcd761ec9b2ce3e45e3688b0a6d8d2c0d4ea39b520e13271b0063c78dac
-AUX celestia-1.6.1-gcc46.patch 278 RMD160 0de86a5a96c9c392fa5b7b352a9f7e77d75b8b1d SHA1 7c08ca391603806d788cb8f3342acedafc924eef SHA256 5fb9becc79e12e57c296d3861591cd22b2b11a591cca755c2bfff202fd6dc757
-AUX celestia-1.6.1-gcc47.patch 846 RMD160 aba435e5be097f3149396a8858b939f815323a5d SHA1 319902460a182c0014e0f95df1acf60f12fed7c1 SHA256 5dd843abe57c542e08416051d6d92ac9ba8d230ca68d8da49c3997343919e028
-AUX celestia-1.6.1-libpng15.patch 387 RMD160 9f51b8d11789d81c43366f32a0fedc1db0bdbc41 SHA1 46ecc4e10b24191384bc848c206652498843adf0 SHA256 ba3269842103ab68a1abd0fceb388878932d042620902796986625bd2b5f35cb
-AUX celestia-1.6.1-linking.patch 1526 RMD160 6f51d004f3d3ce2261939399b52e6fec7a9e6c0a SHA1 24204e211c24aafe88f39a71f971508177af4040 SHA256 8365533dd3401dc43d4d1f3543acde326f12ef0b862cadb7cf40428e92b715cc
-DIST celestia-1.6.1.tar.gz 52600436 RMD160 46ffae2896f95d92b0b7aaacfce8d004fb55bf1a SHA1 1f0fdf4525a8b9d6c708e1f6383babed670d18e7 SHA256 d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4
-EBUILD celestia-1.6.1.ebuild 3135 RMD160 2da6008142f6517e1fc1c9b59b68f2d2d630f1ab SHA1 60f0b2ad7c026f60e28f90e8f407bf2eae0712a3 SHA256 fd82d41dc0fa9c6bd23bba7e2934a0a0299820bc461124c9f1c9ad023147ea8a
-MISC ChangeLog 19410 RMD160 5968c44072a264acb6c7fa6ca9e070f98bbd82ed SHA1 8d43057338dce7e0af9276fae19d25119e4b7461 SHA256 d193afa2a9d956121ddfea297b434669b71089de6ecc9e41e9c31d8e6944fb80
-MISC metadata.xml 705 RMD160 cee4824e632be1d7e4e3eac24b556e841317b018 SHA1 479d9d525d2198e03ea2a6f7da39686ff7f1a1e6 SHA256 95695c52447533d5265d496b677a78e35f0118f9e34b539dd8b8f3a90d158421
+AUX celestia-1.5.0-desktop.patch 1594 SHA256 2f989391f775e3435f0e0e570f747e0d8f38b310ea8ad92ba75099c59203171d SHA512 a6f5e296ec66a00182b77311a696ea787876e113260df7d7ad1ee4e27bf6e97264808efd3b760d226f85e9bdbf2832087afb69342d043e4c0059ccecde0384c4 WHIRLPOOL c28a1dcd4c7fa688bf2d4960734c3895b70a6fc4d55878c4615d0f7d0453dd4fb7b9419f9c8f8ae3928769c71676ffdf874f2cec46f1c640fe71d2db6b6860cf
+AUX celestia-1.6.0-cfg.patch 461 SHA256 868bbbcd761ec9b2ce3e45e3688b0a6d8d2c0d4ea39b520e13271b0063c78dac SHA512 6780affb6838661aefe7929c4e56594b33f8793b3f9aa1d774605c035b0791e4a94579feccbde76379ec29735368a161bc60fb0b1ae4d0fc953bd75efc946d64 WHIRLPOOL eded154d8cfa9fcb641e16a038e7b8489e850417981915b271995b16b151be1287e0111ed17a5b999ce02923af2581c1d63ea60a5c1710cf2be1de120b4d81e1
+AUX celestia-1.6.1-gcc46.patch 278 SHA256 5fb9becc79e12e57c296d3861591cd22b2b11a591cca755c2bfff202fd6dc757 SHA512 6f12d5e25baece8380dcf6c83b9ba63faa81316d280fb403eb281f5d8746887b8131f1217b9b80d7a1d846888a3afd645d3c5de502d30a2bfa2df079b0dafdad WHIRLPOOL f384139ca619edca6a44ea3c7d912bdbfa8308330baa2d39a8ef360491791cd319e81898413821cb071fa920d18138ca267122989afd3af26c86d0392dbfa3cc
+AUX celestia-1.6.1-gcc47.patch 846 SHA256 5dd843abe57c542e08416051d6d92ac9ba8d230ca68d8da49c3997343919e028 SHA512 365d9c7a29d9593804b0278b7296f12df56585612b13f7f380f62aa84c36b863f560b5a2c50f53c30ecb9622590f156eac8cbd64d283f0accf0cd79f83647f56 WHIRLPOOL 1804e062a94a5404a80aac44d92aaec264bb2f8c5a07ab5556cd283eb0c57875fccf2b5dac979bbe5d1805c88f6fab2ffd7b834b1fd3da1f08746edd7b50e8d1
+AUX celestia-1.6.1-libpng15.patch 387 SHA256 ba3269842103ab68a1abd0fceb388878932d042620902796986625bd2b5f35cb SHA512 85b1e329c3bd88242a1320dbcfb8b0e0c35d10c2cec610e19f94894225fd236eea1511a7f3df121dd5842fc24c86d4dd468e91acd8a6295eebeb776ab4cb8003 WHIRLPOOL c245dd698d3f020f2c1da064c5ad68e901120ca8f5b8fc802c849d541e6c024fd876e74dcdfba0510ddf9d0b446d5961e430a9c2d194801a6d4d1e8f26eba567
+AUX celestia-1.6.1-linking.patch 1526 SHA256 8365533dd3401dc43d4d1f3543acde326f12ef0b862cadb7cf40428e92b715cc SHA512 31ef6c716486ddada988c2ac34e553cd5f928735454e3b74f4a2b0fa15a9b6594c87e40bf1345acc52cdc20d27bb35714fc633c9952a403146cb09966babe26b WHIRLPOOL a3d7013cb50f4ba889fdfd73d7133375884a9b3e6db565305c5ed22bbf50dea427ab8360ac01952dff918a297f42d40a660fa0654f8018ff74b9bfb64b305a99
+DIST celestia-1.6.1.tar.gz 52600436 SHA256 d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4 SHA512 5b1221e97ee03f7def317e5e29c5100ebe714a4a3aeb8b9818dc9445e4282b6f87026ab35c7b3d5eb02fa6dbb33693977999d14d9648fc4e6d1947abe32a413f WHIRLPOOL b3a242261ca7e2006b3e08d4c11808669c939bae9237bd366012c3ca90756c5486ed544f2b18024d722ea78af257076b291fff7c3ab7eef1c9b9e2133435cc0c
+EBUILD celestia-1.6.1.ebuild 3146 SHA256 3d25ac1cdb7e390ec9e25bce6fe74127bd3a998f0bacfcf9cd6affa41996cf35 SHA512 33e423e50a490919da8d5d0f1756e57968be2746fe32892d06d4e38579d7f0b2295623ee4f0539f9bbb4cbaccc6dc8a1c198feb41d5a927962aeafa7fea838c5 WHIRLPOOL d939f711b33b81ff6570a37d8df89aa1a7a537304dacecee11d0c74ceefb615f7c4558bd007e3ba65bea89b0b12d251be085f04c8c0df68c12567a38173d229b
+MISC ChangeLog 19570 SHA256 2dc880f00af3d9418ecba4a355c142eaff70433587f1077bf1011602fb2b7176 SHA512 2337e609a30b799ba99da699ff80dd21ff2046b48525747fb88629b9fc22f86bf48f3ec17d90b0fa0d66b47cad6b4844ef0fdd4804dc5e7c653ec08dfdaecc7e WHIRLPOOL d09c98646a1368523edb8e5d9d8d20f30b3b7744c4668f7e2d02917b636668c7733efad8b15d4d5dc14946ed35764ae8d336bb994a73e046cc811027adc0c47c
+MISC metadata.xml 703 SHA256 1b2ef519f7cb0c4ee3f675ab44650f8cffe7d762b0c41e406d3a6050dfc96271 SHA512 350c730eea511c713dbff16beb62cb310c203ed4997994e625acab70e37e3ec477295eb8f0be682d839adb82c4da7173b35da71896da030eea5f1d3b8f477b15 WHIRLPOOL 14a84665fe68b27cb8c03380e949469c57d1464baadb8b42132431c6186fa1ff67f9f15887bd8cc93c4d4225648e28d2d501482631eb35bbfb3d71cb84a18cfd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk/LhMEACgkQgAnW8HDreRZqkwCfXyfvZobN1ifvJglumGxYdvYM
-EM4AoJKwPRkN8xqpmVU+51sXN43/WuiE
-=HFEo
+iEYEAREIAAYFAlAeiaIACgkQ1ycZbhPLE2B/UACfdF8HOGYrdHk2nmOZDWAIb0T7
+lMIAoI6eF1f6LAh6dBzHZL+bN5ADQIy/
+=YAaR
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/celestia-1.6.1.ebuild b/sci-astronomy/celestia/celestia-1.6.1.ebuild
index b04dbc9c7d8a..891a9888fb90 100644
--- a/sci-astronomy/celestia/celestia-1.6.1.ebuild
+++ b/sci-astronomy/celestia/celestia-1.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.1.ebuild,v 1.13 2012/06/03 15:37:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.1.ebuild,v 1.14 2012/08/05 14:56:28 bicatali Exp $
 
-EAPI=2
+EAPI=4
 
 inherit eutils flag-o-matic gnome2 autotools pax-utils
 
@@ -12,14 +12,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="cairo gnome gtk nls pch theora threads"
 
 RDEPEND="
 	virtual/opengl
 	virtual/jpeg
 	media-libs/libpng
-	>=dev-lang/lua-5.0
+	<dev-lang/lua-5.2
 	gtk? ( !gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 ) )
 	gnome? (
 		x11-libs/gtk+:2
@@ -64,6 +64,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc47.patch
 
 	# remove flags to let the user decide
+	local
 	for cf in -O2 -ffast-math \
 		-fexpensive-optimizations \
 		-fomit-frame-pointer; do
@@ -104,13 +105,14 @@ src_install() {
 	if [[ ${CELESTIA_GUI} == gnome ]]; then
 		gnome2_src_install
 	else
-		emake DESTDIR="${D}" install || die "emake install failed"
+		emake DESTDIR="${D}" install
+		local size
 		for size in 16 22 32 48 ; do
 			insinto /usr/share/icons/hicolor/${size}x${size}/apps
 			newins "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
 		done
 	fi
 	[[ ${CELESTIA_GUI} == glut ]] && domenu celestia.desktop
-	dodoc AUTHORS README TRANSLATORS *.txt || die
-	pax-mark -m "${D}"/usr/bin/${PN} #365359
+	dodoc AUTHORS README TRANSLATORS *.txt
+	pax-mark -m "${ED}"/usr/bin/${PN} #365359
 }
diff --git a/sci-astronomy/celestia/metadata.xml b/sci-astronomy/celestia/metadata.xml
index 3168b1ec4fbd..cb97e7a550e4 100644
--- a/sci-astronomy/celestia/metadata.xml
+++ b/sci-astronomy/celestia/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-astronomy</herd>
-	<longdescription lang="en">
+<herd>sci-astronomy</herd>
+<longdescription lang="en">
   Celestia is a real-time space simulation that lets you experience
   our universe in three dimensions. You can travel throughout the solar
   system, to any of over 100,000 stars, or beyond the galaxy. All