summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2009-08-13 00:38:47 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2009-08-13 00:38:47 +0000
commit14f98895b782bb7e6ac6ee2d48d30ae42a940bc9 (patch)
tree9f2777ba2e7f70798a11f7c7702d213a0c737e32 /sci-astronomy
parentVersion bump (diff)
downloadgentoo-2-14f98895b782bb7e6ac6ee2d48d30ae42a940bc9.tar.gz
gentoo-2-14f98895b782bb7e6ac6ee2d48d30ae42a940bc9.tar.bz2
gentoo-2-14f98895b782bb7e6ac6ee2d48d30ae42a940bc9.zip
Reimport the old as-needed patch after the lua mess, thanks polynomial-c for the catch
(Portage version: 2.2_rc38/cvs/Linux x86_64)
Diffstat (limited to 'sci-astronomy')
-rw-r--r--sci-astronomy/celestia/ChangeLog7
-rw-r--r--sci-astronomy/celestia/celestia-1.6.0.ebuild4
-rw-r--r--sci-astronomy/celestia/files/celestia-1.6.0-as-needed.patch25
3 files changed, 8 insertions, 28 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/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 \