[gentoo-commits] proj/sci:master commit in: sci-astronomy/galfit-bin/

["Justin Lecher" <jlec@gentoo.org>]

commit:     505da5d5a4f1cbd717d76cb304604df0e4b1c6d9
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 07:37:24 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 07:37:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=505da5d5

sci-astronomy/galfit-bin: Since #452532 we have libtinfo.so in the tree

Package-Manager: portage-2.2.0_alpha153

---
 sci-astronomy/galfit-bin/ChangeLog               |    6 +++++-
 sci-astronomy/galfit-bin/galfit-bin-3.0.4.ebuild |   16 ++++++----------
 sci-astronomy/galfit-bin/metadata.xml            |    4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sci-astronomy/galfit-bin/ChangeLog b/sci-astronomy/galfit-bin/ChangeLog
index bce299b..fda97a2 100644
--- a/sci-astronomy/galfit-bin/ChangeLog
+++ b/sci-astronomy/galfit-bin/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-astronomy/galfit-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Jan 2013; Justin Lecher <jlec@gentoo.org> galfit-bin-3.0.4.ebuild,
+  metadata.xml:
+  Since #452532 we have libtinfo.so in the tree
+
 *galfit-bin-3.0.4 (30 Jul 2012)
 
   30 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> +galfit-bin-3.0.4.ebuild,

diff --git a/sci-astronomy/galfit-bin/galfit-bin-3.0.4.ebuild b/sci-astronomy/galfit-bin/galfit-bin-3.0.4.ebuild
index eb9221b..11a1225 100644
--- a/sci-astronomy/galfit-bin/galfit-bin-3.0.4.ebuild
+++ b/sci-astronomy/galfit-bin/galfit-bin-3.0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 MYPN=galfit
 
@@ -11,7 +11,8 @@ inherit multilib
 DESCRIPTION="Galaxy morphology fitting program"
 HOMEPAGE="http://www.csua.berkeley.edu/~cyp/work/galfit/galfit.html"
 CURI="http://www.csua.berkeley.edu/~cyp/work/${MYPN}"
-SRC_URI="amd64? ( ${CURI}/${MYPN}3-debian64.tar.gz )
+SRC_URI="
+	amd64? ( ${CURI}/${MYPN}3-debian64.tar.gz )
 	x86? ( ${CURI}/${MYPN}3-debian32.tar.gz )
 	doc? ( ${CURI}/README.pdf -> ${MYPN}.pdf )
 	examples? ( ${CURI}/${MYPN}-ex.tar.gz )
@@ -22,26 +23,21 @@ RESTRICT="mirror"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
+IUSE="doc examples test"
 
-RDEPEND="sys-libs/ncurses"
+RDEPEND="sys-libs/ncurses[tinfo]"
 DEPEND=""
 
 S="${WORKDIR}"
 
 src_test() {
 	chmod +x ${MYPN}
-	ln -s "${EROOT}"/$(get_libdir)/libncurses.so.5 libtinfo.so.5
-	ln -s "${EROOT}"/usr/$(get_libdir)/libncurses.so libtinfo.so
 	cd ${MYPN}-example/EXAMPLE
 	LD_LIBRARY_PATH=../.. ../../${MYPN} ${MYPN}.feedme
 }
 
 src_install () {
 	dobin ${MYPN}
-	# was built on a distro where ncurses was spit with tinfo
-	dosym libncurses.so.5 /$(get_libdir)/libtinfo.so.5
-	dosym libncurses.so /usr/$(get_libdir)/libtinfo.so
 
 	use doc && newdoc "${DISTDIR}"/${MYPN}.pdf README.pdf
 	if use examples; then

diff --git a/sci-astronomy/galfit-bin/metadata.xml b/sci-astronomy/galfit-bin/metadata.xml
index 2c6b265..368026c 100644
--- a/sci-astronomy/galfit-bin/metadata.xml
+++ b/sci-astronomy/galfit-bin/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">
   GALFIT is a data analysis algorithm that fits 2-D analytic functions
   to galaxies and point sources directly to digital images.
 </longdescription>