summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2012-08-05 14:56:28 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2012-08-05 14:56:28 +0000
commit7777de6e6cdb2d355b82aad37662b16558fb207c (patch)
treee98a9d5a8c3041813d94795449ae8b5222b1068c /sci-astronomy/celestia
parentUse prune_libtool_files from eutils.eclass (diff)
downloadgentoo-2-7777de6e6cdb2d355b82aad37662b16558fb207c.tar.gz
gentoo-2-7777de6e6cdb2d355b82aad37662b16558fb207c.tar.bz2
gentoo-2-7777de6e6cdb2d355b82aad37662b16558fb207c.zip
Force depend on lua < 5.2 (bug #407093, thanks Nils Larsson)
(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)
Diffstat (limited to 'sci-astronomy/celestia')
-rw-r--r--sci-astronomy/celestia/ChangeLog8
-rw-r--r--sci-astronomy/celestia/celestia-1.6.1.ebuild16
-rw-r--r--sci-astronomy/celestia/metadata.xml4
3 files changed, 16 insertions, 12 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/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