Version bump, with experimental odbc support and some ebuild cleanups

(Portage version: 2.1.4.4)

4 files changed, 42 insertions, 139 deletions

diff --git a/sci-mathematics/gretl/ChangeLog b/sci-mathematics/gretl/ChangeLog
index 4f406834fa45..7e4281a15bfa 100644
--- a/sci-mathematics/gretl/ChangeLog
+++ b/sci-mathematics/gretl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/gretl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.10 2008/06/29 08:04:44 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.11 2008/07/22 22:03:19 bicatali Exp $
+
+*gretl-1.7.5 (22 Jul 2008)
+
+  22 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/gretl-1.7.5-locale.patch, -gretl-1.7.1.ebuild, -gretl-1.7.2.ebuild,
+  +gretl-1.7.5.ebuild:
+  Version bump, with experimental odbc support and some ebuild cleanups
 
   29 Jun 2008; Torsten Veller <tove@gentoo.org> gretl-1.7.1.ebuild,
   gretl-1.7.2.ebuild, gretl-1.7.4.ebuild:
diff --git a/sci-mathematics/gretl/files/gretl-1.7.5-locale.patch b/sci-mathematics/gretl/files/gretl-1.7.5-locale.patch
new file mode 100644
index 000000000000..0c5cc6910a75
--- /dev/null
+++ b/sci-mathematics/gretl/files/gretl-1.7.5-locale.patch
@@ -0,0 +1,10 @@
+--- lib/src/libset.c.orig	2008-07-22 12:49:52.000000000 +0100
++++ lib/src/libset.c	2008-07-22 12:34:52.000000000 +0100
+@@ -28,6 +28,7 @@
+ 
+ #include <unistd.h>
+ #include <errno.h>
++#include <locale.h>
+ 
+ #define PDEBUG 0
+ 
diff --git a/sci-mathematics/gretl/gretl-1.7.2.ebuild b/sci-mathematics/gretl/gretl-1.7.2.ebuild
deleted file mode 100644
index 2488d899f50c..000000000000
--- a/sci-mathematics/gretl/gretl-1.7.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.7.2.ebuild,v 1.2 2008/06/29 08:04:44 tove Exp $
-
-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-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="accessibility emacs gmp gnome gtk nls png readline sourceview"
-
-RDEPEND="dev-libs/libxml2
-	>=dev-libs/glib-2
-	sci-visualization/gnuplot
-	virtual/lapack
-	>=sci-libs/fftw-3
-	dev-libs/mpfr
-	png? ( media-libs/libpng )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	accessibility? ( app-accessibility/flite )
-	gtk? ( >=x11-libs/gtk+-2.0 )
-	gnome? ( >=gnome-base/libgnomeui-2.0
-			 >=gnome-base/libgnomeprint-2.2
-			 >=gnome-base/libgnomeprintui-2.2
-			 >=gnome-base/gconf-2.0 )
-	sourceview? ( x11-libs/gtksourceview )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# makefile in cli not propagating flags
-	epatch "${FILESDIR}"/${PN}-1.6.5-cli.patch
-}
-
-src_compile() {
-
-	local myconf
-	if use gtk; then
-		if ! built_with_use sci-visualization/gnuplot gd; then
-			eerror "You need to build gnuplot with gd and png to use the gretl gtk GUI"
-			die "configuring with gnuplot failed"
-		fi
-		myconf="--enable-gui"
-		myconf="${myconf} $(use_with sourceview gtksourceview)"
-		myconf="${myconf} $(use_with gnome)"
-	else
-		myconf="--disable-gui --disable-gnome --disable-gtksourceview"
-	fi
-
-	econf \
-		--with-mpfr \
-		--without-libole2 \
-		--without-gtkextra \
-		$(use_enable nls) \
-		$(use_enable png png-comments) \
-		$(use_with readline) \
-		$(use_with gmp) \
-		$(use_with accessibility audio) \
-		${myconf} \
-		LAPACK_LIBS="$(pkg-config --libs lapack)" \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	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="${D}"/usr
-	else
-		einstall || die "einstall failed"
-	fi
-	if use gtk && ! use gnome; then
-		doicon gnome/gretl.png
-		make_desktop_entry gretlx11 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 NEWS README README.audio ChangeLog TODO EXTENDING \
-		|| die "dodoc failed"
-}
-
-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.7.1.ebuild b/sci-mathematics/gretl/gretl-1.7.5.ebuild
index 35a9aca11cec..87f2203293fc 100644
--- a/sci-mathematics/gretl/gretl-1.7.1.ebuild
+++ b/sci-mathematics/gretl/gretl-1.7.5.ebuild
@@ -1,37 +1,38 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.7.1.ebuild,v 1.2 2008/06/29 08:04:44 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/gretl-1.7.5.ebuild,v 1.1 2008/07/22 22:03:19 bicatali Exp $
 
 USE_EINSTALL=true
-
+EAPI=1
 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-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="accessibility emacs gmp gnome gtk nls png readline sourceview"
+IUSE="accessibility emacs gmp gnome gtk nls odbc readline sourceview"
 
 RDEPEND="dev-libs/libxml2
-	>=dev-libs/glib-2
+	dev-libs/glib:2
 	sci-visualization/gnuplot
 	virtual/lapack
-	>=sci-libs/fftw-3
+	virtual/latex-base
+	sci-libs/fftw:3.0
 	dev-libs/mpfr
-	png? ( media-libs/libpng )
 	readline? ( sys-libs/readline )
 	gmp? ( dev-libs/gmp )
 	accessibility? ( app-accessibility/flite )
-	gtk? ( >=x11-libs/gtk+-2.0 )
-	gnome? ( >=gnome-base/libgnomeui-2.0
-			 >=gnome-base/libgnomeprint-2.2
-			 >=gnome-base/libgnomeprintui-2.2
-			 >=gnome-base/gconf-2.0 )
+	gtk? ( >=x11-libs/gtk+-2.10:2 )
+	gnome? ( gnome-base/libgnomeui
+			 gnome-base/libgnomeprint:2.2
+			 gnome-base/libgnomeprintui:2.2
+			 gnome-base/gconf:2 )
 	sourceview? ( x11-libs/gtksourceview )
+	odbc? ( dev-db/unixODBC )
 	emacs? ( virtual/emacs )"
 
 DEPEND="${RDEPEND}
@@ -39,36 +40,36 @@ DEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
+pkg_setup() {
+	if use gtk && ! built_with_use sci-visualization/gnuplot gd; then
+		eerror "gretl gtk GUI needs gnuplot with gd and gd with png"
+		die "Please install gnuplot with gd and png use flags enabled"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# makefile in cli not propagating flags
-	epatch "${FILESDIR}"/${PN}-1.6.5-cli.patch
+	epatch "${FILESDIR}"/${P}-locale.patch
 }
 
 src_compile() {
 
 	local myconf
 	if use gtk; then
-		if ! built_with_use sci-visualization/gnuplot gd; then
-			eerror "You need to build gnuplot with gd and png to use the gretl gtk GUI"
-			die "configuring with gnuplot failed"
-		fi
 		myconf="--enable-gui"
 		myconf="${myconf} $(use_with sourceview gtksourceview)"
 		myconf="${myconf} $(use_with gnome)"
 	else
-		myconf="--disable-gui --disable-gnome --disable-gtksourceview"
+		myconf="--disable-gui --without-gnome --without-gtksourceview"
 	fi
 
 	econf \
 		--with-mpfr \
-		--without-libole2 \
-		--without-gtkextra \
 		$(use_enable nls) \
-		$(use_enable png png-comments) \
 		$(use_with readline) \
 		$(use_with gmp) \
+		$(use_with odbc) \
 		$(use_with accessibility audio) \
 		${myconf} \
 		LAPACK_LIBS="$(pkg-config --libs lapack)" \
@@ -97,7 +98,7 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
 			|| die "elisp-site-file-install failed"
 	fi
-	dodoc NEWS README README.audio ChangeLog TODO EXTENDING \
+	dodoc README README.audio ChangeLog CompatLog TODO \
 		|| die "dodoc failed"
 }