summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-11-26 07:25:01 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-11-26 07:25:01 +0000
commitb915838d89c2f60e47cb4d06645854fa7d28edd7 (patch)
treed3e42e510b2fe16dfb0bdb3db496573cc0f0393c
parentVersion bump. (diff)
downloadgentoo-2-b915838d89c2f60e47cb4d06645854fa7d28edd7.tar.gz
gentoo-2-b915838d89c2f60e47cb4d06645854fa7d28edd7.tar.bz2
gentoo-2-b915838d89c2f60e47cb4d06645854fa7d28edd7.zip
Add blocker for x11-libs/libast wrt bug 277649. Cosmetics
(Portage version: 2.1.9.24/cvs/Linux x86_64)
-rw-r--r--sci-astronomy/ast/ChangeLog5
-rw-r--r--sci-astronomy/ast/ast-5.3.1-r1.ebuild15
2 files changed, 12 insertions, 8 deletions
diff --git a/sci-astronomy/ast/ChangeLog b/sci-astronomy/ast/ChangeLog
index 4650e4e32018..f5aab993ceb5 100644
--- a/sci-astronomy/ast/ChangeLog
+++ b/sci-astronomy/ast/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-astronomy/ast
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ChangeLog,v 1.12 2010/06/10 08:58:48 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ChangeLog,v 1.13 2010/11/26 07:25:01 xarthisius Exp $
+
+ 26 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> ast-5.3.1-r1.ebuild:
+ Add blocker for x11-libs/libast wrt bug 277649. Cosmetics
*ast-5.3.1-r1 (10 Jun 2010)
diff --git a/sci-astronomy/ast/ast-5.3.1-r1.ebuild b/sci-astronomy/ast/ast-5.3.1-r1.ebuild
index 4a3c36cb6773..a00472effc5d 100644
--- a/sci-astronomy/ast/ast-5.3.1-r1.ebuild
+++ b/sci-astronomy/ast/ast-5.3.1-r1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ast-5.3.1-r1.ebuild,v 1.1 2010/06/10 08:58:48 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ast/ast-5.3.1-r1.ebuild,v 1.2 2010/11/26 07:25:01 xarthisius Exp $
EAPI=2
inherit eutils versionator
-MYP="${PN}-$(replace_version_separator 2 '-')"
+MYP=${PN}-$(replace_version_separator 2 '-')
DESCRIPTION="Library for handling World Coordinate Systems in astronomy"
HOMEPAGE="http://starlink.jach.hawaii.edu/starlink/AST"
@@ -15,10 +15,11 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="doc"
-RDEPEND="sci-libs/pgplot"
+RDEPEND="sci-libs/pgplot
+ !x11-libs/libast"
DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MYP}"
+S=${WORKDIR}/${MYP}
src_prepare() {
# dont patch/sed Makefile.am because it requires special upstream automake
@@ -28,10 +29,10 @@ src_prepare() {
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${D}" install || die
rm -rf "${D}"usr/{docs,help,manifests,news,share} || die
- dodoc ast.news fac_1521_err
+ dodoc ast.news fac_1521_err || die
if use doc; then
- dodoc *.ps || die "doc install failed"
+ dodoc *.ps || die
fi
}