Reimport the old as-needed patch after the lua mess, thanks polynomial-c for the catch

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 13 insertions, 34 deletions

diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 9fb77271d78d..a11695482f23 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/celestia
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.51 2009/08/12 17:04:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.52 2009/08/13 00:38:47 bicatali Exp $
+
+  13 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  celestia-1.6.0.ebuild, -files/celestia-1.6.0-as-needed.patch:
+  Reimport the old as-needed patch after the lua mess, thanks polynomial-c
+  for the catch
 
 *celestia-1.6.0 (21 Jul 2009)
 
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 211baf94d693..c9f67a71cfff 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -7,20 +7,19 @@ AUX celestia-1.5.0-desktop.patch 1594 RMD160 04ef01761f3aee6448ee60e06bb6ea508c0
 AUX celestia-1.5.1-arts.patch 1806 RMD160 af88ff314193c55d56223489f53d46125ea5073d SHA1 d98a9f4b9d7c376922f93243c39fab4cbb5a1ac7 SHA256 ff4bdca96577babaf90df1c965bb67f5cf32dbde527ba2644431e8c29ae87ce3
 AUX celestia-1.5.1-gcc44.patch 1003 RMD160 3a7444ee0750ee32113fb54f0dc74042cdd8d836 SHA1 0444f9bd8a49c4ec905417aff2a2fb4c4aae73bc SHA256 1dab8e91cc720d826f06b4fe53de4b42e9d635818050a791f0cdefc7110daf5c
 AUX celestia-1.5.1-kde-3.5.patch 1018 RMD160 c39ded08b1fe0caf8eb4f1b2efe3366aeea61935 SHA1 564c5c91ca287382aff31c28a9e762f4e60bf28a SHA256 a4a7281747a9f493f3354f1f1b84f7159b49c1c89f6dd2bf669756c8e8e4ee8f
-AUX celestia-1.6.0-as-needed.patch 633 RMD160 62098acf729e4945966ffbdd5137a8bab69bead4 SHA1 64af299407d05da7d46f16032e6e32b31d050674 SHA256 97843f4f58def3f657e6a5924daeb6116055702d0fc622681d5237e7c5ed1d57
 AUX celestia-1.6.0-cfg.patch 461 RMD160 220506c67e763c9ec579f305f4636af28579d445 SHA1 aff0b44001849448da62dc83615b7235132af1e8 SHA256 868bbbcd761ec9b2ce3e45e3688b0a6d8d2c0d4ea39b520e13271b0063c78dac
 DIST celestia-1.5.1-acinclude.patch.bz2 37015 RMD160 dd4e2d538bf633bee691b6ece0a9381e5643bb2a SHA1 b11454a7d1c8bc8c472337c8a0728cf711d98f3c SHA256 b4ccd6a5c24e0074c698bc7d000e6193d182c3908a130a7da2d727a63d1d28b9
 DIST celestia-1.5.1-gcc43.patch.bz2 4673 RMD160 8aafd3ea0e93965398ff5493865e2632b65d1fcd SHA1 5237b4799c133d44af0d44c14ad6a9a4b5066003 SHA256 070c812969562948314a784e549c423634fc4eece990e820313682417fdb1fc8
 DIST celestia-1.5.1.tar.gz 34144780 RMD160 26f105acfc26a5edccb73fe29c33638804b0f370 SHA1 2d6a117daf6a400ab4c47a5a51c13f2ab601e6db SHA256 5a028dec634c2fd1b2097eb6717f8e6ca5d05052b7f63f5fc205d0cbf254888c
 DIST celestia-1.6.0.tar.gz 51848015 RMD160 c26a190071bd06cf2c1ea6ab901469365e00fa8e SHA1 72aa9cc2ef0ee1e4d73ed63ca2638a1ed8af9566 SHA256 9d9785b651cb42b890765f97234eaed3b03bf5e07dfb1be4f123a27260cdbbd4
 EBUILD celestia-1.5.1.ebuild 4469 RMD160 adcb1621f0460891c61ffb2dd6aa81fc5a29ec0f SHA1 609a76bdd45a0f4b0f84c63b12263588bad618a4 SHA256 ef9e3384819509f837d8800e9ec64fde761393fbdcc50ca6b7311dca34b1708d
-EBUILD celestia-1.6.0.ebuild 3493 RMD160 7b511eb48de1db5090bad36d29d96b1ab3fa3787 SHA1 aabb3ae6b72552765397ee2890d88d645acd54a3 SHA256 1b5dc9958c38ab85ae32589cafd66d3cf65f318433003fd4eea8f24af58b840f
-MISC ChangeLog 14182 RMD160 0e369a78da20e6c1564e2daae4ad7901cc3c698c SHA1 111667af056302063aeed9532dcb5f73d14cc62d SHA256 c8b4896754197b271a4860340e0e96ba0922ac0d0af9d18985263cf730529c4b
+EBUILD celestia-1.6.0.ebuild 3500 RMD160 eef0713313d37b52d3958f3cf7953db7d226d989 SHA1 eb76f952fee59d2617b2c5992c82fd648aae4808 SHA256 a53c5d0196bba6f897c9aad2fa72be375302fda8c12c2364068b539920aa84d7
+MISC ChangeLog 14393 RMD160 ed9f2cef020ba6c511b73adaa5fe4623db934e3a SHA1 44784bee1df145ad9adfdc08016a37c8f53f20ce SHA256 6a0e234739ca67c97963fd3c1a24ffa54509f8e673364c176366ba36d3d4ec38
 MISC metadata.xml 693 RMD160 902eac97368b5aa5d76c277826e42c3d741e9f99 SHA1 d5e786e1754e130bf4c0ff6d6978fb99ccb5f516 SHA256 3081606dbc2705ae14a2e9a9be830925eefc64bf2426bfee13399cc938e588da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqC9i8ACgkQ1ycZbhPLE2A6iwCeOOhVp4Vi02OpfWl8g2iMGCrG
-bXQAoIkZXR5iiokPXtLXtRru1WayoLpM
-=XfX5
+iEYEARECAAYFAkqDYKQACgkQ1ycZbhPLE2AIgwCfYQmKmIcwW+jdxGgTZ69yKd7b
+ThUAoLKNbdLnKwZHGZNAksUxtgSFTrlj
+=5hvG
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/celestia-1.6.0.ebuild b/sci-astronomy/celestia/celestia-1.6.0.ebuild
index 85dee3986b6b..8e084df8e616 100644
--- a/sci-astronomy/celestia/celestia-1.6.0.ebuild
+++ b/sci-astronomy/celestia/celestia-1.6.0.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/sci-astronomy/celestia/celestia-1.6.0.ebuild,v 1.1 2009/08/12 17:04:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.0.ebuild,v 1.2 2009/08/13 00:38:47 bicatali Exp $
 
 EAPI=2
 inherit eutils flag-o-matic gnome2 kde-functions autotools
@@ -64,7 +64,7 @@ src_prepare() {
 	# add a ~/.celestia for extra directories
 	epatch "${FILESDIR}"/${P}-cfg.patch
 	# as-needed forces to reorganize some files
-	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${PN}-1.4.1-as-needed.patch
 	# missing includes with gcc 4.4
 	epatch "${FILESDIR}"/${PN}-1.5.1-gcc44.patch
 	# remove flags to let the user decide
diff --git a/sci-astronomy/celestia/files/celestia-1.6.0-as-needed.patch b/sci-astronomy/celestia/files/celestia-1.6.0-as-needed.patch
deleted file mode 100644
index 81f828902477..000000000000
--- a/sci-astronomy/celestia/files/celestia-1.6.0-as-needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/celengine/Makefile.am.orig	2009-08-12 17:54:12.000000000 +0100
-+++ src/celengine/Makefile.am	2009-08-12 17:54:28.000000000 +0100
-@@ -25,8 +25,6 @@
- 	body.cpp \
- 	boundaries.cpp \
- 	catalogxref.cpp \
--	cmdparser.cpp \
--	command.cpp \
- 	console.cpp \
- 	constellation.cpp \
- 	customorbit.cpp \
---- src/celestia/Makefile.am.orig	2009-08-12 17:53:30.000000000 +0100
-+++ src/celestia/Makefile.am	2009-08-12 17:54:56.000000000 +0100
-@@ -24,7 +24,10 @@
- 	eclipsefinder.cpp\
- 	favorites.cpp \
- 	imagecapture.cpp \
--	url.cpp
-+	url.cpp \
-+	../celengine/cmdparser.cpp \
-+	../celengine/command.cpp 
-+
- 
- WINSOURCES = \
- 	avicapture.cpp \