[gentoo-commits] proj/sci:master commit in: sci-mathematics/giac/

[Jonathan-Christofer Demay]

commit:     3184835175ce3568ee1e10d1bc705a23ca618a8b
Author:     Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
AuthorDate: Mon Feb  6 14:35:25 2012 +0000
Commit:     Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
CommitDate: Mon Feb  6 14:35:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=31848351

sci-mathematics/giac: QA fixes

---
 sci-mathematics/giac/ChangeLog         |    5 +---
 sci-mathematics/giac/giac-0.9.2.ebuild |   41 +++++++++++++++----------------
 sci-mathematics/giac/metadata.xml      |    2 +-
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/sci-mathematics/giac/ChangeLog b/sci-mathematics/giac/ChangeLog
index 65e10b1..b9938a5 100644
--- a/sci-mathematics/giac/ChangeLog
+++ b/sci-mathematics/giac/ChangeLog
@@ -1,10 +1,7 @@
-# ChangeLog for sci-mathematics/giac
+# ChangeLog for sci-mathematics/frama-c
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  25 Jun 2011; Justin Lecher <jlec@g.o> giac-0.9.2.ebuild:
-  Cleaned ebuild
-
   16 May 2011; J.-C. Demay <jcdemay@×××××.com>
   giac-0.9.2.ebuild, +metadata.xml:
   QA fixes

diff --git a/sci-mathematics/giac/giac-0.9.2.ebuild b/sci-mathematics/giac/giac-0.9.2.ebuild
index a1e4f23..428faae 100644
--- a/sci-mathematics/giac/giac-0.9.2.ebuild
+++ b/sci-mathematics/giac/giac-0.9.2.ebuild
@@ -2,30 +2,27 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI="4"
 
 DESCRIPTION="A free C++ CAS (Computer Algebra System) library and its interfaces"
 HOMEPAGE="http://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 SRC_URI="ftp://ftp-fourier.ujf-grenoble.fr/xcas/${P}.tar.gz"
-
 LICENSE="GPL-2"
+
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="doc examples fltk"
 
-DEPEND="
-	dev-libs/gmp
-	sys-libs/readline
-	dev-libs/mpfr
-	sci-libs/gsl
-	>=sci-mathematics/pari-2.3
-	>=dev-libs/ntl-5.2
-	fltk? ( x11-libs/fltk:1 )"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-libs/gmp-3
+		>=sys-libs/readline-4.2
+		fltk? ( >=x11-libs/fltk-1.1.9 )
+		dev-libs/mpfr
+		sci-libs/gsl
+		>=sci-mathematics/pari-2.3
+		>=dev-libs/ntl-5.2"
 
 src_prepare(){
-	sed \
-		-e "s:\$(prefix)/share:\$(DESTDIR)\$(prefix)/share:g" \
+	sed -e "s:\$(prefix)/share:\$(DESTDIR)\$(prefix)/share:g" \
 		-e "s:config.h \$(includedir)/giac:config.h \$(DESTDIR)\$(includedir)/giac:g" \
 		-e "s:\$(DESTDIR)\$(DESTDIR):\$(DESTDIR):g"	\
 		-i `find -name Makefile\*`
@@ -35,24 +32,26 @@ src_prepare(){
 }
 
 src_install() {
-	default
-	mv "${D}"/usr/bin/{aide,giac-help}
-	rm "${D}"/usr/bin/*cas_help
+	emake DESTDIR="${D}" install || die "emake install failed"
+	mv ${D}/usr/bin/{aide,giac-help}
+	rm ${D}/usr/bin/*cas_help
+	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TROUBLES
 	if use !fltk; then
-		rm "${D}"/usr/bin/x*
+		rm ${D}/usr/bin/x*
 	fi
 	if use !doc; then
-		rm -R "${D}"/usr/share/doc/giac "${D}"/usr/share/giac/doc/
+		rm -R ${D}/usr/share/doc/giac ${D}/usr/share/giac/doc/
 	else
 		for LANG in el en es fr pt; do
 			if echo ${LINGUAS} | grep -v $LANG &> /dev/null; then
-				rm -R "${D}"/usr/share/giac/doc/$LANG
+				rm -R ${D}/usr/share/giac/doc/$LANG
 			else
-				ln "${D}"/usr/share/giac/doc/aide_cas "${D}"/usr/share/giac/doc/$LANG/aide_cas
+				ln ${D}/usr/share/giac/doc/aide_cas ${D}/usr/share/giac/doc/$LANG/aide_cas
 			fi
 		done
 	fi
 	if use !examples; then
-		rm -R "${D}"/usr/share/giac/examples
+		rm -R ${D}/usr/share/giac/examples
 	fi
 }
+

diff --git a/sci-mathematics/giac/metadata.xml b/sci-mathematics/giac/metadata.xml
index d5ab63a..6238c8a 100644
--- a/sci-mathematics/giac/metadata.xml
+++ b/sci-mathematics/giac/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
+	<herd>sci</herd>
 	<longdescription>
 		Giac is a free computer algebra system that can be used to perform
 		computer algebra, function graphs, interactive geometry (2-d and 3-d),