Version bump

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 26 insertions, 142 deletions

diff --git a/sci-mathematics/gretl/ChangeLog b/sci-mathematics/gretl/ChangeLog
index 1472b20d7e79..f5289ef00102 100644
--- a/sci-mathematics/gretl/ChangeLog
+++ b/sci-mathematics/gretl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/gretl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.36 2012/04/13 19:39:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.37 2012/04/16 16:32:05 bicatali Exp $
+
+*gretl-1.9.8 (16 Apr 2012)
+
+  16 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org> -gretl-1.9.5.ebuild,
+  -gretl-1.9.6-r1.ebuild, +gretl-1.9.8.ebuild:
+  Version bump
 
   13 Apr 2012; Ulrich Müller <ulm@gentoo.org> gretl-1.9.5.ebuild,
   gretl-1.9.6-r1.ebuild, gretl-1.9.7.ebuild:
diff --git a/sci-mathematics/gretl/gretl-1.9.5.ebuild b/sci-mathematics/gretl/gretl-1.9.5.ebuild
deleted file mode 100644
index c568f76f3ac8..000000000000
--- a/sci-mathematics/gretl/gretl-1.9.5.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.9.5.ebuild,v 1.2 2012/04/13 19:39:59 ulm Exp $
-
-EAPI=4
-USE_EINSTALL=true
-inherit eutils gnome2 elisp-common
-
-DESCRIPTION="Regression, econometrics and time-series library"
-HOMEPAGE="http://gretl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="accessibility emacs gnome gtk nls odbc openmp readline R sourceview static-libs"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/glib:2
-	>=sci-visualization/gnuplot-4.2
-	virtual/lapack
-	virtual/latex-base
-	sci-libs/fftw:3.0
-	dev-libs/gmp
-	dev-libs/mpfr
-	readline? ( sys-libs/readline )
-	accessibility? ( app-accessibility/flite )
-	gtk?  ( sci-visualization/gnuplot[gd]
-			media-libs/gd[png]
-			x11-libs/gtk+:2 )
-	gnome? ( sci-visualization/gnuplot[gd]
-			 media-libs/gd[png]
-			 gnome-base/libgnomeui
-			 gnome-base/gconf:2 )
-	R? ( dev-lang/R )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	odbc? ( dev-db/unixODBC )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	if use openmp &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-			! has_version sys-devel/gcc[openmp] )
-	then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
-		die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use gtk; then
-		myconf="--enable-gui"
-		myconf="${myconf} $(use_with sourceview gtksourceview)"
-		myconf="${myconf} $(use_with gnome)"
-	else
-		myconf="--disable-gui --without-gnome --without-gtksourceview"
-	fi
-
-	econf \
-		--disable-rpath \
-		--enable-shared \
-		--with-mpfr \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_with odbc) \
-		$(use_with accessibility audio) \
-		$(use_with R libR) \
-		${myconf} \
-		LAPACK_LIBS="$(pkg-config --libs lapack)"
-}
-
-src_compile() {
-	emake
-	if use emacs; then
-		elisp-compile utils/emacs/gretl.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	if use gnome; then
-		gnome2_src_install gnome_prefix="${ED}"/usr svprefix="${ED}usr"
-	else
-		einstall svprefix="${ED}usr"
-	fi
-	if use gtk && ! use gnome; then
-		doicon gnome/gretl.png
-		make_desktop_entry gretl_x11 gretl
-	fi
-	if use emacs; then
-		elisp-install ${PN} utils/emacs/gretl.{el,elc} \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-	dodoc README README.audio ChangeLog CompatLog
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "To begin using gretl-mode for all \".inp\" files that you edit,"
-		elog "add the following line to your \"~/.emacs\" file:"
-		elog "  (add-to-list 'auto-mode-alist '(\"\\\\.inp\\\\'\" . gretl-mode))"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/gretl/gretl-1.9.6-r1.ebuild b/sci-mathematics/gretl/gretl-1.9.8.ebuild
index fe0d0e4c7a86..570d256dcc93 100644
--- a/sci-mathematics/gretl/gretl-1.9.6-r1.ebuild
+++ b/sci-mathematics/gretl/gretl-1.9.8.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.9.6-r1.ebuild,v 1.2 2012/04/13 19:39:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.9.8.ebuild,v 1.1 2012/04/16 16:32:05 bicatali Exp $
 
 EAPI=4
 USE_EINSTALL=true
-inherit eutils gnome2 elisp-common
+
+inherit eutils gnome2 elisp-common toolchain-funcs
 
 DESCRIPTION="Regression, econometrics and time-series library"
 HOMEPAGE="http://gretl.sourceforge.net/"
@@ -16,31 +17,31 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="accessibility emacs gnome gtk gtk3 nls odbc openmp readline sse2 R static-libs"
 
-RDEPEND="dev-libs/libxml2:2
-	dev-libs/glib:2
-	>=sci-visualization/gnuplot-4.2
-	virtual/lapack
-	virtual/latex-base
-	sci-libs/fftw:3.0
+RDEPEND="dev-libs/glib:2
 	dev-libs/gmp
+	dev-libs/libxml2:2
 	dev-libs/mpfr
-	readline? ( sys-libs/readline )
+	sci-libs/fftw:3.0
+	sci-visualization/gnuplot
+	virtual/lapack
+	virtual/latex-base
 	accessibility? ( app-accessibility/flite )
-	gtk?  ( sci-visualization/gnuplot[gd]
-			media-libs/gd[png]
+	emacs? ( virtual/emacs )
+	gtk?  ( media-libs/gd[png]
+			sci-visualization/gnuplot[gd]
 			x11-libs/gtk+:2
 			x11-libs/gtksourceview:2.0 )
-	gtk3? ( sci-visualization/gnuplot[gd]
-			media-libs/gd[png]
+	gtk3? ( media-libs/gd[png]
+			sci-visualization/gnuplot[gd]
 			x11-libs/gtk+:3
 			x11-libs/gtksourceview:3.0 )
-	gnome? ( sci-visualization/gnuplot[gd]
-			 media-libs/gd[png]
+	gnome? ( media-libs/gd[png]
+			 sci-visualization/gnuplot[gd]
 			 gnome-base/libgnomeui
 			 gnome-base/gconf:2 )
-	R? ( dev-lang/R )
 	odbc? ( dev-db/unixODBC )
-	emacs? ( virtual/emacs )"
+	R? ( dev-lang/R )
+	readline? ( sys-libs/readline )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -48,10 +49,7 @@ DEPEND="${RDEPEND}
 SITEFILE=50${PN}-gentoo.el
 
 pkg_setup() {
-	if use openmp &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-			! has_version sys-devel/gcc[openmp] )
+	if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp
 	then
 		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
 		die "Need an OpenMP capable compiler"